X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fshardstrategy%2FShardStrategyFactory.java;h=0a93c0d6b3458710950e318495cad9861057b7c2;hp=8b077d6ee6e27f279cdf030d7e422cc18fcfabba;hb=b5d01b5d28d52413bf45b626b746c1519685058c;hpb=fe4049d34de103016d11f3a9050853c6380646d3

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 8b077d6ee6..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,56 +5,50 @@
  * 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.Optional;
-import com.google.common.base.Preconditions;
-import org.opendaylight.controller.cluster.datastore.Configuration;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import org.opendaylight.controller.cluster.datastore.config.Configuration;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 public class ShardStrategyFactory {
-    private static Map<String, ShardStrategy> moduleNameToStrategyMap =
-        new ConcurrentHashMap();
-
     private static final String UNKNOWN_MODULE_NAME = "unknown";
-    private static Configuration configuration;
 
+    private final Configuration configuration;
 
-    public static void setConfiguration(Configuration configuration){
-        ShardStrategyFactory.configuration = configuration;
-        moduleNameToStrategyMap = configuration.getModuleNameToShardStrategyMap();
+    public ShardStrategyFactory(final Configuration configuration) {
+        checkState(configuration != null, "configuration should not be missing");
+        this.configuration = configuration;
     }
 
-    public static ShardStrategy getStrategy(InstanceIdentifier path) {
-        Preconditions.checkState(configuration != null, "configuration should not be missing");
-        Preconditions.checkNotNull(path, "path should not be null");
-
-
-        String moduleName = getModuleName(path);
-        ShardStrategy shardStrategy = moduleNameToStrategyMap.get(moduleName);
+    public ShardStrategy getStrategy(final YangInstanceIdentifier path) {
+        final String moduleName = getModuleName(requireNonNull(path, "path should not be null"));
+        final ShardStrategy shardStrategy = configuration.getStrategyForModule(moduleName);
         if (shardStrategy == null) {
-            return new DefaultShardStrategy();
+            return DefaultShardStrategy.getInstance();
         }
 
         return shardStrategy;
     }
 
+    public static ShardStrategy newShardStrategyInstance(final String moduleName, final String strategyName,
+            final Configuration configuration) {
+        if (ModuleShardStrategy.NAME.equals(strategyName)) {
+            return new ModuleShardStrategy(moduleName, configuration);
+        }
 
-    private static String getModuleName(InstanceIdentifier path) {
-        String namespace = path.getLastPathArgument().getNodeType().getNamespace()
-            .toASCIIString();
-
-        Optional<String> optional =
-            configuration.getModuleNameFromNameSpace(namespace);
+        return DefaultShardStrategy.getInstance();
+    }
 
-        if(!optional.isPresent()){
+    private String getModuleName(final YangInstanceIdentifier path) {
+        if (path.isEmpty()) {
             return UNKNOWN_MODULE_NAME;
         }
 
-        return optional.get();
+        String namespace = path.getPathArguments().get(0).getNodeType().getNamespace().toString();
+        String moduleName = configuration.getModuleNameFromNameSpace(namespace);
+        return moduleName != null ? moduleName : UNKNOWN_MODULE_NAME;
     }
 }