Fix odlparent-3.0.0 checkstyle issues

[mdsal.git] / dom / mdsal-dom-broker / src / main / java / org / opendaylight / mdsal / dom / broker / ShardedDOMReadTransactionAdapter.java

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMReadTransactionAdapter.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMReadTransactionAdapter.java
index c0f7ae187576697d3908afd9ca7645c1f6ad64ba..82371752e5d501b63cba4f951d679ccb29617ffe 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMReadTransactionAdapter.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMReadTransactionAdapter.java
@@ -16,6 +16,7 @@ import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Collection;
 import java.util.Collections;
@@ -57,7 +58,7 @@ public class ShardedDOMReadTransactionAdapter implements DOMDataTreeReadTransact
     public void close() {
         // TODO should we also cancel all read futures?
         LOG.debug("{}: Closing read transaction", txIdentifier);
-        if (finished == true) {
+        if (finished) {
             return;
         }
 
@@ -95,10 +96,10 @@ public class ShardedDOMReadTransactionAdapter implements DOMDataTreeReadTransact
             }
 
             @Override
-            public void onFailure(final Throwable t) {
+            public void onFailure(final Throwable throwable) {
                 reg.close();
             }
-        });
+        }, MoreExecutors.directExecutor());
 
         return Futures.makeChecked(initialDataTreeChangeFuture, ReadFailedException.MAPPER);
     }
@@ -109,20 +110,21 @@ public class ShardedDOMReadTransactionAdapter implements DOMDataTreeReadTransact
         checkRunning();
         LOG.debug("{}: Invoking exists at {}:{}", txIdentifier, store, path);
         final Function<Optional<NormalizedNode<?, ?>>, Boolean> transform =
-                optionalNode -> optionalNode.isPresent() ? Boolean.TRUE : Boolean.FALSE;
-        final ListenableFuture<Boolean> existsResult = Futures.transform(read(store, path), transform);
+            optionalNode -> optionalNode.isPresent() ? Boolean.TRUE : Boolean.FALSE;
+        final ListenableFuture<Boolean> existsResult = Futures.transform(read(store, path), transform,
+            MoreExecutors.directExecutor());
         return Futures.makeChecked(existsResult, ReadFailedException.MAPPER);
     }
 
     private void checkRunning() {
-        Preconditions.checkState(finished == false, "Transaction is already closed");
+        Preconditions.checkState(!finished, "Transaction is already closed");
     }
 
     static class ReadShardedListener implements DOMDataTreeListener {
 
         private final SettableFuture<Optional<NormalizedNode<?, ?>>> readResultFuture;
 
-        public ReadShardedListener(final SettableFuture<Optional<NormalizedNode<?, ?>>> future) {
+        ReadShardedListener(final SettableFuture<Optional<NormalizedNode<?, ?>>> future) {
             this.readResultFuture = Preconditions.checkNotNull(future);
         }
 
@@ -139,7 +141,7 @@ public class ShardedDOMReadTransactionAdapter implements DOMDataTreeReadTransact
                 }
             }
 
-            for (final NormalizedNode initialState : subtrees.values()) {
+            for (final NormalizedNode<?, ?> initialState : subtrees.values()) {
                 readResultFuture.set(Optional.of(initialState));
             }
         }
@@ -151,8 +153,7 @@ public class ShardedDOMReadTransactionAdapter implements DOMDataTreeReadTransact
 
             // We chain all exceptions and return aggregated one
             readResultFuture.setException(new DOMDataTreeListeningException("Aggregated DOMDataTreeListening exception",
-                    causes.stream().reduce((e1, e2) ->
-                    {
+                    causes.stream().reduce((e1, e2) -> {
                         e1.addSuppressed(e2);
                         return e1;
                     }).get()));