Remove FindBugs workaround 55/100655/2
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 19 Apr 2022 20:15:10 +0000 (22:15 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 19 Apr 2022 20:42:19 +0000 (22:42 +0200)
SpotBugs no longer throws a fit on callback's nullness, remove the
workaround. Also do not execute read/exists if there is no callback
-- although there always should be.

Change-Id: I3609d3be076de488f7fa64c72ad3b875e77a633e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java

index aef5f8b..662ccba 100644 (file)
@@ -104,22 +104,18 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction {
         // Note we delay completion of read requests to limit the scope at which the client can run, as they have
         // listeners, which we do not want to execute while we are reconnecting.
         if (request instanceof ReadTransactionRequest) {
-            final YangInstanceIdentifier path = ((ReadTransactionRequest) request).getPath();
-            final Optional<NormalizedNode> result = readOnlyView().readNode(path);
             if (callback != null) {
-                // XXX: FB does not see that callback is final, on stack and has be check for non-null.
-                final Consumer<Response<?, ?>> fbIsStupid = requireNonNull(callback);
-                executeInActor(() -> fbIsStupid.accept(new ReadTransactionSuccess(request.getTarget(),
+                final YangInstanceIdentifier path = ((ReadTransactionRequest) request).getPath();
+                final Optional<NormalizedNode> result = readOnlyView().readNode(path);
+                executeInActor(() -> callback.accept(new ReadTransactionSuccess(request.getTarget(),
                     request.getSequence(), result)));
             }
             return true;
         } else if (request instanceof ExistsTransactionRequest) {
-            final YangInstanceIdentifier path = ((ExistsTransactionRequest) request).getPath();
-            final boolean result = readOnlyView().readNode(path).isPresent();
             if (callback != null) {
-                // XXX: FB does not see that callback is final, on stack and has be check for non-null.
-                final Consumer<Response<?, ?>> fbIsStupid = requireNonNull(callback);
-                executeInActor(() -> fbIsStupid.accept(new ExistsTransactionSuccess(request.getTarget(),
+                final YangInstanceIdentifier path = ((ExistsTransactionRequest) request).getPath();
+                final boolean result = readOnlyView().readNode(path).isPresent();
+                executeInActor(() -> callback.accept(new ExistsTransactionSuccess(request.getTarget(),
                     request.getSequence(), result)));
             }
             return true;