Decompose RPC implementation classes

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / util / BarrierUtil.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/BarrierUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/BarrierUtil.java
index 4f580bd5fbd55682cc56c5c76e954385c619ec1a..62c14b9190128a6ed846f7c7eadac28351a50347 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/BarrierUtil.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/BarrierUtil.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.openflowplugin.impl.util;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -14,6 +15,7 @@ import com.google.common.util.concurrent.MoreExecutors;
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.FlowCapableTransactionService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.SendBarrier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.SendBarrierInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.SendBarrierInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.SendBarrierOutput;
@@ -35,30 +37,25 @@ public final class BarrierUtil {
      * @param <T>                type of input future
      * @param input              future to chain barrier to
      * @param nodeRef            target device
-     * @param transactionService barrier service
+     * @param sendBarrier        barrier service
      * @param compositeTransform composite transform
      * @return future holding both results (input and of the barrier)
      */
-    public static <T> ListenableFuture<RpcResult<T>> chainBarrier(
-            final ListenableFuture<RpcResult<T>> input, final NodeRef nodeRef,
-            final FlowCapableTransactionService transactionService,
+    public static <T> ListenableFuture<RpcResult<T>> chainBarrier(final ListenableFuture<RpcResult<T>> input,
+            final NodeRef nodeRef, final SendBarrier sendBarrier,
             final Function<Pair<RpcResult<T>, RpcResult<SendBarrierOutput>>, RpcResult<T>> compositeTransform) {
-        final MutablePair<RpcResult<T>, RpcResult<SendBarrierOutput>> resultPair = new MutablePair<>();
+        final var resultPair = new MutablePair<RpcResult<T>, RpcResult<SendBarrierOutput>>();
 
         // store input result and append barrier
-        final ListenableFuture<RpcResult<SendBarrierOutput>> barrierResult = Futures.transformAsync(input,
-            interInput -> {
-                resultPair.setLeft(interInput);
-                final SendBarrierInput barrierInput = createSendBarrierInput(nodeRef);
-                return transactionService.sendBarrier(barrierInput);
-            }, MoreExecutors.directExecutor());
+        final var barrierResult = Futures.transformAsync(input, interInput -> {
+            resultPair.setLeft(interInput);
+            return sendBarrier.invoke(createSendBarrierInput(nodeRef));
+        }, MoreExecutors.directExecutor());
         // store barrier result and return initiated pair
-        final ListenableFuture<Pair<RpcResult<T>, RpcResult<SendBarrierOutput>>> compositeResult = Futures.transform(
-                barrierResult,
-            input1 -> {
-                resultPair.setRight(input1);
-                return resultPair;
-            }, MoreExecutors.directExecutor());
+        final var compositeResult = Futures.transform(barrierResult, input1 -> {
+            resultPair.setRight(input1);
+            return resultPair;
+        }, MoreExecutors.directExecutor());
         // append assembling transform to barrier result
         return Futures.transform(compositeResult, compositeTransform, MoreExecutors.directExecutor());
     }
@@ -69,9 +66,8 @@ public final class BarrierUtil {
      * @param nodeRef rpc routing context
      * @return input for {@link FlowCapableTransactionService#sendBarrier(SendBarrierInput)}
      */
-    public static SendBarrierInput createSendBarrierInput(final NodeRef nodeRef) {
-        return new SendBarrierInputBuilder()
-                .setNode(nodeRef)
-                .build();
+    @VisibleForTesting
+    static SendBarrierInput createSendBarrierInput(final NodeRef nodeRef) {
+        return new SendBarrierInputBuilder().setNode(nodeRef).build();
     }
 }