Optimize anyxml output

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java
index 5394a87dd4003a0107455234a000bfb3d9717e3d..ad80b86e02ac5186baa8c472c75063c204223a4c 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java
@@ -129,7 +129,7 @@ public class DistributedEntityOwnershipIntegrationTest {
     }
 
     private static DistributedEntityOwnershipService newOwnershipService(final AbstractDataStore datastore) {
-        return DistributedEntityOwnershipService.start(datastore.getActorContext(),
+        return DistributedEntityOwnershipService.start(datastore.getActorUtils(),
                 EntityOwnerSelectionStrategyConfig.newBuilder().build());
     }
 
@@ -160,7 +160,7 @@ public class DistributedEntityOwnershipIntegrationTest {
         final DOMEntityOwnershipService follower2EntityOwnershipService =
                 newOwnershipService(follower2Node.configDataStore());
 
-        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME);
+        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME);
 
         leaderEntityOwnershipService.registerListener(ENTITY_TYPE1, leaderMockListener);
         leaderEntityOwnershipService.registerListener(ENTITY_TYPE2, leaderMockListener2);
@@ -305,7 +305,7 @@ public class DistributedEntityOwnershipIntegrationTest {
         final DOMEntityOwnershipService follower2EntityOwnershipService =
                 newOwnershipService(follower2Node.configDataStore());
 
-        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME);
+        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME);
 
         // Register follower1 candidate for entity1 and verify it becomes owner
 
@@ -331,12 +331,12 @@ public class DistributedEntityOwnershipIntegrationTest {
 
         // Re-enable elections on all remaining followers so one becomes the new leader
 
-        ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(),
+        ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorUtils(),
                 ENTITY_OWNERSHIP_SHARD_NAME);
         follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build())
                 .customRaftPolicyImplementation(null).build(), ActorRef.noSender());
 
-        ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorContext(),
+        ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorUtils(),
                 ENTITY_OWNERSHIP_SHARD_NAME);
         follower2Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build())
                 .customRaftPolicyImplementation(null).build(), ActorRef.noSender());
@@ -406,7 +406,7 @@ public class DistributedEntityOwnershipIntegrationTest {
                 newOwnershipService(follower3Node.configDataStore());
         newOwnershipService(follower4Node.configDataStore());
 
-        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME);
+        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME);
 
         // Register follower1 candidate for entity1 and verify it becomes owner
 
@@ -438,17 +438,17 @@ public class DistributedEntityOwnershipIntegrationTest {
 
         // Re-enable elections on all remaining followers so one becomes the new leader
 
-        ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(),
+        ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorUtils(),
                 ENTITY_OWNERSHIP_SHARD_NAME);
         follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build())
                 .customRaftPolicyImplementation(null).build(), ActorRef.noSender());
 
-        ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorContext(),
+        ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorUtils(),
                 ENTITY_OWNERSHIP_SHARD_NAME);
         follower2Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build())
                 .customRaftPolicyImplementation(null).build(), ActorRef.noSender());
 
-        ActorRef follower4Shard = IntegrationTestKit.findLocalShard(follower4Node.configDataStore().getActorContext(),
+        ActorRef follower4Shard = IntegrationTestKit.findLocalShard(follower4Node.configDataStore().getActorUtils(),
                 ENTITY_OWNERSHIP_SHARD_NAME);
         follower4Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build())
                 .customRaftPolicyImplementation(null).build(), ActorRef.noSender());
@@ -503,7 +503,7 @@ public class DistributedEntityOwnershipIntegrationTest {
         final DOMEntityOwnershipService follower2EntityOwnershipService =
                 newOwnershipService(follower2Node.configDataStore());
 
-        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME);
+        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME);
 
         leaderEntityOwnershipService.registerListener(ENTITY_TYPE1, leaderMockListener);
         follower1EntityOwnershipService.registerListener(ENTITY_TYPE1, follower1MockListener);
@@ -540,11 +540,10 @@ public class DistributedEntityOwnershipIntegrationTest {
         boolean passed = false;
         for (int i = 0; i < 100; i++) {
             Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS);
-            final com.google.common.base.Optional<EntityOwnershipState> leaderState =
-                    leaderEntityOwnershipService.getOwnershipState(ENTITY1);
-            final com.google.common.base.Optional<EntityOwnershipState> follower1State =
+            final Optional<EntityOwnershipState> leaderState = leaderEntityOwnershipService.getOwnershipState(ENTITY1);
+            final Optional<EntityOwnershipState> follower1State =
                     follower1EntityOwnershipService.getOwnershipState(ENTITY1);
-            final com.google.common.base.Optional<EntityOwnershipState> follower2State =
+            final Optional<EntityOwnershipState> follower2State =
                     follower2EntityOwnershipService.getOwnershipState(ENTITY1);
             final Optional<DOMEntityOwnershipChange> leaderChange = getValueSafely(leaderChangeCaptor);
             final Optional<DOMEntityOwnershipChange> follower1Change = getValueSafely(follower1ChangeCaptor);
@@ -588,7 +587,7 @@ public class DistributedEntityOwnershipIntegrationTest {
         AbstractDataStore leaderDistributedDataStore = leaderNode.configDataStore();
         final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore);
 
-        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME);
+        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME);
 
         MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name)
                 .moduleShardsConfig(moduleShardsConfig).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false)
@@ -612,7 +611,7 @@ public class DistributedEntityOwnershipIntegrationTest {
 
         // Add replica in follower1
         AddShardReplica addReplica = new AddShardReplica(ENTITY_OWNERSHIP_SHARD_NAME);
-        follower1DistributedDataStore.getActorContext().getShardManager().tell(addReplica,
+        follower1DistributedDataStore.getActorUtils().getShardManager().tell(addReplica,
                 follower1Node.kit().getRef());
         Object reply = follower1Node.kit().expectMsgAnyClassOf(follower1Node.kit().duration("5 sec"),
                 Success.class, Failure.class);
@@ -674,7 +673,7 @@ public class DistributedEntityOwnershipIntegrationTest {
                 newOwnershipService(follower1Node.configDataStore());
         newOwnershipService(follower2Node.configDataStore());
 
-        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME);
+        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME);
 
         // Register leader candidate for entity1 and verify it becomes owner
 
@@ -717,7 +716,7 @@ public class DistributedEntityOwnershipIntegrationTest {
                 newOwnershipService(follower1Node.configDataStore());
         newOwnershipService(follower2Node.configDataStore());
 
-        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME);
+        leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME);
 
         // Register leader candidate for entity1 and verify it becomes owner
 
@@ -783,12 +782,12 @@ public class DistributedEntityOwnershipIntegrationTest {
                 newOwnershipService(member5FollowerNode.configDataStore());
 
         newOwnershipService(member1LeaderNode.configDataStore());
-        member1LeaderNode.kit().waitUntilLeader(member1LeaderNode.configDataStore().getActorContext(),
+        member1LeaderNode.kit().waitUntilLeader(member1LeaderNode.configDataStore().getActorUtils(),
                 ENTITY_OWNERSHIP_SHARD_NAME);
 
         // Make member4 and member5 non-voting
 
-        Future<Object> future = Patterns.ask(leaderDistributedDataStore.getActorContext().getShardManager(),
+        Future<Object> future = Patterns.ask(leaderDistributedDataStore.getActorUtils().getShardManager(),
                 new ChangeShardMembersVotingStatus(ENTITY_OWNERSHIP_SHARD_NAME,
                         ImmutableMap.of("member-4", Boolean.FALSE, "member-5", Boolean.FALSE)),
                 new Timeout(10, TimeUnit.SECONDS));
@@ -822,7 +821,7 @@ public class DistributedEntityOwnershipIntegrationTest {
         // Switch member4 and member5 back to voting and member3 non-voting. This should result in member4 and member5
         // to become entity owners.
 
-        future = Patterns.ask(leaderDistributedDataStore.getActorContext().getShardManager(),
+        future = Patterns.ask(leaderDistributedDataStore.getActorUtils().getShardManager(),
                 new ChangeShardMembersVotingStatus(ENTITY_OWNERSHIP_SHARD_NAME,
                         ImmutableMap.of("member-3", Boolean.FALSE, "member-4", Boolean.TRUE, "member-5", Boolean.TRUE)),
                 new Timeout(10, TimeUnit.SECONDS));
@@ -839,8 +838,8 @@ public class DistributedEntityOwnershipIntegrationTest {
 
     private static void verifyGetOwnershipState(final DOMEntityOwnershipService service, final DOMEntity entity,
             final EntityOwnershipState expState) {
-        com.google.common.base.Optional<EntityOwnershipState> state = service.getOwnershipState(entity);
-        assertEquals("getOwnershipState present", true, state.isPresent());
+        Optional<EntityOwnershipState> state = service.getOwnershipState(entity);
+        assertTrue("getOwnershipState present", state.isPresent());
         assertEquals("EntityOwnershipState", expState, state.get());
     }