X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2FRpcManager.java;h=8e53bcba83464fd9b336f935ba03fc095be113a6;hb=9ddc65e1ddae50f691566cd9382707679436c055;hp=fc75ea6089d0e045fb431cb1ff8caa55e532ca2a;hpb=b664876e74191b7ec06650e2a396605025ffb48a;p=controller.git

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java
index fc75ea6089..8e53bcba83 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RpcManager.java
@@ -13,6 +13,7 @@ import akka.actor.ActorRef;
 import akka.actor.OneForOneStrategy;
 import akka.actor.Props;
 import akka.actor.SupervisorStrategy;
+import akka.actor.SupervisorStrategy.Directive;
 import akka.japi.Function;
 import com.google.common.base.Preconditions;
 import java.util.ArrayList;
@@ -30,20 +31,14 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import scala.concurrent.duration.Duration;
 
 /**
- * This class acts as a supervisor, creates all the actors, resumes them, if an exception is thrown.
- *
- * It also starts the rpc listeners
+ * This class acts as a supervisor, creates all the actors, resumes them, if an exception is thrown. It also starts
+ * the rpc listeners
  */
 
 public class RpcManager extends AbstractUntypedActor {
-
-    private static final Logger LOG = LoggerFactory.getLogger(RpcManager.class);
-
     private SchemaContext schemaContext;
     private ActorRef rpcBroker;
     private ActorRef rpcRegistry;
@@ -67,25 +62,22 @@ public class RpcManager extends AbstractUntypedActor {
     }
 
 
-      public static Props props(final SchemaContext schemaContext,
-              final DOMRpcProviderService rpcProvisionRegistry, final DOMRpcService rpcServices,
-              final RemoteRpcProviderConfig config) {
-          Preconditions.checkNotNull(schemaContext, "SchemaContext can not be null!");
-          Preconditions.checkNotNull(rpcProvisionRegistry, "RpcProviderService can not be null!");
-          Preconditions.checkNotNull(rpcServices, "RpcService can not be null!");
-          return Props.create(RpcManager.class, schemaContext, rpcProvisionRegistry, rpcServices, config);
-      }
+    public static Props props(final SchemaContext schemaContext, final DOMRpcProviderService rpcProvisionRegistry,
+            final DOMRpcService rpcServices, final RemoteRpcProviderConfig config) {
+        Preconditions.checkNotNull(schemaContext, "SchemaContext can not be null!");
+        Preconditions.checkNotNull(rpcProvisionRegistry, "RpcProviderService can not be null!");
+        Preconditions.checkNotNull(rpcServices, "RpcService can not be null!");
+        return Props.create(RpcManager.class, schemaContext, rpcProvisionRegistry, rpcServices, config);
+    }
 
     private void createRpcActors() {
         LOG.debug("Create rpc registry and broker actors");
 
-        rpcRegistry =
-                getContext().actorOf(RpcRegistry.props(config).
-                    withMailbox(config.getMailBoxName()), config.getRpcRegistryName());
+        rpcRegistry = getContext().actorOf(RpcRegistry.props(config)
+                .withMailbox(config.getMailBoxName()), config.getRpcRegistryName());
 
-        rpcBroker =
-                getContext().actorOf(RpcBroker.props(rpcServices).
-                    withMailbox(config.getMailBoxName()), config.getRpcBrokerName());
+        rpcBroker = getContext().actorOf(RpcBroker.props(rpcServices)
+                .withMailbox(config.getMailBoxName()), config.getRpcBrokerName());
 
         final RpcRegistry.Messages.SetLocalRouter localRouter = new RpcRegistry.Messages.SetLocalRouter(rpcBroker);
         rpcRegistry.tell(localRouter, self());
@@ -106,9 +98,9 @@ public class RpcManager extends AbstractUntypedActor {
     private void registerRoutedRpcDelegate() {
         final Set<DOMRpcIdentifier> rpcIdentifiers = new HashSet<>();
         final Set<Module> modules = schemaContext.getModules();
-        for(final Module module : modules){
-            for(final RpcDefinition rpcDefinition : module.getRpcs()){
-                if(RpcRoutingStrategy.from(rpcDefinition).isContextBasedRouted()) {
+        for (final Module module : modules) {
+            for (final RpcDefinition rpcDefinition : module.getRpcs()) {
+                if (RpcRoutingStrategy.from(rpcDefinition).isContextBasedRouted()) {
                     LOG.debug("Adding routed rpcDefinition for path {}", rpcDefinition.getPath());
                     rpcIdentifiers.add(DOMRpcIdentifier.create(rpcDefinition.getPath(), YangInstanceIdentifier.EMPTY));
                 }
@@ -118,16 +110,17 @@ public class RpcManager extends AbstractUntypedActor {
     }
 
     /**
-     * Add all the locally registered RPCs in the clustered routing table
+     * Add all the locally registered RPCs in the clustered routing table.
      */
-    private void announceSupportedRpcs(){
+    private void announceSupportedRpcs() {
         LOG.debug("Adding all supported rpcs to routing table");
         final Set<RpcDefinition> currentlySupportedRpc = schemaContext.getOperations();
         final List<DOMRpcIdentifier> rpcs = new ArrayList<>();
         for (final RpcDefinition rpcDef : currentlySupportedRpc) {
             rpcs.add(DOMRpcIdentifier.create(rpcDef.getPath()));
         }
-        if(!rpcs.isEmpty()) {
+
+        if (!rpcs.isEmpty()) {
             rpcListener.onRpcAvailable(rpcs);
         }
     }
@@ -135,29 +128,23 @@ public class RpcManager extends AbstractUntypedActor {
 
     @Override
     protected void handleReceive(final Object message) throws Exception {
-      if(message instanceof UpdateSchemaContext) {
-        updateSchemaContext((UpdateSchemaContext) message);
-      }
-
+        if (message instanceof UpdateSchemaContext) {
+            updateSchemaContext((UpdateSchemaContext) message);
+        }
     }
 
     private void updateSchemaContext(final UpdateSchemaContext message) {
-      schemaContext = message.getSchemaContext();
-      registerRoutedRpcDelegate();
-      rpcBroker.tell(message, ActorRef.noSender());
+        schemaContext = message.getSchemaContext();
+        registerRoutedRpcDelegate();
+        rpcBroker.tell(message, ActorRef.noSender());
     }
 
     @Override
     public SupervisorStrategy supervisorStrategy() {
-      return new OneForOneStrategy(10, Duration.create("1 minute"),
-          new Function<Throwable, SupervisorStrategy.Directive>() {
-            @Override
-            public SupervisorStrategy.Directive apply(final Throwable t) {
-              LOG.error("An exception happened actor will be resumed", t);
+        return new OneForOneStrategy(10, Duration.create("1 minute"), (Function<Throwable, Directive>) t -> {
+            LOG.error("An exception happened actor will be resumed", t);
 
-              return SupervisorStrategy.resume();
-            }
-          }
-      );
+            return SupervisorStrategy.resume();
+        });
     }
 }