Remove deprecated MD-SAL APIs

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

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 5b1421b5443413c60869f9503b367e2d51dfd447..ccd7dd66065ef32b8b824a764e6cbb061c5b5db6 100644 (file)
--- 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
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.controller.cluster.datastore.config;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.ImmutableMap;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy;
 
@@ -22,100 +23,93 @@ import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy
  *
  * @author Thomas Pantelis
  */
-public class ModuleConfig {
+public final 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,
-            Map<String, ShardConfig> shardConfigs) {
-        this.name = name;
-        this.nameSpace = nameSpace;
+    ModuleConfig(final String name, final String namespace, final ShardStrategy shardStrategy,
+            final Map<String, ShardConfig> shardConfigs) {
+        this.name = requireNonNull(name);
+        this.namespace = namespace;
         this.shardStrategy = shardStrategy;
         this.shardConfigs = shardConfigs;
     }
 
-    @Nonnull
-    public String getName() {
+    public @NonNull String getName() {
         return name;
     }
 
-    @Nullable
-    public String getNameSpace() {
-        return nameSpace;
+    public @Nullable String getNamespace() {
+        return namespace;
     }
 
-    @Nullable
-    public ShardStrategy getShardStrategy() {
+    public @Nullable ShardStrategy getShardStrategy() {
         return shardStrategy;
     }
 
-    @Nullable
-    public ShardConfig getShardConfig(String name) {
-        return shardConfigs.get(name);
+    public @Nullable ShardConfig getShardConfig(final String forName) {
+        return shardConfigs.get(forName);
     }
 
-    @Nonnull
-    public Collection<ShardConfig> getShardConfigs() {
+    public @NonNull Collection<ShardConfig> getShardConfigs() {
         return shardConfigs.values();
     }
 
-    @Nonnull
-    public Collection<String> getShardNames() {
+    public @NonNull Collection<String> getShardNames() {
         return shardConfigs.keySet();
     }
 
-    public static Builder builder(String name) {
+    public static Builder builder(final String name) {
         return new Builder(name);
     }
 
-    public static Builder builder(ModuleConfig moduleConfig) {
+    public static Builder builder(final ModuleConfig moduleConfig) {
         return new Builder(moduleConfig);
     }
 
-    public static class Builder {
+    public static final class Builder {
         private String name;
         private String nameSpace;
         private ShardStrategy shardStrategy;
         private final Map<String, ShardConfig> shardConfigs = new HashMap<>();
 
-        private Builder(String name) {
+        Builder(final String name) {
             this.name = name;
         }
 
-        private Builder(ModuleConfig moduleConfig) {
+        private Builder(final 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(final String newName) {
+            this.name = newName;
             return this;
         }
 
-        public Builder nameSpace(String nameSpace) {
-            this.nameSpace = nameSpace;
+        public Builder nameSpace(final String newNameSpace) {
+            this.nameSpace = newNameSpace;
             return this;
         }
 
-        public Builder shardStrategy(ShardStrategy shardStrategy) {
-            this.shardStrategy = shardStrategy;
+        public Builder shardStrategy(final 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(final String shardName, final Collection<MemberName> replicas) {
+            shardConfigs.put(shardName, new ShardConfig(shardName, replicas));
             return this;
         }
 
         public ModuleConfig build() {
-            return new ModuleConfig(Preconditions.checkNotNull(name), nameSpace, shardStrategy,
-                    ImmutableMap.copyOf(shardConfigs));
+            return new ModuleConfig(name, nameSpace, shardStrategy, ImmutableMap.copyOf(shardConfigs));
         }
     }
 }