BUG 2412 - remove CompositeNode from sal-remoterpc-connector

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / src / main / java / org / opendaylight / controller / remote / rpc / RemoteRpcProviderFactory.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java
index 2e355d4f5146b13c31ee9f4a66a1bbed757d9354..d17242ed6048f51638d11612db130c2d62f33961 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderFactory.java
@@ -11,8 +11,8 @@ package org.opendaylight.controller.remote.rpc;
 import akka.actor.ActorSystem;
 import akka.osgi.BundleDelegatingClassLoader;
 import com.typesafe.config.Config;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
 import org.opendaylight.controller.sal.core.api.Broker;
-import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,23 +23,24 @@ public class RemoteRpcProviderFactory {
     public static RemoteRpcProvider createInstance(
             final Broker broker, final BundleContext bundleContext, final RemoteRpcProviderConfig config){
 
-      RemoteRpcProvider rpcProvider =
-          new RemoteRpcProvider(createActorSystem(bundleContext, config), (RpcProvisionRegistry) broker);
+      final RemoteRpcProvider rpcProvider =
+          new RemoteRpcProvider(createActorSystem(bundleContext, config), (DOMRpcProviderService) broker);
 
       broker.registerProvider(rpcProvider);
       return rpcProvider;
     }
 
-    private static ActorSystem createActorSystem(BundleContext bundleContext, RemoteRpcProviderConfig config){
+    private static ActorSystem createActorSystem(final BundleContext bundleContext, final RemoteRpcProviderConfig config){
 
         // Create an OSGi bundle classloader for actor system
-        BundleDelegatingClassLoader classLoader =
+        final BundleDelegatingClassLoader classLoader =
                 new BundleDelegatingClassLoader(bundleContext.getBundle(),
                         Thread.currentThread().getContextClassLoader());
 
-        Config actorSystemConfig = config.get();
-        LOG.debug("Actor system configuration\n{}", actorSystemConfig.root().render());
-
+        final Config actorSystemConfig = config.get();
+        if(LOG.isDebugEnabled()) {
+            LOG.debug("Actor system configuration\n{}", actorSystemConfig.root().render());
+        }
         if (config.isMetricCaptureEnabled()) {
             LOG.info("Instrumentation is enabled in actor system {}. Metrics can be viewed in JMX console.",
                     config.getActorSystemName());