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%2FModuleConfig.java;h=353c80ce45b7d7376746bea2bb1ed453cf375ffb;hb=d796a8de8b208ca24bb57aebfc689f8be8bc2c7b;hp=5b1421b5443413c60869f9503b367e2d51dfd447;hpb=4e3f49788c05730b29468deebc2aaa4ed0d94eef;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ModuleConfig.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ModuleConfig.java
index 5b1421b544..353c80ce45 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ModuleConfig.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ModuleConfig.java
@@ -24,14 +24,14 @@ import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy
  */
 public class ModuleConfig {
     private final String name;
-    private final String nameSpace;
+    private final String namespace;
     private final ShardStrategy shardStrategy;
     private final Map<String, ShardConfig> shardConfigs;
 
-    private ModuleConfig(String name, String nameSpace, ShardStrategy shardStrategy,
+    private ModuleConfig(String name, String namespace, ShardStrategy shardStrategy,
             Map<String, ShardConfig> shardConfigs) {
         this.name = name;
-        this.nameSpace = nameSpace;
+        this.namespace = namespace;
         this.shardStrategy = shardStrategy;
         this.shardConfigs = shardConfigs;
     }
@@ -42,8 +42,8 @@ public class ModuleConfig {
     }
 
     @Nullable
-    public String getNameSpace() {
-        return nameSpace;
+    public String getNamespace() {
+        return namespace;
     }
 
     @Nullable
@@ -52,8 +52,8 @@ public class ModuleConfig {
     }
 
     @Nullable
-    public ShardConfig getShardConfig(String name) {
-        return shardConfigs.get(name);
+    public ShardConfig getShardConfig(String forName) {
+        return shardConfigs.get(forName);
     }
 
     @Nonnull
@@ -86,30 +86,30 @@ public class ModuleConfig {
 
         private Builder(ModuleConfig moduleConfig) {
             this.name = moduleConfig.getName();
-            this.nameSpace = moduleConfig.getNameSpace();
+            this.nameSpace = moduleConfig.getNamespace();
             this.shardStrategy = moduleConfig.getShardStrategy();
             for (ShardConfig shardConfig : moduleConfig.getShardConfigs()) {
                 shardConfigs.put(shardConfig.getName(), shardConfig);
             }
         }
 
-        public Builder name(String name) {
-            this.name = name;
+        public Builder name(String newName) {
+            this.name = newName;
             return this;
         }
 
-        public Builder nameSpace(String nameSpace) {
-            this.nameSpace = nameSpace;
+        public Builder nameSpace(String newNameSpace) {
+            this.nameSpace = newNameSpace;
             return this;
         }
 
-        public Builder shardStrategy(ShardStrategy shardStrategy) {
-            this.shardStrategy = shardStrategy;
+        public Builder shardStrategy(ShardStrategy newShardStrategy) {
+            this.shardStrategy = newShardStrategy;
             return this;
         }
 
-        public Builder shardConfig(String name, Collection<MemberName> replicas) {
-            shardConfigs.put(name, new ShardConfig(name, replicas));
+        public Builder shardConfig(String shardName, Collection<MemberName> replicas) {
+            shardConfigs.put(shardName, new ShardConfig(shardName, replicas));
             return this;
         }