BUG-5280: remove support for talking to pre-Boron clients

[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 896ebaef4613bbf461c3e18445705161e2bed50c..26cbc053f696192e61d895b9937d9b9066c09632 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,7 +8,6 @@
 
 package org.opendaylight.controller.cluster.datastore.shardstrategy;
 
-import java.util.List;
 import org.opendaylight.controller.cluster.datastore.config.Configuration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
@@ -21,17 +20,12 @@ public class ModuleShardStrategy implements ShardStrategy {
 
     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.isEmpty()) {
-            return DefaultShardStrategy.DEFAULT_SHARD;
-        }
-        return shardNames.get(0);
+        String shardName = configuration.getShardNameForModule(moduleName);
+        return shardName != null ? shardName : DefaultShardStrategy.DEFAULT_SHARD;
     }
 }