X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-binding-dom-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Ftest%2Fconnect%2Fdom%2FMessageCapturingFlowService.java;h=9987bffda1ed3c6eedfb3cd0ac5ef4fd4e5db67d;hb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;hp=0f9389703ff5b587a1068a2428ca5d1732907f2c;hpb=ea3673e89598b896c93ebee864e6cb8db7f6c6ec;p=controller.git

diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/MessageCapturingFlowService.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/MessageCapturingFlowService.java
index 0f9389703f..9987bffda1 100644
--- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/MessageCapturingFlowService.java
+++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/MessageCapturingFlowService.java
@@ -9,8 +9,9 @@ package org.opendaylight.controller.sal.binding.test.connect.dom;
 
 import static org.junit.Assert.assertNotNull;
 
-import java.util.concurrent.Future;
-
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.KnockKnockInput;
@@ -20,21 +21,18 @@ import org.opendaylight.yangtools.yang.binding.BaseIdentity;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
 public class MessageCapturingFlowService implements OpendaylightOfMigrationTestModelService, AutoCloseable {
 
-    private Future<RpcResult<KnockKnockOutput>> knockKnockResult;
+    private ListenableFuture<RpcResult<KnockKnockOutput>> knockKnockResult;
 
     private final Multimap<InstanceIdentifier<?>, KnockKnockInput> receivedKnocks = HashMultimap.create();
     private RoutedRpcRegistration<OpendaylightOfMigrationTestModelService> registration;
 
-    public Future<RpcResult<KnockKnockOutput>> getKnockKnockResult() {
+    public ListenableFuture<RpcResult<KnockKnockOutput>> getKnockKnockResult() {
         return knockKnockResult;
     }
 
-    public MessageCapturingFlowService setKnockKnockResult(Future<RpcResult<KnockKnockOutput>> kkOutput) {
+    public MessageCapturingFlowService setKnockKnockResult(final ListenableFuture<RpcResult<KnockKnockOutput>> kkOutput) {
         this.knockKnockResult = kkOutput;
         return this;
     }
@@ -43,22 +41,23 @@ public class MessageCapturingFlowService implements OpendaylightOfMigrationTestM
         return receivedKnocks;
     }
 
-    public MessageCapturingFlowService registerTo(RpcProviderRegistry registry) {
+    public MessageCapturingFlowService registerTo(final RpcProviderRegistry registry) {
         registration = registry.addRoutedRpcImplementation(OpendaylightOfMigrationTestModelService.class, this);
         assertNotNull(registration);
         return this;
     }
 
-    public void close() throws Exception {
+    @Override
+    public void close() {
         registration.close();
     }
 
-    public MessageCapturingFlowService registerPath(Class<? extends BaseIdentity> context, InstanceIdentifier<?> path) {
+    public MessageCapturingFlowService registerPath(final Class<? extends BaseIdentity> context, final InstanceIdentifier<?> path) {
         registration.registerPath(context, path);
         return this;
     }
 
-    public MessageCapturingFlowService unregisterPath(Class<? extends BaseIdentity> context, InstanceIdentifier<?> path) {
+    public MessageCapturingFlowService unregisterPath(final Class<? extends BaseIdentity> context, final InstanceIdentifier<?> path) {
         registration.unregisterPath(context, path);
         return this;
     }
@@ -67,14 +66,14 @@ public class MessageCapturingFlowService implements OpendaylightOfMigrationTestM
         return new MessageCapturingFlowService();
     }
 
-    public static MessageCapturingFlowService create(RpcProviderRegistry registry) {
+    public static MessageCapturingFlowService create(final RpcProviderRegistry registry) {
         MessageCapturingFlowService ret = new MessageCapturingFlowService();
         ret.registerTo(registry);
         return ret;
     }
 
     @Override
-    public Future<RpcResult<KnockKnockOutput>> knockKnock(KnockKnockInput input) {
+    public ListenableFuture<RpcResult<KnockKnockOutput>> knockKnock(final KnockKnockInput input) {
         receivedKnocks.put(input.getKnockerId(), input);
         return knockKnockResult;
     }