TSC-99 Adjust to RPC method signature update

Change-Id: I1307120c6400e225a3e5e3e2344648ea5c7c5396
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/api/src/main/java/org/opendaylight/genius/tools/mdsal/rpc/FutureRpcResults.java b/api/src/main/java/org/opendaylight/genius/tools/mdsal/rpc/FutureRpcResults.java
index 9fa53fc2ce9484b9d4542d2e014aa13bd119d3e2..a264ab968ff28da2a07748f0d270e9f9590aea30 100644 (file)
--- a/api/src/main/java/org/opendaylight/genius/tools/mdsal/rpc/FutureRpcResults.java
+++ b/api/src/main/java/org/opendaylight/genius/tools/mdsal/rpc/FutureRpcResults.java
@@ -182,7 +182,7 @@ public final class FutureRpcResults {
         @Override
         @CheckReturnValue
         @SuppressWarnings("checkstyle:IllegalCatch")
-        public Future<RpcResult<O>> build() {
+        public ListenableFuture<RpcResult<O>> build() {
             SettableFuture<RpcResult<O>> futureRpcResult = SettableFuture.create();
             FutureCallback<O> callback = new FutureCallback<O>() {
                 @Override

diff --git a/testutils/src/main/java/org/opendaylight/genius/tools/mdsal/testutils/TestFutureRpcResults.java b/testutils/src/main/java/org/opendaylight/genius/tools/mdsal/testutils/TestFutureRpcResults.java
index d6348d149213fd15420be0cb447cfb708c496673..7ccb7696a71f14593a85fef3882413a4dfb35205 100644 (file)
--- a/testutils/src/main/java/org/opendaylight/genius/tools/mdsal/testutils/TestFutureRpcResults.java
+++ b/testutils/src/main/java/org/opendaylight/genius/tools/mdsal/testutils/TestFutureRpcResults.java
@@ -16,6 +16,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeoutException;
 import org.opendaylight.genius.tools.mdsal.rpc.FutureRpcResults;
+import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
 import org.opendaylight.yangtools.yang.common.RpcResult;
@@ -49,6 +50,13 @@ public final class TestFutureRpcResults {
         assertThat(rpcResult.getErrors()).isEmpty();
     }
 
+    public static <O extends DataObject> void assertRpcSuccess(Future<RpcResult<O>> futureRpcResult)
+            throws InterruptedException, ExecutionException, TimeoutException {
+        RpcResult<O> rpcResult = futureRpcResult.get(1, MINUTES);
+        assertThat(rpcResult.isSuccessful()).isTrue();
+        assertThat(rpcResult.getErrors()).isEmpty();
+    }
+
     public static <T> void assertRpcErrorWithoutCausesOrMessages(Future<RpcResult<T>> futureRpcResult)
             throws InterruptedException, ExecutionException, TimeoutException {
         RpcResult<T> rpcResult = futureRpcResult.get(1, MINUTES);