X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fconfig%2FFileModuleShardConfigProvider.java;h=2920f45fe93d198b935fd50690a97ffb0cfd342c;hb=4e696d9795fe7eef40369c05c340d137394126f3;hp=80fc09c97a1a57ddadbe242c41c3dc3cb46e3ea0;hpb=285e83f59f15a4a614d423a3780a607d562d030b;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/FileModuleShardConfigProvider.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/FileModuleShardConfigProvider.java
index 80fc09c97a..2920f45fe9 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/FileModuleShardConfigProvider.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/FileModuleShardConfigProvider.java
@@ -14,6 +14,8 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,7 +42,7 @@ public class FileModuleShardConfigProvider implements ModuleShardConfigProvider
         File modulesFile = new File("./configuration/initial/" + modulesConfigPath);
 
         Config moduleShardsConfig = null;
-        if(moduleShardsFile.exists()) {
+        if (moduleShardsFile.exists()) {
             LOG.info("module shards config file exists - reading config from it");
             moduleShardsConfig = ConfigFactory.parseFile(moduleShardsFile);
         } else {
@@ -49,7 +51,7 @@ public class FileModuleShardConfigProvider implements ModuleShardConfigProvider
         }
 
         Config modulesConfig = null;
-        if(modulesFile.exists()) {
+        if (modulesFile.exists()) {
             LOG.info("modules config file exists - reading config from it");
             modulesConfig = ConfigFactory.parseFile(modulesFile);
         } else {
@@ -67,19 +69,19 @@ public class FileModuleShardConfigProvider implements ModuleShardConfigProvider
             Configuration configuration) {
         List<? extends ConfigObject> modulesConfigObjectList = modulesConfig.getObjectList("modules");
 
-        for(ConfigObject o : modulesConfigObjectList){
-            ConfigObjectWrapper w = new ConfigObjectWrapper(o);
+        for (ConfigObject o : modulesConfigObjectList) {
+            ConfigObjectWrapper wrapper = new ConfigObjectWrapper(o);
 
-            String moduleName = w.stringValue("name");
+            String moduleName = wrapper.stringValue("name");
             ModuleConfig.Builder builder = moduleConfigMap.get(moduleName);
-            if(builder == null) {
+            if (builder == null) {
                 builder = ModuleConfig.builder(moduleName);
                 moduleConfigMap.put(moduleName, builder);
             }
 
-            builder.nameSpace(w.stringValue("namespace"));
+            builder.nameSpace(wrapper.stringValue("namespace"));
             builder.shardStrategy(ShardStrategyFactory.newShardStrategyInstance(moduleName,
-                    w.stringValue("shard-strategy"), configuration));
+                    wrapper.stringValue("shard-strategy"), configuration));
         }
     }
 
@@ -88,16 +90,17 @@ public class FileModuleShardConfigProvider implements ModuleShardConfigProvider
             moduleShardsConfig.getObjectList("module-shards");
 
         Map<String, ModuleConfig.Builder> moduleConfigMap = new HashMap<>();
-        for(ConfigObject moduleShardConfigObject : moduleShardsConfigObjectList){
+        for (ConfigObject moduleShardConfigObject : moduleShardsConfigObjectList) {
             String moduleName = moduleShardConfigObject.get("name").unwrapped().toString();
             ModuleConfig.Builder builder = ModuleConfig.builder(moduleName);
 
             List<? extends ConfigObject> shardsConfigObjectList =
                 moduleShardConfigObject.toConfig().getObjectList("shards");
 
-            for(ConfigObject shard : shardsConfigObjectList){
+            for (ConfigObject shard : shardsConfigObjectList) {
                 String shardName = shard.get("name").unwrapped().toString();
-                List<String> replicas = shard.toConfig().getStringList("replicas");
+                List<MemberName> replicas = shard.toConfig().getStringList("replicas").stream()
+                        .map(MemberName::forName).collect(Collectors.toList());
                 builder.shardConfig(shardName, replicas);
             }
 
@@ -107,15 +110,15 @@ public class FileModuleShardConfigProvider implements ModuleShardConfigProvider
         return moduleConfigMap;
     }
 
-    private static class ConfigObjectWrapper{
+    private static class ConfigObjectWrapper {
 
         private final ConfigObject configObject;
 
-        ConfigObjectWrapper(final ConfigObject configObject){
+        ConfigObjectWrapper(final ConfigObject configObject) {
             this.configObject = configObject;
         }
 
-        public String stringValue(final String name){
+        public String stringValue(final String name) {
             return configObject.get(name).unwrapped().toString();
         }
     }