Move ClusterAdminRpcService to its own bundle

[controller.git] / opendaylight / md-sal / sal-cluster-admin / src / main / java / org / opendaylight / controller / config / yang / config / cluster_admin_provider / ClusterAdminProviderModule.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java b/opendaylight/md-sal/sal-cluster-admin/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java
similarity index 52%
rename from opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java
rename to opendaylight/md-sal/sal-cluster-admin/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java
index facc07f11d121044a8c8d5d1299f95d38d315bad..270a6214ec9cd8c5ee63555742e5f4638cd88a7d 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java
+++ b/opendaylight/md-sal/sal-cluster-admin/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java
@@ -8,11 +8,9 @@
 
 package org.opendaylight.controller.config.yang.config.cluster_admin_provider;
 
-import com.google.common.base.Preconditions;
-import org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface;
-import org.opendaylight.controller.cluster.datastore.admin.ClusterAdminRpcService;
 import org.opendaylight.controller.config.api.DependencyResolver;
 import org.opendaylight.controller.config.api.ModuleIdentifier;
+import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
 
 public class ClusterAdminProviderModule extends AbstractClusterAdminProviderModule {
     public ClusterAdminProviderModule(ModuleIdentifier identifier, DependencyResolver dependencyResolver) {
@@ -25,20 +23,13 @@ public class ClusterAdminProviderModule extends AbstractClusterAdminProviderModu
     }
 
     @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
+    public boolean canReuseInstance(AbstractClusterAdminProviderModule oldModule) {
+        return true;
     }
 
     @Override
     public AutoCloseable createInstance() {
-        Preconditions.checkArgument(getConfigDataStoreDependency() instanceof DistributedDataStoreInterface,
-                "Injected config DOMStore must be an instance of DistributedDataStoreInterface");
-        Preconditions.checkArgument(getOperDataStoreDependency() instanceof DistributedDataStoreInterface,
-                "Injected operational DOMStore must be an instance of DistributedDataStoreInterface");
-        ClusterAdminRpcService service = new ClusterAdminRpcService(
-                (DistributedDataStoreInterface)getConfigDataStoreDependency(),
-                (DistributedDataStoreInterface)getOperDataStoreDependency());
-        service.start(getRpcRegistryDependency());
-        return service;
+        // The ClusterAdminRpcService is created via blueprint so return a noop here for backwards compatibility.
+        return NoopAutoCloseable.INSTANCE;
     }
 }
\ No newline at end of file