Revert "Leader should always apply modifications as local"

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / shardmanager / TestShardManager.java

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 337c4c95b9eacaadf5629de076abb0c4077c5c60..0783c1646408ebcf1e36c0a252a661fe14192634 100644 (file)
--- 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<String, String> 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<String, ShardInformation> localShards;
-
-        public GetLocalShardsReply(Map<String, ShardInformation> localShards) {
-            this.localShards = localShards;
-        }
-
-        public Map<String, ShardInformation> getLocalShards() {
-            return localShards;
-        }
-    }
 }