Add blueprint wiring to 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 c82a72eaa56c82e40388b8fb612eed7b198dbae8..c6ec928ea70d5b8a3e3a4d7cf24f5d0a9230527d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -9,43 +9,12 @@
 package org.opendaylight.controller.remote.rpc;
 
 import akka.actor.ActorSystem;
-import akka.osgi.BundleDelegatingClassLoader;
-import com.typesafe.config.Config;
-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;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
 
 public class RemoteRpcProviderFactory {
-    private static final Logger LOG = LoggerFactory.getLogger(RemoteRpcProviderFactory.class);
+    public static RemoteRpcProvider createInstance(final DOMRpcProviderService rpcProviderService,
+            final ActorSystem actorSystem, final RemoteRpcProviderConfig config) {
 
-    public static RemoteRpcProvider createInstance(
-            final Broker broker, final BundleContext bundleContext, final RemoteRpcProviderConfig config){
-
-      RemoteRpcProvider rpcProvider =
-          new RemoteRpcProvider(createActorSystem(bundleContext, config), (RpcProvisionRegistry) broker);
-
-      broker.registerProvider(rpcProvider);
-      return rpcProvider;
-    }
-
-    private static ActorSystem createActorSystem(BundleContext bundleContext, RemoteRpcProviderConfig config){
-
-        // Create an OSGi bundle classloader for actor system
-        BundleDelegatingClassLoader classLoader =
-                new BundleDelegatingClassLoader(bundleContext.getBundle(),
-                        Thread.currentThread().getContextClassLoader());
-
-        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());
-        }
-
-        return ActorSystem.create(config.getActorSystemName(), actorSystemConfig, classLoader);
+        return new RemoteRpcProvider(actorSystem, rpcProviderService, config);
     }
 }