Remove reliance on org.opendaylight.controller.sal.core.api.Broker

Broker-related interfaces are no longer used, as we are activating
via blueprint. Remove references to them.

Change-Id: I67552c986c31e0214cb35d8fc2b60cca536ecbb5
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProvider.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProvider.java
index e4f6a21f8e75fafca75fb29bd6f8ba249c85f19f..51e56d0d984dcf93e7e47843f11c18d57bdfab8c 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProvider.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProvider.java
@@ -12,12 +12,8 @@ import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import akka.actor.PoisonPill;
 import com.google.common.base.Preconditions;
 import akka.actor.ActorSystem;
 import akka.actor.PoisonPill;
 import com.google.common.base.Preconditions;

-import com.google.common.collect.ImmutableSet;
-import java.util.Collection;

 import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;

-import org.opendaylight.controller.sal.core.api.Broker;
-import org.opendaylight.controller.sal.core.api.Provider;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 


@@ -25,28 +21,25 @@ import org.slf4j.LoggerFactory;
  * This is the base class which initialize all the actors, listeners and
  * default RPc implementation so remote invocation of rpcs.
  */
  * This is the base class which initialize all the actors, listeners and
  * default RPc implementation so remote invocation of rpcs.
  */

-public class RemoteRpcProvider implements AutoCloseable, Provider {
+public class RemoteRpcProvider implements AutoCloseable {

 
     private static final Logger LOG = LoggerFactory.getLogger(RemoteRpcProvider.class);
 
     private final DOMRpcProviderService rpcProvisionRegistry;
     private final RemoteRpcProviderConfig config;
     private final ActorSystem actorSystem;
 
     private static final Logger LOG = LoggerFactory.getLogger(RemoteRpcProvider.class);
 
     private final DOMRpcProviderService rpcProvisionRegistry;
     private final RemoteRpcProviderConfig config;
     private final ActorSystem actorSystem;

+    private final DOMRpcService rpcService;

 
 

-    private DOMRpcService rpcService;

     private ActorRef rpcManager;
 
     public RemoteRpcProvider(final ActorSystem actorSystem, final DOMRpcProviderService rpcProvisionRegistry,
     private ActorRef rpcManager;
 
     public RemoteRpcProvider(final ActorSystem actorSystem, final DOMRpcProviderService rpcProvisionRegistry,

-            final RemoteRpcProviderConfig config) {
-        this.actorSystem = actorSystem;
-        this.rpcProvisionRegistry = rpcProvisionRegistry;
+            final DOMRpcService rpcService, final RemoteRpcProviderConfig config) {
+        this.actorSystem = Preconditions.checkNotNull(actorSystem);
+        this.rpcProvisionRegistry = Preconditions.checkNotNull(rpcProvisionRegistry);
+        this.rpcService = Preconditions.checkNotNull(rpcService);

         this.config = Preconditions.checkNotNull(config);
     }
 
         this.config = Preconditions.checkNotNull(config);
     }
 

-    public void setRpcService(final DOMRpcService rpcService) {
-        this.rpcService = rpcService;
-    }
-

     @Override
     public void close() {
         if (rpcManager != null) {
     @Override
     public void close() {
         if (rpcManager != null) {


@@ -56,17 +49,6 @@ public class RemoteRpcProvider implements AutoCloseable, Provider {
         }
     }
 
         }
     }
 

-    @Override
-    public void onSessionInitiated(final Broker.ProviderSession session) {
-        rpcService = session.getService(DOMRpcService.class);
-        start();
-    }
-
-    @Override
-    public Collection<ProviderFunctionality> getProviderFunctionality() {
-        return ImmutableSet.of();
-    }
-

     public void start() {
         LOG.info("Starting Remote RPC service...");
         rpcManager = actorSystem.actorOf(RpcManager.props(rpcProvisionRegistry, rpcService, config),
     public void start() {
         LOG.info("Starting Remote RPC service...");
         rpcManager = actorSystem.actorOf(RpcManager.props(rpcProvisionRegistry, rpcService, config),

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 c6ec928ea70d5b8a3e3a4d7cf24f5d0a9230527d..226faf22dcced063a49fb28a691a0095fc789c6f 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
@@ -10,11 +10,12 @@ package org.opendaylight.controller.remote.rpc;
 
 import akka.actor.ActorSystem;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
 
 import akka.actor.ActorSystem;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;

+import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;

 
 public class RemoteRpcProviderFactory {
     public static RemoteRpcProvider createInstance(final DOMRpcProviderService rpcProviderService,
 
 public class RemoteRpcProviderFactory {
     public static RemoteRpcProvider createInstance(final DOMRpcProviderService rpcProviderService,

-            final ActorSystem actorSystem, final RemoteRpcProviderConfig config) {
+            final DOMRpcService rpcService, final ActorSystem actorSystem, final RemoteRpcProviderConfig config) {

 
 

-        return new RemoteRpcProvider(actorSystem, rpcProviderService, config);
+        return new RemoteRpcProvider(actorSystem, rpcProviderService, rpcService, config);

     }
 }
     }
 }

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/resources/org/opendaylight/blueprint/remote-rpc.xml b/opendaylight/md-sal/sal-remoterpc-connector/src/main/resources/org/opendaylight/blueprint/remote-rpc.xml
index f12a289b7d3b1a5fe92fd9a53cf7af636f84b244..233d7b8dce3b93fa491f995bf3afbd22a146bee7 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/resources/org/opendaylight/blueprint/remote-rpc.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/resources/org/opendaylight/blueprint/remote-rpc.xml
@@ -29,9 +29,9 @@
   <bean id="remoteRpcProvider" class="org.opendaylight.controller.remote.rpc.RemoteRpcProviderFactory"
           factory-method="createInstance" init-method="start" destroy-method="close">
     <argument ref="domRpcRegistry"/>
   <bean id="remoteRpcProvider" class="org.opendaylight.controller.remote.rpc.RemoteRpcProviderFactory"
           factory-method="createInstance" init-method="start" destroy-method="close">
     <argument ref="domRpcRegistry"/>

+    <argument ref="domRpcService"/>

     <argument ref="actorSystem"/>
     <argument ref="remoteRpcProviderConfig"/>
     <argument ref="actorSystem"/>
     <argument ref="remoteRpcProviderConfig"/>

-    <property name="rpcService" ref="domRpcService"/>

   </bean>
 
 </blueprint>
   </bean>
 
 </blueprint>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java
index 438c7423f6d3f6985adc624e33714bb8acf399bd..32b54c4a8cf5470e2fa11060f17e48f88f7cff41 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/AbstractRpcTest.java
@@ -26,7 +26,6 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;

-import org.opendaylight.controller.sal.core.api.Broker;

 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity;


@@ -72,7 +71,6 @@ public class AbstractRpcTest {
     protected JavaTestKit rpcRegistry1Probe;
     protected ActorRef rpcInvoker2;
     protected JavaTestKit rpcRegistry2Probe;
     protected JavaTestKit rpcRegistry1Probe;
     protected ActorRef rpcInvoker2;
     protected JavaTestKit rpcRegistry2Probe;

-    protected Broker.ProviderSession brokerSession;

     protected SchemaContext schemaContext;
     protected RemoteRpcImplementation remoteRpcImpl1;
     protected RemoteRpcImplementation remoteRpcImpl2;
     protected SchemaContext schemaContext;
     protected RemoteRpcImplementation remoteRpcImpl1;
     protected RemoteRpcImplementation remoteRpcImpl2;

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java
index 76e63c4e1d3da01d8aa7ce7a864f360d6f6b4dfe..45fc9ffbbc7f4eea33586935a82b74a7f5ed1f20 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderTest.java
@@ -9,7 +9,6 @@
 package org.opendaylight.controller.remote.rpc;
 
 import static org.mockito.Mockito.mock;
 package org.opendaylight.controller.remote.rpc;
 
 import static org.mockito.Mockito.mock;

-import static org.mockito.Mockito.when;

 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;


@@ -23,7 +22,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;

-import org.opendaylight.controller.sal.core.api.Broker;

 import scala.concurrent.Await;
 import scala.concurrent.duration.Duration;
 
 import scala.concurrent.Await;
 import scala.concurrent.duration.Duration;
 


@@ -49,11 +47,9 @@ public class RemoteRpcProviderTest {
     @Test
     public void testRemoteRpcProvider() throws Exception {
         try (final RemoteRpcProvider rpcProvider = new RemoteRpcProvider(system, mock(DOMRpcProviderService.class),
     @Test
     public void testRemoteRpcProvider() throws Exception {
         try (final RemoteRpcProvider rpcProvider = new RemoteRpcProvider(system, mock(DOMRpcProviderService.class),

-                new RemoteRpcProviderConfig(system.settings().config()))) {
-            final Broker.ProviderSession session = mock(Broker.ProviderSession.class);
-            when(session.getService(DOMRpcService.class)).thenReturn(mock(DOMRpcService.class));
+            mock(DOMRpcService.class), new RemoteRpcProviderConfig(system.settings().config()))) {

 
 

-            rpcProvider.onSessionInitiated(session);
+            rpcProvider.start();

 
             final ActorRef actorRef = Await.result(
                     system.actorSelection(moduleConfig.getRpcManagerPath()).resolveOne(
 
             final ActorRef actorRef = Await.result(
                     system.actorSelection(moduleConfig.getRpcManagerPath()).resolveOne(