X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2FRemoteDOMRpcFuture.java;h=e112d1f9818411067b072516a034b993f04bc237;hb=241885acd71c551bf2834f4d2c727c87856256f3;hp=e97a499fdbd19833316b84cdc4a7ba5c08ac0a9f;hpb=164ac72a0b71c4639854e54024c69d4ab55afe76;p=controller.git

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcFuture.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcFuture.java
index e97a499fdb..e112d1f981 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcFuture.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteDOMRpcFuture.java
@@ -7,87 +7,31 @@
  */
 package org.opendaylight.controller.remote.rpc;
 
-import akka.dispatch.OnComplete;
-import com.google.common.base.Throwables;
-import com.google.common.util.concurrent.AbstractFuture;
-import com.google.common.util.concurrent.CheckedFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeSerializer;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcException;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
-import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.remote.rpc.messages.RpcResponse;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import scala.concurrent.ExecutionContext;
+import org.opendaylight.mdsal.dom.api.DOMRpcException;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
+import org.opendaylight.yangtools.yang.common.QName;
 import scala.concurrent.Future;
 
-class RemoteDOMRpcFuture extends AbstractFuture<DOMRpcResult> implements CheckedFuture<DOMRpcResult, DOMRpcException> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(RemoteDOMRpcFuture.class);
-
-    private RemoteDOMRpcFuture(final Future<Object> future) {
-        future.onComplete(new FutureUpdater(), ExecutionContext.Implicits$.MODULE$.global());
-    }
-
-    public static CheckedFuture<DOMRpcResult, DOMRpcException> from(final Future<Object> future) {
-        return new RemoteDOMRpcFuture(future);
+final class RemoteDOMRpcFuture extends AbstractRemoteFuture<QName, DOMRpcResult, DOMRpcException> {
+    RemoteDOMRpcFuture(final @NonNull QName type, final @NonNull Future<Object> requestFuture) {
+        super(type, requestFuture);
     }
 
     @Override
-    public DOMRpcResult checkedGet() throws DOMRpcException {
-        try {
-            return get();
-        } catch (final ExecutionException e) {
-            throw mapException(e);
-        } catch (final InterruptedException e) {
-            throw Throwables.propagate(e);
-        }
+    DOMRpcResult processReply(final Object reply) {
+        return reply instanceof RpcResponse response ? new DefaultDOMRpcResult(response.getOutput()) : null;
     }
 
     @Override
-    public DOMRpcResult checkedGet(final long timeout, final TimeUnit unit) throws TimeoutException, DOMRpcException {
-        try {
-            return get(timeout, unit);
-        } catch (final ExecutionException e) {
-            throw mapException(e);
-        } catch (final InterruptedException e) {
-            throw Throwables.propagate(e);
-        }
+    Class<DOMRpcException> exceptionClass() {
+        return DOMRpcException.class;
     }
 
-    private DOMRpcException mapException(final ExecutionException e) {
-        final Throwable cause = e.getCause();
-        if (cause instanceof DOMRpcException) {
-            return (DOMRpcException) cause;
-        }
-        return new RemoteDOMRpcException("Exception during invoking RPC", e);
-    }
-
-    private final class FutureUpdater extends OnComplete<Object> {
-
-        @Override
-        public void onComplete(final Throwable error, final Object reply) throws Throwable {
-            if (error != null) {
-                RemoteDOMRpcFuture.this.setException(error);
-            } else if (reply instanceof RpcResponse) {
-                final RpcResponse rpcReply = (RpcResponse) reply;
-                final NormalizedNode<?, ?> result;
-                if (rpcReply.getResultNormalizedNode() == null) {
-                    result = null;
-                    LOG.debug("Received response for invoke rpc: result is null");
-                } else {
-                    result = NormalizedNodeSerializer.deSerialize(rpcReply.getResultNormalizedNode());
-                    LOG.debug("Received response for invoke rpc: result is {}", result);
-                }
-                RemoteDOMRpcFuture.this.set(new DefaultDOMRpcResult(result));
-            }
-            RemoteDOMRpcFuture.this.setException(new IllegalStateException("Incorrect reply type " + reply
-                    + "from Akka"));
-        }
+    @Override
+    DOMRpcException wrapCause(final Throwable cause) {
+        return new RemoteDOMRpcException("Exception during invoking RPC", cause);
     }
-
 }