Simplify code using Java 8 features

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

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 a23f0077c8dd7226ff40c20129c9fc9b0cc05e1c..41413d9c62b752787f289ffab69f50d3774261f4 100644 (file)
--- 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
@@ -35,8 +35,8 @@ import akka.japi.Creator;
 import akka.pattern.Patterns;
 import akka.persistence.RecoveryCompleted;
 import akka.serialization.Serialization;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestActorRef;
+import akka.testkit.javadsl.TestKit;
 import akka.util.Timeout;
 import com.google.common.base.Function;
 import com.google.common.base.Stopwatch;
@@ -192,7 +192,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     private static void waitForShardInitialized(final ActorRef shardManager, final String shardName,
-            final JavaTestKit kit) {
+            final TestKit kit) {
         AssertionError last = null;
         Stopwatch sw = Stopwatch.createStarted();
         while (sw.elapsed(TimeUnit.SECONDS) <= 5) {
@@ -211,8 +211,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> T expectMsgClassOrFailure(final Class<T> msgClass, final JavaTestKit kit, final String msg) {
-        Object reply = kit.expectMsgAnyClassOf(JavaTestKit.duration("5 sec"), msgClass, Failure.class);
+    private static <T> T expectMsgClassOrFailure(final Class<T> msgClass, final TestKit kit, final String msg) {
+        Object reply = kit.expectMsgAnyClassOf(kit.duration("5 sec"), msgClass, Failure.class);
         if (reply instanceof Failure) {
             throw new AssertionError(msg + " failed", ((Failure)reply).cause());
         }
@@ -280,14 +280,14 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         final Creator<ShardManager> creator = new Creator<ShardManager>() {
             private static final long serialVersionUID = 1L;
             @Override
-            public ShardManager create() throws Exception {
+            public ShardManager create() {
                 return new LocalShardManager(
                         new GenericCreator<>(LocalShardManager.class).datastoreContextFactory(mockFactory)
                                 .primaryShardInfoCache(primaryShardInfoCache).configuration(mockConfig));
             }
         };
 
-        JavaTestKit kit = new JavaTestKit(getSystem());
+        TestKit kit = new TestKit(getSystem());
 
         final ActorRef shardManager = actorFactory.createActor(Props.create(
                 new DelegatingShardManagerCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()));
@@ -323,8 +323,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryForNonExistentShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testOnReceiveFindPrimaryForNonExistentShard() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -338,9 +338,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryForLocalLeaderShard() throws Exception {
+    public void testOnReceiveFindPrimaryForLocalLeaderShard() {
         LOG.info("testOnReceiveFindPrimaryForLocalLeaderShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;
 
@@ -372,9 +372,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp() throws Exception {
+    public void testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp() {
         LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -399,9 +399,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryForNonLocalLeaderShard() throws Exception {
+    public void testOnReceiveFindPrimaryForNonLocalLeaderShard() {
         LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -432,8 +432,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryForUninitializedShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testOnReceiveFindPrimaryForUninitializedShard() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -445,8 +445,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryForInitializedShardWithNoRole() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testOnReceiveFindPrimaryForInitializedShardWithNoRole() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -461,9 +461,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId() throws Exception {
+    public void testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId() {
         LOG.info("testOnReceiveFindPrimaryForFollowerShardWithNoInitialLeaderId starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -497,10 +497,10 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryWaitForShardLeader() throws Exception {
+    public void testOnReceiveFindPrimaryWaitForShardLeader() {
         LOG.info("testOnReceiveFindPrimaryWaitForShardLeader starting");
         datastoreContextBuilder.shardInitializationTimeout(10, TimeUnit.SECONDS);
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -543,9 +543,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard() throws Exception {
+    public void testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard() {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -565,9 +565,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryWaitForReadyWithCandidateShard() throws Exception {
+    public void testOnReceiveFindPrimaryWaitForReadyWithCandidateShard() {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithCandidateShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -586,9 +586,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard() throws Exception {
+    public void testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard() {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -607,9 +607,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard() throws Exception {
+    public void testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard() {
         LOG.info("testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -626,7 +626,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindPrimaryForRemoteShard() throws Exception {
+    public void testOnReceiveFindPrimaryForRemoteShard() {
         LOG.info("testOnReceiveFindPrimaryForRemoteShard starting");
         String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString();
 
@@ -657,7 +657,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         new ClusterWrapperImpl(system2)).props().withDispatcher(
                                 Dispatchers.DefaultDispatcherId()), shardManagerID);
 
-        new JavaTestKit(system1) {
+        new TestKit(system1) {
             {
                 shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
                 shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
@@ -699,7 +699,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testShardAvailabilityOnChangeOfMemberReachability() throws Exception {
+    public void testShardAvailabilityOnChangeOfMemberReachability() {
         LOG.info("testShardAvailabilityOnChangeOfMemberReachability starting");
         String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString();
 
@@ -731,7 +731,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         new ClusterWrapperImpl(system2)).props().withDispatcher(
                                 Dispatchers.DefaultDispatcherId()), shardManagerID);
 
-        new JavaTestKit(system1) {
+        new TestKit(system1) {
             {
                 shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
                 shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
@@ -821,7 +821,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testShardAvailabilityChangeOnMemberUnreachableAndLeadershipChange() throws Exception {
+    public void testShardAvailabilityChangeOnMemberUnreachableAndLeadershipChange() {
         LOG.info("testShardAvailabilityChangeOnMemberUnreachableAndLeadershipChange starting");
         String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString();
 
@@ -855,7 +855,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         new ClusterWrapperImpl(system2)).props().withDispatcher(
                                 Dispatchers.DefaultDispatcherId()), shardManagerID);
 
-        new JavaTestKit(system1) {
+        new TestKit(system1) {
             {
                 shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
                 shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
@@ -916,7 +916,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testShardAvailabilityChangeOnMemberWithNameContainedInLeaderIdUnreachable() throws Exception {
+    public void testShardAvailabilityChangeOnMemberWithNameContainedInLeaderIdUnreachable() {
         LOG.info("testShardAvailabilityChangeOnMemberWithNameContainedInLeaderIdUnreachable starting");
         String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString();
 
@@ -955,7 +955,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         new ClusterWrapperImpl(system2)).props().withDispatcher(
                                 Dispatchers.DefaultDispatcherId()), shardManagerID);
 
-        new JavaTestKit(system256) {
+        new TestKit(system256) {
             {
                 shardManager256.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
                 shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
@@ -1017,8 +1017,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindLocalShardForNonExistentShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testOnReceiveFindLocalShardForNonExistentShard() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -1034,8 +1034,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindLocalShardForExistentShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testOnReceiveFindLocalShardForExistentShard() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -1053,8 +1053,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveFindLocalShardForNotInitializedShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testOnReceiveFindLocalShardForNotInitializedShard() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -1068,7 +1068,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     @Test
     public void testOnReceiveFindLocalShardWaitForShardInitialized() throws Exception {
         LOG.info("testOnReceiveFindLocalShardWaitForShardInitialized starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -1108,7 +1108,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
     @Test
     public void testRoleChangeNotificationToFollowerWithShardLeaderStateChangedReleaseReady() throws Exception {
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 TestShardManager shardManager = newTestShardManager();
 
@@ -1131,7 +1131,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
     @Test
     public void testReadyCountDownForMemberUpAfterLeaderStateChanged() throws Exception {
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 TestShardManager shardManager = newTestShardManager();
 
@@ -1163,7 +1163,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testByDefaultSyncStatusIsFalse() throws Exception {
+    public void testByDefaultSyncStatusIsFalse() {
         TestShardManager shardManager = newTestShardManager();
 
         assertEquals(false, shardManager.getMBean().getSyncStatus());
@@ -1265,8 +1265,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testOnReceiveSwitchShardBehavior() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testOnReceiveSwitchShardBehavior() {
+        new TestKit(getSystem()) {
             {
                 final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
 
@@ -1291,7 +1291,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     @Test
     public void testOnCreateShard() {
         LOG.info("testOnCreateShard starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 datastoreContextBuilder.shardInitializationTimeout(1, TimeUnit.MINUTES).persistent(true);
 
@@ -1343,7 +1343,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     @Test
     public void testOnCreateShardWithLocalMemberNotInShardConfig() {
         LOG.info("testOnCreateShardWithLocalMemberNotInShardConfig starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 datastoreContextBuilder.shardInitializationTimeout(1, TimeUnit.MINUTES).persistent(true);
 
@@ -1375,7 +1375,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     @Test
     public void testOnCreateShardWithNoInitialSchemaContext() {
         LOG.info("testOnCreateShardWithNoInitialSchemaContext starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 ActorRef shardManager = actorFactory
                         .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))
@@ -1405,9 +1405,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testGetSnapshot() throws Exception {
+    public void testGetSnapshot() {
         LOG.info("testGetSnapshot starting");
-        JavaTestKit kit = new JavaTestKit(getSystem());
+        TestKit kit = new TestKit(getSystem());
 
         MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                 .put("shard1", Arrays.asList("member-1")).put("shard2", Arrays.asList("member-1"))
@@ -1435,11 +1435,11 @@ public class ShardManagerTest extends AbstractShardManagerTest {
         Function<ShardSnapshot, String> shardNameTransformer = ShardSnapshot::getName;
 
         assertEquals("Shard names", Sets.newHashSet("shard1", "shard2"), Sets.newHashSet(
-                Lists.transform(datastoreSnapshot.getShardSnapshots(), shardNameTransformer)));
+            datastoreSnapshot.getShardSnapshots().stream().map(shardNameTransformer).collect(Collectors.toSet())));
 
         // Add a new replica
 
-        JavaTestKit mockShardLeaderKit = new JavaTestKit(getSystem());
+        TestKit mockShardLeaderKit = new TestKit(getSystem());
 
         TestShardManager shardManagerInstance = shardManager.underlyingActor();
         shardManagerInstance.setMessageInterceptor(newFindPrimaryInterceptor(mockShardLeaderKit.getRef()));
@@ -1467,12 +1467,12 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testRestoreFromSnapshot() throws Exception {
+    public void testRestoreFromSnapshot() {
         LOG.info("testRestoreFromSnapshot starting");
 
         datastoreContextBuilder.shardInitializationTimeout(3, TimeUnit.SECONDS);
 
-        JavaTestKit kit = new JavaTestKit(getSystem());
+        TestKit kit = new TestKit(getSystem());
 
         MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                 .put("shard1", Collections.<String>emptyList()).put("shard2", Collections.<String>emptyList())
@@ -1507,8 +1507,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testAddShardReplicaForNonExistentShardConfig() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testAddShardReplicaForNonExistentShardConfig() {
+        new TestKit(getSystem()) {
             {
                 ActorRef shardManager = actorFactory
                         .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))
@@ -1523,7 +1523,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testAddShardReplica() throws Exception {
+    public void testAddShardReplica() {
         LOG.info("testAddShardReplica starting");
         MockConfiguration mockConfig = new MockConfiguration(
                 ImmutableMap.<String, List<String>>builder().put("default", Arrays.asList("member-1", "member-2"))
@@ -1559,7 +1559,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
                         .withDispatcher(Dispatchers.DefaultDispatcherId()),
                 shardManagerID);
 
-        new JavaTestKit(system1) {
+        new TestKit(system1) {
             {
                 newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
                 leaderShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
@@ -1610,9 +1610,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader() throws Exception {
+    public void testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader() {
         LOG.info("testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 TestActorRef<TestShardManager> shardManager = actorFactory
                         .createTestActor(newPropsShardMgrWithMockShardActor(), shardMgrID);
@@ -1672,9 +1672,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testAddShardReplicaWithPreExistingLocalReplicaLeader() throws Exception {
+    public void testAddShardReplicaWithPreExistingLocalReplicaLeader() {
         LOG.info("testAddShardReplicaWithPreExistingLocalReplicaLeader starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;
                 ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor());
@@ -1700,11 +1700,11 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testAddShardReplicaWithAddServerReplyFailure() throws Exception {
+    public void testAddShardReplicaWithAddServerReplyFailure() {
         LOG.info("testAddShardReplicaWithAddServerReplyFailure starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
-                JavaTestKit mockShardLeaderKit = new JavaTestKit(getSystem());
+                TestKit mockShardLeaderKit = new TestKit(getSystem());
 
                 MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                         .put("astronauts", Arrays.asList("member-2")).build());
@@ -1718,7 +1718,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
                 shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
 
-                JavaTestKit terminateWatcher = new JavaTestKit(getSystem());
+                TestKit terminateWatcher = new TestKit(getSystem());
                 terminateWatcher.watch(mockNewReplicaShardActor);
 
                 shardManager.tell(new AddShardReplica("astronauts"), getRef());
@@ -1748,16 +1748,16 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testAddShardReplicaWithAlreadyInProgress() throws Exception {
+    public void testAddShardReplicaWithAlreadyInProgress() {
         testServerChangeWhenAlreadyInProgress("astronauts", new AddShardReplica("astronauts"),
                 AddServer.class, new AddShardReplica("astronauts"));
     }
 
     @Test
-    public void testAddShardReplicaWithFindPrimaryTimeout() throws Exception {
+    public void testAddShardReplicaWithFindPrimaryTimeout() {
         LOG.info("testAddShardReplicaWithFindPrimaryTimeout starting");
         datastoreContextBuilder.shardInitializationTimeout(100, TimeUnit.MILLISECONDS);
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                         .put("astronauts", Arrays.asList("member-2")).build());
@@ -1780,8 +1780,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testRemoveShardReplicaForNonExistentShard() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testRemoveShardReplicaForNonExistentShard() {
+        new TestKit(getSystem()) {
             {
                 ActorRef shardManager = actorFactory
                         .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))
@@ -1798,8 +1798,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     /**
      * Primary is Local.
      */
-    public void testRemoveShardReplicaLocal() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testRemoveShardReplicaLocal() {
+        new TestKit(getSystem()) {
             {
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;
 
@@ -1827,7 +1827,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testRemoveShardReplicaRemote() throws Exception {
+    public void testRemoveShardReplicaRemote() {
         MockConfiguration mockConfig = new MockConfiguration(
                 ImmutableMap.<String, List<String>>builder().put("default", Arrays.asList("member-1", "member-2"))
                         .put("astronauts", Arrays.asList("member-1")).build());
@@ -1879,7 +1879,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
         LOG.error("Forwarding actor : {}", actorRef);
 
-        new JavaTestKit(system1) {
+        new TestKit(system1) {
             {
                 newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
                 leaderShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
@@ -1918,13 +1918,13 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testRemoveShardReplicaWhenAnotherRemoveShardReplicaAlreadyInProgress() throws Exception {
+    public void testRemoveShardReplicaWhenAnotherRemoveShardReplicaAlreadyInProgress() {
         testServerChangeWhenAlreadyInProgress("astronauts", new RemoveShardReplica("astronauts", MEMBER_2),
                 RemoveServer.class, new RemoveShardReplica("astronauts", MEMBER_3));
     }
 
     @Test
-    public void testRemoveShardReplicaWhenAddShardReplicaAlreadyInProgress() throws Exception {
+    public void testRemoveShardReplicaWhenAddShardReplicaAlreadyInProgress() {
         testServerChangeWhenAlreadyInProgress("astronauts", new AddShardReplica("astronauts"),
                 AddServer.class, new RemoveShardReplica("astronauts", MEMBER_2));
     }
@@ -1932,11 +1932,11 @@ public class ShardManagerTest extends AbstractShardManagerTest {
 
     public void testServerChangeWhenAlreadyInProgress(final String shardName, final Object firstServerChange,
                                                       final Class<?> firstForwardedServerChangeClass,
-                                                      final Object secondServerChange) throws Exception {
-        new JavaTestKit(getSystem()) {
+                                                      final Object secondServerChange) {
+        new TestKit(getSystem()) {
             {
-                JavaTestKit mockShardLeaderKit = new JavaTestKit(getSystem());
-                final JavaTestKit secondRequestKit = new JavaTestKit(getSystem());
+                TestKit mockShardLeaderKit = new TestKit(getSystem());
+                final TestKit secondRequestKit = new TestKit(getSystem());
 
                 MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                         .put(shardName, Arrays.asList("member-2")).build());
@@ -1964,9 +1964,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testServerRemovedShardActorNotRunning() throws Exception {
+    public void testServerRemovedShardActorNotRunning() {
         LOG.info("testServerRemovedShardActorNotRunning starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                         .put("default", Arrays.asList("member-1", "member-2"))
@@ -1997,9 +1997,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testServerRemovedShardActorRunning() throws Exception {
+    public void testServerRemovedShardActorRunning() {
         LOG.info("testServerRemovedShardActorRunning starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                         .put("default", Arrays.asList("member-1", "member-2"))
@@ -2034,9 +2034,9 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testShardPersistenceWithRestoredData() throws Exception {
+    public void testShardPersistenceWithRestoredData() {
         LOG.info("testShardPersistenceWithRestoredData starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 MockConfiguration mockConfig =
                     new MockConfiguration(ImmutableMap.<String, List<String>>builder()
@@ -2076,7 +2076,7 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     @Test
     public void testShutDown() throws Exception {
         LOG.info("testShutDown starting");
-        new JavaTestKit(getSystem()) {
+        new TestKit(getSystem()) {
             {
                 MockConfiguration mockConfig = new MockConfiguration(ImmutableMap.<String, List<String>>builder()
                         .put("shard1", Arrays.asList("member-1")).put("shard2", Arrays.asList("member-1")).build());
@@ -2119,8 +2119,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testChangeServersVotingStatus() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testChangeServersVotingStatus() {
+        new TestKit(getSystem()) {
             {
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;
 
@@ -2155,8 +2155,8 @@ public class ShardManagerTest extends AbstractShardManagerTest {
     }
 
     @Test
-    public void testChangeServersVotingStatusWithNoLeader() throws Exception {
-        new JavaTestKit(getSystem()) {
+    public void testChangeServersVotingStatusWithNoLeader() {
+        new TestKit(getSystem()) {
             {
                 String memberId = "member-1-shard-default-" + shardMrgIDSuffix;