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%2Fshardstrategy%2FShardStrategyFactory.java;h=0a93c0d6b3458710950e318495cad9861057b7c2;hb=HEAD;hp=1a5a4ac3137ebc9f9b10f1d14f96e53cdebc1fcb;hpb=5273c33b6f2051a7e3b1afcc4eeae4e457b6f26c;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java
index 1a5a4ac313..0a93c0d6b3 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ShardStrategyFactory.java
@@ -5,10 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.cluster.datastore.shardstrategy;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.controller.cluster.datastore.config.Configuration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
@@ -18,15 +19,13 @@ public class ShardStrategyFactory {
     private final Configuration configuration;
 
     public ShardStrategyFactory(final Configuration configuration) {
-        Preconditions.checkState(configuration != null, "configuration should not be missing");
+        checkState(configuration != null, "configuration should not be missing");
         this.configuration = configuration;
     }
 
     public ShardStrategy getStrategy(final YangInstanceIdentifier path) {
-        Preconditions.checkNotNull(path, "path should not be null");
-
-        String moduleName = getModuleName(path);
-        ShardStrategy shardStrategy = configuration.getStrategyForModule(moduleName);
+        final String moduleName = getModuleName(requireNonNull(path, "path should not be null"));
+        final ShardStrategy shardStrategy = configuration.getStrategyForModule(moduleName);
         if (shardStrategy == null) {
             return DefaultShardStrategy.getInstance();
         }
@@ -34,9 +33,9 @@ public class ShardStrategyFactory {
         return shardStrategy;
     }
 
-    public static ShardStrategy newShardStrategyInstance(String moduleName, String strategyName,
-            Configuration configuration) {
-        if(ModuleShardStrategy.NAME.equals(strategyName)){
+    public static ShardStrategy newShardStrategyInstance(final String moduleName, final String strategyName,
+            final Configuration configuration) {
+        if (ModuleShardStrategy.NAME.equals(strategyName)) {
             return new ModuleShardStrategy(moduleName, configuration);
         }
 
@@ -44,7 +43,11 @@ public class ShardStrategyFactory {
     }
 
     private String getModuleName(final YangInstanceIdentifier path) {
-        String namespace = path.getPathArguments().iterator().next().getNodeType().getNamespace().toASCIIString();
+        if (path.isEmpty()) {
+            return UNKNOWN_MODULE_NAME;
+        }
+
+        String namespace = path.getPathArguments().get(0).getNodeType().getNamespace().toString();
         String moduleName = configuration.getModuleNameFromNameSpace(namespace);
         return moduleName != null ? moduleName : UNKNOWN_MODULE_NAME;
     }