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=1a5a4ac3137ebc9f9b10f1d14f96e53cdebc1fcb;hb=87c8362c7501408b281f5ddc9b78ed7440280fa1;hp=f4ab8fab6f768e84bd48c15ebc83e862315e09eb;hpb=83140d53722ad77dd804f7b4d761a673110b83b3;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 f4ab8fab6f..1a5a4ac313 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
@@ -8,52 +8,44 @@
 
 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.controller.cluster.datastore.config.Configuration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 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) {
+        Preconditions.checkState(configuration != null, "configuration should not be missing");
+        this.configuration = configuration;
     }
 
-    public static ShardStrategy getStrategy(YangInstanceIdentifier path) {
-        Preconditions.checkState(configuration != null, "configuration should not be missing");
+    public ShardStrategy getStrategy(final YangInstanceIdentifier path) {
         Preconditions.checkNotNull(path, "path should not be null");
 
-
         String moduleName = getModuleName(path);
-        ShardStrategy shardStrategy = moduleNameToStrategyMap.get(moduleName);
+        ShardStrategy shardStrategy = configuration.getStrategyForModule(moduleName);
         if (shardStrategy == null) {
-            return new DefaultShardStrategy();
+            return DefaultShardStrategy.getInstance();
         }
 
         return shardStrategy;
     }
 
-
-    private static String getModuleName(YangInstanceIdentifier path) {
-        String namespace = path.getPathArguments().iterator().next().getNodeType().getNamespace().toASCIIString();
-
-        Optional<String> optional =
-            configuration.getModuleNameFromNameSpace(namespace);
-
-        if(!optional.isPresent()){
-            return UNKNOWN_MODULE_NAME;
+    public static ShardStrategy newShardStrategyInstance(String moduleName, String strategyName,
+            Configuration configuration) {
+        if(ModuleShardStrategy.NAME.equals(strategyName)){
+            return new ModuleShardStrategy(moduleName, configuration);
         }
 
-        return optional.get();
+        return DefaultShardStrategy.getInstance();
+    }
+
+    private String getModuleName(final YangInstanceIdentifier path) {
+        String namespace = path.getPathArguments().iterator().next().getNodeType().getNamespace().toASCIIString();
+        String moduleName = configuration.getModuleNameFromNameSpace(namespace);
+        return moduleName != null ? moduleName : UNKNOWN_MODULE_NAME;
     }
 }