X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2Fext%2FActionProviderBean.java;fp=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2Fext%2FActionProviderBean.java;h=1a0c712cf8d07a2a2a52ca1440394e004f9dc972;hb=8fbf100a671b513d9ec777c074cffe137773e9bb;hp=d2d3ddc31914d1c871b9df87ddc1e8a4ebd81b49;hpb=7f7aafb85967dac821a13eaf984bdba499b5afd8;p=controller.git

diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java
index d2d3ddc319..1a0c712cf8 100644
--- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java
+++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java
@@ -12,12 +12,12 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Futures;
 import java.util.Collection;
 import java.util.Set;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationNotAvailableException;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
-import org.opendaylight.controller.md.sal.dom.broker.spi.rpc.RpcRoutingStrategy;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException;
+import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.spi.RpcRoutingStrategy;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
  *
  * <p>
  * This bean has two distinct facets:
- * - if a reference bean is provided, it registers it with {@link RpcProviderRegistry}
+ * - if a reference bean is provided, it registers it with {@link RpcProviderService}
  * - if a reference bean is not provided, it registers the corresponding no-op implementation with
  *   {@link DOMRpcProviderService} for all action (Routed RPC) elements in the provided interface
  *
@@ -43,8 +43,8 @@ public class ActionProviderBean {
 
     private static final Logger LOG = LoggerFactory.getLogger(ActionProviderBean.class);
 
-    private DOMRpcProviderService rpcProviderService;
-    private RpcProviderRegistry rpcRegistry;
+    private DOMRpcProviderService domRpcProvider;
+    private RpcProviderService bindingRpcProvider;
     private DOMSchemaService schemaService;
     private RpcService implementation;
     private String interfaceName;
@@ -63,12 +63,12 @@ public class ActionProviderBean {
         this.implementation = implementation;
     }
 
-    public void setRpcProviderService(final DOMRpcProviderService rpcProviderService) {
-        this.rpcProviderService = rpcProviderService;
+    public void setDomRpcProvider(final DOMRpcProviderService rpcProviderService) {
+        this.domRpcProvider = rpcProviderService;
     }
 
-    public void setRpcRegistry(final RpcProviderRegistry rpcRegistry) {
-        this.rpcRegistry = rpcRegistry;
+    public void setBindingRpcProvider(final RpcProviderService rpcProvider) {
+        this.bindingRpcProvider = rpcProvider;
     }
 
     public void setSchemaService(final DOMSchemaService schemaService) {
@@ -129,7 +129,7 @@ public class ActionProviderBean {
         }
 
         final Set<DOMRpcIdentifier> rpcs = ImmutableSet.copyOf(Collections2.transform(paths, DOMRpcIdentifier::create));
-        reg = rpcProviderService.registerRpcImplementation((rpc, input) -> {
+        reg = domRpcProvider.registerRpcImplementation((rpc, input) -> {
             return Futures.immediateFailedCheckedFuture(new DOMRpcImplementationNotAvailableException(
                 "Action %s has no instance matching %s", rpc, input));
         }, rpcs);
@@ -143,7 +143,7 @@ public class ActionProviderBean {
                 interfaceName, ACTION_PROVIDER, implementation.getClass()));
         }
 
-        reg = rpcRegistry.addRpcImplementation(interfaceClass, implementation);
+        reg = bindingRpcProvider.registerRpcImplementation(interfaceClass, implementation);
         LOG.debug("Registered implementation {} for {}", implementation, interfaceName);
     }
 }