X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fshardmanager%2FShardManagerTest.java;h=7f415d7dc78e42a147b89522748969aa53bb1907;hb=7426d405093265655b05c6a3eb197362266edf2e;hp=5efd0947026d6cc51aa9d59bb1cb2ef3b5ef57d4;hpb=b24517538beb4f44e6a9a96e68e4bf48156b480f;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java index 5efd094702..7f415d7dc7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java @@ -137,11 +137,11 @@ public class ShardManagerTest extends AbstractShardManagerTest { private final String shardMgrID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString(); - private ActorSystem newActorSystem(String config) { + private ActorSystem newActorSystem(final String config) { return newActorSystem("cluster-test", config); } - private ActorRef newMockShardActor(ActorSystem system, String shardName, String memberName) { + private ActorRef newMockShardActor(final ActorSystem system, final String shardName, final String memberName) { String name = ShardIdentifier.create(shardName, MemberName.forName(memberName), "config").toString(); if (system == getSystem()) { return actorFactory.createActor(Props.create(MessageCollectorActor.class), name); @@ -154,7 +154,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { return newShardMgrProps(new MockConfiguration()); } - private static DatastoreContextFactory newDatastoreContextFactory(DatastoreContext datastoreContext) { + private static DatastoreContextFactory newDatastoreContextFactory(final DatastoreContext datastoreContext) { DatastoreContextFactory mockFactory = mock(DatastoreContextFactory.class); Mockito.doReturn(datastoreContext).when(mockFactory).getBaseDatastoreContext(); Mockito.doReturn(datastoreContext).when(mockFactory).getShardDatastoreContext(Mockito.anyString()); @@ -165,7 +165,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { return newTestShardMgrBuilderWithMockShardActor(mockShardActor); } - private TestShardManager.Builder newTestShardMgrBuilderWithMockShardActor(ActorRef shardActor) { + private TestShardManager.Builder newTestShardMgrBuilderWithMockShardActor(final ActorRef shardActor) { return TestShardManager.builder(datastoreContextBuilder).shardActor(shardActor) .distributedDataStore(mock(DistributedDataStore.class)); } @@ -176,7 +176,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { Dispatchers.DefaultDispatcherId()); } - private Props newPropsShardMgrWithMockShardActor(ActorRef shardActor) { + private Props newPropsShardMgrWithMockShardActor(final ActorRef shardActor) { return newTestShardMgrBuilderWithMockShardActor(shardActor).props() .withDispatcher(Dispatchers.DefaultDispatcherId()); } @@ -186,14 +186,15 @@ public class ShardManagerTest extends AbstractShardManagerTest { return newTestShardManager(newShardMgrProps()); } - private TestShardManager newTestShardManager(Props props) { + private TestShardManager newTestShardManager(final Props props) { TestActorRef shardManagerActor = actorFactory.createTestActor(props); TestShardManager shardManager = shardManagerActor.underlyingActor(); shardManager.waitForRecoveryComplete(); return shardManager; } - private static void waitForShardInitialized(ActorRef shardManager, String shardName, JavaTestKit kit) { + private static void waitForShardInitialized(final ActorRef shardManager, final String shardName, + final JavaTestKit kit) { AssertionError last = null; Stopwatch sw = Stopwatch.createStarted(); while (sw.elapsed(TimeUnit.SECONDS) <= 5) { @@ -212,7 +213,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } @SuppressWarnings("unchecked") - private static T expectMsgClassOrFailure(Class msgClass, JavaTestKit kit, String msg) { + private static T expectMsgClassOrFailure(final Class msgClass, final JavaTestKit kit, final String msg) { Object reply = kit.expectMsgAnyClassOf(JavaTestKit.duration("5 sec"), msgClass, Failure.class); if (reply instanceof Failure) { throw new AssertionError(msg + " failed", ((Failure)reply).cause()); @@ -237,12 +238,12 @@ public class ShardManagerTest extends AbstractShardManagerTest { final MockConfiguration mockConfig = new MockConfiguration() { @Override - public Collection getMemberShardNames(MemberName memberName) { + public Collection getMemberShardNames(final MemberName memberName) { return Arrays.asList("default", "topology"); } @Override - public Collection getMembersFromShardName(String shardName) { + public Collection getMembersFromShardName(final String shardName) { return members("member-1"); } }; @@ -260,12 +261,12 @@ public class ShardManagerTest extends AbstractShardManagerTest { final PrimaryShardInfoFutureCache primaryShardInfoCache = new PrimaryShardInfoFutureCache(); final CountDownLatch newShardActorLatch = new CountDownLatch(2); class LocalShardManager extends ShardManager { - LocalShardManager(AbstractShardManagerCreator creator) { + LocalShardManager(final AbstractShardManagerCreator creator) { super(creator); } @Override - protected ActorRef newShardActor(SchemaContext schemaContext, ShardInformation info) { + protected ActorRef newShardActor(final ShardInformation info) { Entry entry = shardInfoMap.get(info.getShardName()); ActorRef ref = null; if (entry != null) { @@ -1141,7 +1142,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { LOG.info("testWhenMultipleShardsPresentSyncStatusMustBeTrueForAllShards starting"); TestShardManager shardManager = newTestShardManager(newShardMgrProps(new MockConfiguration() { @Override - public List getMemberShardNames(MemberName memberName) { + public List getMemberShardNames(final MemberName memberName) { return Arrays.asList("default", "astronauts"); } })); @@ -1201,7 +1202,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { }; } - private static List members(String... names) { + private static List members(final String... names) { return Arrays.asList(names).stream().map(MemberName::forName).collect(Collectors.toList()); } @@ -2112,14 +2113,14 @@ public class ShardManagerTest extends AbstractShardManagerTest { private CountDownLatch memberReachableReceived = new CountDownLatch(1); private volatile MessageInterceptor messageInterceptor; - private TestShardManager(Builder builder) { + private TestShardManager(final Builder builder) { super(builder); shardActor = builder.shardActor; shardActors = builder.shardActors; } @Override - protected void handleRecover(Object message) throws Exception { + protected void handleRecover(final Object message) throws Exception { try { super.handleRecover(message); } finally { @@ -2129,14 +2130,14 @@ public class ShardManagerTest extends AbstractShardManagerTest { } } - private void countDownIfOther(final Member member, CountDownLatch latch) { + private void countDownIfOther(final Member member, final CountDownLatch latch) { if (!getCluster().getCurrentMemberName().equals(memberToName(member))) { latch.countDown(); } } @Override - public void handleCommand(Object message) throws Exception { + public void handleCommand(final Object message) throws Exception { try { if (messageInterceptor != null && messageInterceptor.canIntercept(message)) { getSender().tell(messageInterceptor.apply(message), getSelf()); @@ -2158,7 +2159,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } } - void setMessageInterceptor(MessageInterceptor messageInterceptor) { + void setMessageInterceptor(final MessageInterceptor messageInterceptor) { this.messageInterceptor = messageInterceptor; } @@ -2198,7 +2199,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { findPrimaryMessageReceived = new CountDownLatch(1); } - public static Builder builder(DatastoreContext.Builder datastoreContextBuilder) { + public static Builder builder(final DatastoreContext.Builder datastoreContextBuilder) { return new Builder(datastoreContextBuilder); } @@ -2206,37 +2207,37 @@ public class ShardManagerTest extends AbstractShardManagerTest { private ActorRef shardActor; private final Map shardActors = new HashMap<>(); - Builder(DatastoreContext.Builder datastoreContextBuilder) { + Builder(final DatastoreContext.Builder datastoreContextBuilder) { super(TestShardManager.class); datastoreContextFactory(newDatastoreContextFactory(datastoreContextBuilder.build())); } - Builder shardActor(ActorRef newShardActor) { + Builder shardActor(final ActorRef newShardActor) { this.shardActor = newShardActor; return this; } - Builder addShardActor(String shardName, ActorRef actorRef) { + Builder addShardActor(final String shardName, final ActorRef actorRef) { shardActors.put(shardName, actorRef); return this; } } @Override - public void saveSnapshot(Object obj) { + public void saveSnapshot(final Object obj) { snapshot = (ShardManagerSnapshot) obj; snapshotPersist.countDown(); super.saveSnapshot(obj); } - void verifySnapshotPersisted(Set shardList) { + void verifySnapshotPersisted(final Set shardList) { assertEquals("saveSnapshot invoked", true, Uninterruptibles.awaitUninterruptibly(snapshotPersist, 5, TimeUnit.SECONDS)); assertEquals("Shard Persisted", shardList, Sets.newHashSet(snapshot.getShardList())); } @Override - protected ActorRef newShardActor(SchemaContext schemaContext, ShardInformation info) { + protected ActorRef newShardActor(final ShardInformation info) { if (shardActors.get(info.getShardName()) != null) { return shardActors.get(info.getShardName()); } @@ -2245,7 +2246,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { return shardActor; } - return super.newShardActor(schemaContext, info); + return super.newShardActor(info); } } @@ -2253,7 +2254,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { extends AbstractShardManagerCreator { private final Class shardManagerClass; - AbstractGenericCreator(Class shardManagerClass) { + AbstractGenericCreator(final Class shardManagerClass) { this.shardManagerClass = shardManagerClass; cluster(new MockClusterWrapper()).configuration(new MockConfiguration()).waitTillReadyCountDownLatch(ready) .primaryShardInfoCache(new PrimaryShardInfoFutureCache()); @@ -2267,7 +2268,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } private static class GenericCreator extends AbstractGenericCreator, C> { - GenericCreator(Class shardManagerClass) { + GenericCreator(final Class shardManagerClass) { super(shardManagerClass); } } @@ -2276,7 +2277,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { private static final long serialVersionUID = 1L; private final Creator delegate; - DelegatingShardManagerCreator(Creator delegate) { + DelegatingShardManagerCreator(final Creator delegate) { this.delegate = delegate; } @@ -2293,12 +2294,12 @@ public class ShardManagerTest extends AbstractShardManagerTest { private static MessageInterceptor newFindPrimaryInterceptor(final ActorRef primaryActor) { return new MessageInterceptor() { @Override - public Object apply(Object message) { + public Object apply(final Object message) { return new RemotePrimaryShardFound(Serialization.serializedActorPath(primaryActor), (short) 1); } @Override - public boolean canIntercept(Object message) { + public boolean canIntercept(final Object message) { return message instanceof FindPrimary; } }; @@ -2311,13 +2312,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { private final Class requestClass; @SuppressWarnings("unused") - MockRespondActor(Class requestClass, Object responseMsg) { + MockRespondActor(final Class requestClass, final Object responseMsg) { this.requestClass = requestClass; this.responseMsg = responseMsg; } @Override - public void onReceive(Object message) throws Exception { + public void onReceive(final Object message) throws Exception { if (message.equals(CLEAR_RESPONSE)) { responseMsg = null; } else {