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%2FRpcListener.java;h=5b1c5547992c9d3849e6310c6404ffaeeec29a20;hb=b78ee4d6b08e2cc0cf5edd01af0e54c3bf619ab5;hp=f6149906692ad0e5133938068508e80364d0769e;hpb=0120961d542fb1e055d4841a06c54e480ecdac3d;p=controller.git

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcListener.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcListener.java
index f614990669..5b1c554799 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcListener.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcListener.java
@@ -10,50 +10,57 @@ package org.opendaylight.controller.remote.rpc;
 
 
 import akka.actor.ActorRef;
-import org.opendaylight.controller.remote.rpc.messages.AddRpc;
-import org.opendaylight.controller.remote.rpc.messages.RemoveRpc;
-import org.opendaylight.controller.remote.rpc.utils.ActorUtil;
-import org.opendaylight.controller.sal.core.api.RpcRegistrationListener;
-import org.opendaylight.yangtools.yang.common.QName;
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Nonnull;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcAvailabilityListener;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
+import org.opendaylight.controller.remote.rpc.registry.RpcRegistry;
+import org.opendaylight.controller.sal.connector.api.RpcRouter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RpcListener implements RpcRegistrationListener{
-
-  private static final Logger LOG = LoggerFactory.getLogger(RpcListener.class);
-  private final ActorRef rpcRegistry;
-  private final String actorPath;
-
-  public RpcListener(ActorRef rpcRegistry, String actorPath) {
-    this.rpcRegistry = rpcRegistry;
-    this.actorPath = actorPath;
-  }
-
-  @Override
-  public void onRpcImplementationAdded(QName rpc) {
-    LOG.debug("Adding registration for [{}]", rpc);
-    RouteIdentifierImpl routeId = new RouteIdentifierImpl(null, rpc, null);
-    AddRpc addRpcMsg = new AddRpc(routeId, actorPath);
-    try {
-      ActorUtil.executeLocalOperation(rpcRegistry, addRpcMsg, ActorUtil.LOCAL_ASK_DURATION, ActorUtil.LOCAL_AWAIT_DURATION);
-      LOG.debug("Route added [{}-{}]", routeId, this.actorPath);
-    } catch (Exception e) {
-      // Just logging it because Akka API throws this exception
-      LOG.error(e.toString());
+public class RpcListener implements DOMRpcAvailabilityListener {
+
+    private static final Logger LOG = LoggerFactory.getLogger(RpcListener.class);
+    private final ActorRef rpcRegistry;
+
+    public RpcListener(final ActorRef rpcRegistry) {
+        this.rpcRegistry = rpcRegistry;
     }
 
-  }
-
-  @Override
-  public void onRpcImplementationRemoved(QName rpc) {
-    LOG.debug("Removing registration for [{}]", rpc);
-    RouteIdentifierImpl routeId = new RouteIdentifierImpl(null, rpc, null);
-    RemoveRpc removeRpcMsg = new RemoveRpc(routeId);
-    try {
-      ActorUtil.executeLocalOperation(rpcRegistry, removeRpcMsg, ActorUtil.LOCAL_ASK_DURATION, ActorUtil.LOCAL_AWAIT_DURATION);
-    } catch (Exception e) {
-      // Just logging it because Akka API throws this exception
-      LOG.error(e.toString());
+    @Override
+    public void onRpcAvailable(@Nonnull final Collection<DOMRpcIdentifier> rpcs) {
+        Preconditions.checkArgument(rpcs != null, "Input Collection of DOMRpcIdentifier can not be null.");
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Adding registration for [{}]", rpcs);
+        }
+        final List<RpcRouter.RouteIdentifier<?,?,?>> routeIds = new ArrayList<>();
+
+        for (final DOMRpcIdentifier rpc : rpcs) {
+            final RpcRouter.RouteIdentifier<?,?,?> routeId =
+                    new RouteIdentifierImpl(null, rpc.getType().getLastComponent(), rpc.getContextReference());
+            routeIds.add(routeId);
+        }
+        final RpcRegistry.Messages.AddOrUpdateRoutes addRpcMsg = new RpcRegistry.Messages.AddOrUpdateRoutes(routeIds);
+        rpcRegistry.tell(addRpcMsg, ActorRef.noSender());
+    }
+
+    @Override
+    public void onRpcUnavailable(@Nonnull final Collection<DOMRpcIdentifier> rpcs) {
+        Preconditions.checkArgument(rpcs != null, "Input Collection of DOMRpcIdentifier can not be null.");
+
+        LOG.debug("Removing registration for [{}]", rpcs);
+
+        final List<RpcRouter.RouteIdentifier<?,?,?>> routeIds = new ArrayList<>();
+        for (final DOMRpcIdentifier rpc : rpcs) {
+            final RpcRouter.RouteIdentifier<?,?,?> routeId =
+                    new RouteIdentifierImpl(null, rpc.getType().getLastComponent(), rpc.getContextReference());
+            routeIds.add(routeId);
+        }
+        final RpcRegistry.Messages.RemoveRoutes removeRpcMsg = new RpcRegistry.Messages.RemoveRoutes(routeIds);
+        rpcRegistry.tell(removeRpcMsg, ActorRef.noSender());
     }
-  }
 }