Remove prefix shard leftovers

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / shardstrategy / ModuleShardStrategy.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java
index fc7ebd94dd481c909ba6e4d65d205e41cbfdebbf..c90baf2760c00a07fd08812ec3869cfc59727f10 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategy.java
@@ -8,11 +8,9 @@
 
 package org.opendaylight.controller.cluster.datastore.shardstrategy;
 
-import org.opendaylight.controller.cluster.datastore.Configuration;
+import org.opendaylight.controller.cluster.datastore.config.Configuration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
-import java.util.List;
-
 public class ModuleShardStrategy implements ShardStrategy {
 
     public static final String NAME = "module";
@@ -20,18 +18,14 @@ public class ModuleShardStrategy implements ShardStrategy {
     private final String moduleName;
     private final Configuration configuration;
 
-    public ModuleShardStrategy(String moduleName, Configuration configuration){
+    public ModuleShardStrategy(String moduleName, Configuration configuration) {
         this.moduleName = moduleName;
-
         this.configuration = configuration;
     }
 
-    @Override public String findShard(YangInstanceIdentifier path) {
-        List<String> shardNames =
-            configuration.getShardNamesFromModuleName(moduleName);
-        if(shardNames.size() == 0){
-            return DefaultShardStrategy.DEFAULT_SHARD;
-        }
-        return shardNames.get(0);
+    @Override
+    public String findShard(YangInstanceIdentifier path) {
+        String shardName = configuration.getShardNameForModule(moduleName);
+        return shardName != null ? shardName : DefaultShardStrategy.DEFAULT_SHARD;
     }
 }