Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove DataChangeListener protobuff messages
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
utils
/
MockConfiguration.java
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 77097352489fa97a153761bb16817fcdd9fd6521..24d8cfd406e3a5288c949b977ff4bcfca5cc3c78 100644
(file)
--- 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
@@
-8,7
+8,6
@@
package org.opendaylight.controller.cluster.datastore.utils;
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.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@
-27,13
+26,11
@@
public class MockConfiguration extends ConfigurationImpl {
public MockConfiguration(final Map<String, List<String>> shardMembers) {
super(new ModuleShardConfigProvider() {
@Override
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
>();
+ public Map<String, ModuleConfig
.Builder
> retrieveModuleConfigs(Configuration configuration) {
+ Map<String, ModuleConfig
.Builder> retMap = new HashMap<
>();
for(Map.Entry<String, List<String>> e : shardMembers.entrySet()) {
String shardName = e.getKey();
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);
+ retMap.put(shardName, ModuleConfig.builder(shardName).shardConfig(shardName, e.getValue()));
}
return retMap;
}
return retMap;