Reduce JSR305 proliferation

[controller.git] / opendaylight / md-sal / sal-dom-broker / src / test / java / org / opendaylight / controller / md / sal / dom / broker / impl / DOMRpcRouterTest.java

diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouterTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouterTest.java
index e2356e3f430569f2fa601b4151efce5134b79316..259cbfb02f9c528b337cb92831d1fc0631fe5c7a 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouterTest.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouterTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.AbstractMap.SimpleEntry;
@@ -43,6 +44,7 @@ import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
 import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.controller.md.sal.dom.store.impl.TestModel;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -78,7 +80,7 @@ public class DOMRpcRouterTest {
         mdsalRpcRouter = new org.opendaylight.mdsal.dom.broker.DOMRpcRouter();
         final SchemaContext schemaContext = TestModel.createTestContext();
         mdsalRpcRouter.onGlobalContextUpdated(schemaContext);
-        legacyRpcRouter = new DOMRpcRouter(mdsalRpcRouter, mdsalRpcRouter);
+        legacyRpcRouter = new DOMRpcRouter(mdsalRpcRouter.getRpcService(), mdsalRpcRouter.getRpcProviderService());
 
         legacyTestRpcIdentifier = DOMRpcIdentifier.create(findRpc(schemaContext, "test-rpc"));
         legacyTestRpcNoInputIdentifier = DOMRpcIdentifier.create(findRpc(schemaContext, "test-rpc-no-input"));
@@ -149,7 +151,7 @@ public class DOMRpcRouterTest {
         testLegacyRpcImpl.init(Futures.immediateCheckedFuture(result));
 
         ListenableFuture<org.opendaylight.mdsal.dom.api.DOMRpcResult> future =
-                mdsalRpcRouter.invokeRpc(mdsalTestRpcIdentifier.getType(), RPC_INPUT);
+                mdsalRpcRouter.getRpcService().invokeRpc(mdsalTestRpcIdentifier.getType(), RPC_INPUT);
 
         assertEquals(RPC_OUTPUT, future.get().getResult());
         assertEquals(1, future.get().getErrors().size());
@@ -164,7 +166,7 @@ public class DOMRpcRouterTest {
         testLegacyRpcImpl.init(Futures.immediateFailedCheckedFuture(rpcEx));
 
         try {
-            mdsalRpcRouter.invokeRpc(mdsalTestRpcIdentifier.getType(), RPC_INPUT).get();
+            mdsalRpcRouter.getRpcService().invokeRpc(mdsalTestRpcIdentifier.getType(), RPC_INPUT).get();
             fail("Expected exception");
         } catch (ExecutionException e) {
             assertEquals(rpcEx, e.getCause());
@@ -174,7 +176,7 @@ public class DOMRpcRouterTest {
 
         testLegacyRpcImpl.init(Futures.immediateCheckedFuture(null));
 
-        future = mdsalRpcRouter.invokeRpc(mdsalTestRpcNoInputIdentifier.getType(), null);
+        future = mdsalRpcRouter.getRpcService().invokeRpc(mdsalTestRpcNoInputIdentifier.getType(), null);
 
         assertNull(future.get());
         testLegacyRpcImpl.verifyInput(legacyTestRpcNoInputIdentifier, null);
@@ -182,7 +184,7 @@ public class DOMRpcRouterTest {
 
     @Test
     public void testMdsalRegistrationAndLegacyInvocation() throws InterruptedException, ExecutionException {
-        mdsalRpcRouter.registerRpcImplementation(testMdsalRpcImpl, mdsalTestRpcIdentifier,
+        mdsalRpcRouter.getRpcProviderService().registerRpcImplementation(testMdsalRpcImpl, mdsalTestRpcIdentifier,
                 mdsalTestRpcNoInputIdentifier);
 
         // Test success
@@ -190,7 +192,7 @@ public class DOMRpcRouterTest {
         org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult result =
             new org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult(RPC_OUTPUT,
                 Collections.singleton(RpcResultBuilder.newError(ErrorType.RPC, "tag", "message")));
-        testMdsalRpcImpl.init(Futures.immediateCheckedFuture(result));
+        testMdsalRpcImpl.init(FluentFutures.immediateFluentFuture(result));
 
         ListenableFuture<DOMRpcResult> future = legacyRpcRouter.invokeRpc(legacyTestRpcIdentifier.getType(), RPC_INPUT);
 
@@ -204,7 +206,7 @@ public class DOMRpcRouterTest {
         // Test exception returned
 
         TestMdsalDOMRpcException rpcEx = new TestMdsalDOMRpcException();
-        testMdsalRpcImpl.init(Futures.immediateFailedCheckedFuture(rpcEx));
+        testMdsalRpcImpl.init(FluentFutures.immediateFailedFluentFuture(rpcEx));
 
         try {
             legacyRpcRouter.invokeRpc(legacyTestRpcIdentifier.getType(), RPC_INPUT).get();
@@ -216,7 +218,7 @@ public class DOMRpcRouterTest {
 
         // Test no input or output
 
-        testMdsalRpcImpl.init(Futures.immediateCheckedFuture(null));
+        testMdsalRpcImpl.init(FluentFutures.immediateNullFluentFuture());
 
         future = legacyRpcRouter.invokeRpc(legacyTestRpcNoInputIdentifier.getType(), null);
 
@@ -318,19 +320,16 @@ public class DOMRpcRouterTest {
     private static class TestMdsalDOMRpcImplementation
             extends AbstractDOMRpcImplementation<org.opendaylight.mdsal.dom.api.DOMRpcIdentifier>
             implements org.opendaylight.mdsal.dom.api.DOMRpcImplementation {
-        CheckedFuture<org.opendaylight.mdsal.dom.api.DOMRpcResult,
-                org.opendaylight.mdsal.dom.api.DOMRpcException> returnFuture;
+        FluentFuture<org.opendaylight.mdsal.dom.api.DOMRpcResult> returnFuture;
 
         @Override
-        public CheckedFuture<org.opendaylight.mdsal.dom.api.DOMRpcResult,
-                org.opendaylight.mdsal.dom.api.DOMRpcException> invokeRpc(
+        public FluentFuture<org.opendaylight.mdsal.dom.api.DOMRpcResult> invokeRpc(
                     final org.opendaylight.mdsal.dom.api.DOMRpcIdentifier rpc, final NormalizedNode<?, ?> input) {
             rpcInput = new SimpleEntry<>(rpc, input);
             return returnFuture;
         }
 
-        void init(CheckedFuture<org.opendaylight.mdsal.dom.api.DOMRpcResult,
-                org.opendaylight.mdsal.dom.api.DOMRpcException> retFuture) {
+        void init(FluentFuture<org.opendaylight.mdsal.dom.api.DOMRpcResult> retFuture) {
             this.returnFuture = retFuture;
             rpcInput = null;
         }