X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Futils%2FMockConfiguration.java;h=ac046884260c82cdbadf23b088b3b269975f2e35;hb=24ee386f244cafa9bd3126ddbba1435969aa76c2;hp=77097352489fa97a153761bb16817fcdd9fd6521;hpb=2f523ae2a9be64bf53d1962fd9ddefe47617ff28;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockConfiguration.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockConfiguration.java
index 7709735248..ac04688426 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockConfiguration.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockConfiguration.java
@@ -5,19 +5,17 @@
  * 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.utils;
 
-import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.opendaylight.controller.cluster.datastore.config.Configuration;
+import java.util.stream.Collectors;
+import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl;
 import org.opendaylight.controller.cluster.datastore.config.ModuleConfig;
-import org.opendaylight.controller.cluster.datastore.config.ModuleShardConfigProvider;
 
 public class MockConfiguration extends ConfigurationImpl {
     public MockConfiguration() {
@@ -25,19 +23,16 @@ public class MockConfiguration extends ConfigurationImpl {
     }
 
     public MockConfiguration(final Map<String, List<String>> shardMembers) {
-        super(new ModuleShardConfigProvider() {
-            @Override
-            public Map<String, ModuleConfig> retrieveModuleConfigs(Configuration configuration) {
-                Map<String, ModuleConfig> retMap = new HashMap<String, ModuleConfig>();
-                for(Map.Entry<String, List<String>> e : shardMembers.entrySet()) {
-                    String shardName = e.getKey();
-                    ModuleConfig mc = new ModuleConfig(shardName);
-                    mc.addShardConfig(shardName, Sets.newHashSet(e.getValue()));
-                    retMap.put(mc.getName(), mc);
-                }
-
-                return retMap;
+        super(configuration -> {
+            Map<String, ModuleConfig.Builder> retMap = new HashMap<>();
+            for (Map.Entry<String, List<String>> e : shardMembers.entrySet()) {
+                String shardName = e.getKey();
+                retMap.put(shardName,
+                    ModuleConfig.builder(shardName).shardConfig(
+                        shardName, e.getValue().stream().map(MemberName::forName).collect(Collectors.toList())));
             }
+
+            return retMap;
         });
     }
 }