X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fshardmanager%2FTestShardManager.java;h=0783c1646408ebcf1e36c0a252a661fe14192634;hp=337c4c95b9eacaadf5629de076abb0c4077c5c60;hb=e66759266dc43d5f58b2837aca5047b42c205e4a;hpb=da1c4f4a024472c0e8c340ba78d104a72f39785f diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/TestShardManager.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/TestShardManager.java index 337c4c95b9..0783c16464 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/TestShardManager.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/TestShardManager.java @@ -20,15 +20,6 @@ public class TestShardManager extends ShardManager { super(builder); } - @Override - public void handleCommand(Object message) throws Exception { - if (GetLocalShards.INSTANCE.equals(message)) { - sender().tell(new GetLocalShardsReply(localShards), null); - } else { - super.handleCommand(message); - } - } - /** * Plug into shard actor creation to replace info with our testing one. * @param info shard info. @@ -36,12 +27,10 @@ public class TestShardManager extends ShardManager { */ @Override protected ActorRef newShardActor(ShardInformation info) { - Map peerAddresses = getPeerAddresses(info.getShardName()); ShardInformation newInfo = new ShardInformation(info.getShardName(), - info.getShardId(), peerAddresses, + info.getShardId(), getPeerAddresses(info.getShardName()), info.getDatastoreContext(), - TestShard.builder() - .restoreFromSnapshot(info.getBuilder().getRestoreFromSnapshot()), + TestShard.builder().restoreFromSnapshot(info.getBuilder().getRestoreFromSnapshot()), peerAddressResolver); newInfo.setSchemaContext(info.getSchemaContext()); newInfo.setActiveMember(info.isActiveMember()); @@ -69,25 +58,4 @@ public class TestShardManager extends ShardManager { return Props.create(TestShardManager.class, this); } } - - public static final class GetLocalShards { - public static final GetLocalShards INSTANCE = new GetLocalShards(); - - private GetLocalShards() { - - } - } - - public static class GetLocalShardsReply { - - private final Map localShards; - - public GetLocalShardsReply(Map localShards) { - this.localShards = localShards; - } - - public Map getLocalShards() { - return localShards; - } - } }