Bug 4564: Add Shard Builder class

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java
index 54a27e08bb069934012eac07b0ca4c2b034f3662..d38959d7dbebda1bff468be4243afd3083277c99 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java
@@ -47,7 +47,6 @@ import org.opendaylight.controller.cluster.datastore.entityownership.messages.Re
 import org.opendaylight.controller.cluster.datastore.entityownership.messages.RegisterListenerLocal;
 import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterCandidateLocal;
 import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterListenerLocal;
-import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
 import org.opendaylight.controller.cluster.datastore.messages.GetShardDataTree;
 import org.opendaylight.controller.cluster.datastore.utils.MockClusterWrapper;
 import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper;
@@ -62,7 +61,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import scala.concurrent.Await;
 import scala.concurrent.Future;
 import scala.concurrent.duration.Duration;
@@ -122,17 +120,17 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh
 
     @Test
     public void testRegisterCandidate() throws Exception {
-        final TestShardPropsCreator shardPropsCreator = new TestShardPropsCreator();
+        final TestShardBuilder shardBuilder = new TestShardBuilder();
         DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) {
             @Override
-            protected EntityOwnershipShardPropsCreator newShardPropsCreator() {
-                return shardPropsCreator;
+            protected EntityOwnershipShard.Builder newShardBuilder() {
+                return shardBuilder;
             }
         };
 
         service.start();
 
-        shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class);
+        shardBuilder.expectShardMessage(RegisterCandidateLocal.class);
 
         YangInstanceIdentifier entityId = YangInstanceIdentifier.of(QNAME);
         Entity entity = new Entity(ENTITY_TYPE, entityId);
@@ -140,7 +138,7 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh
         EntityOwnershipCandidateRegistration reg = service.registerCandidate(entity);
 
         verifyEntityOwnershipCandidateRegistration(entity, reg);
-        verifyRegisterCandidateLocal(shardPropsCreator, entity);
+        verifyRegisterCandidateLocal(shardBuilder, entity);
         verifyEntityCandidate(service.getLocalEntityOwnershipShard(), ENTITY_TYPE, entityId,
                 dataStore.getActorContext().getCurrentMemberName());
 
@@ -157,12 +155,12 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh
         // Register a different entity - should succeed
 
         Entity entity2 = new Entity(ENTITY_TYPE2, entityId);
-        shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class);
+        shardBuilder.expectShardMessage(RegisterCandidateLocal.class);
 
         EntityOwnershipCandidateRegistration reg2 = service.registerCandidate(entity2);
 
         verifyEntityOwnershipCandidateRegistration(entity2, reg2);
-        verifyRegisterCandidateLocal(shardPropsCreator, entity2);
+        verifyRegisterCandidateLocal(shardBuilder, entity2);
         verifyEntityCandidate(service.getLocalEntityOwnershipShard(), ENTITY_TYPE2, entityId,
                 dataStore.getActorContext().getCurrentMemberName());
 
@@ -171,56 +169,56 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh
 
     @Test
     public void testCloseCandidateRegistration() throws Exception {
-        final TestShardPropsCreator shardPropsCreator = new TestShardPropsCreator();
+        final TestShardBuilder shardBuilder = new TestShardBuilder();
         DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) {
             @Override
-            protected EntityOwnershipShardPropsCreator newShardPropsCreator() {
-                return shardPropsCreator;
+            protected EntityOwnershipShard.Builder newShardBuilder() {
+                return shardBuilder;
             }
         };
 
         service.start();
 
-        shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class);
+        shardBuilder.expectShardMessage(RegisterCandidateLocal.class);
 
         Entity entity = new Entity(ENTITY_TYPE, YangInstanceIdentifier.of(QNAME));
 
         EntityOwnershipCandidateRegistration reg = service.registerCandidate(entity);
 
         verifyEntityOwnershipCandidateRegistration(entity, reg);
-        verifyRegisterCandidateLocal(shardPropsCreator, entity);
+        verifyRegisterCandidateLocal(shardBuilder, entity);
 
-        shardPropsCreator.expectShardMessage(UnregisterCandidateLocal.class);
+        shardBuilder.expectShardMessage(UnregisterCandidateLocal.class);
 
         reg.close();
 
-        UnregisterCandidateLocal unregCandidate = shardPropsCreator.waitForShardMessage();
+        UnregisterCandidateLocal unregCandidate = shardBuilder.waitForShardMessage();
         assertEquals("getEntity", entity, unregCandidate.getEntity());
 
         // Re-register - should succeed.
 
-        shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class);
+        shardBuilder.expectShardMessage(RegisterCandidateLocal.class);
 
         service.registerCandidate(entity);
 
-        verifyRegisterCandidateLocal(shardPropsCreator, entity);
+        verifyRegisterCandidateLocal(shardBuilder, entity);
 
         service.close();
     }
 
     @Test
     public void testListenerRegistration() {
-        final TestShardPropsCreator shardPropsCreator = new TestShardPropsCreator();
+        final TestShardBuilder shardBuilder = new TestShardBuilder();
         DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) {
             @Override
-            protected EntityOwnershipShardPropsCreator newShardPropsCreator() {
-                return shardPropsCreator;
+            protected EntityOwnershipShard.Builder newShardBuilder() {
+                return shardBuilder;
             }
         };
 
         service.start();
 
-        shardPropsCreator.expectShardMessage(RegisterListenerLocal.class);
+        shardBuilder.expectShardMessage(RegisterListenerLocal.class);
 
         YangInstanceIdentifier entityId = YangInstanceIdentifier.of(QNAME);
         Entity entity = new Entity(ENTITY_TYPE, entityId);
@@ -232,15 +230,15 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh
         assertEquals("getEntityType", entity.getType(), reg.getEntityType());
         assertEquals("getInstance", listener, reg.getInstance());
 
-        RegisterListenerLocal regListener = shardPropsCreator.waitForShardMessage();
+        RegisterListenerLocal regListener = shardBuilder.waitForShardMessage();
         assertSame("getListener", listener, regListener.getListener());
         assertEquals("getEntityType", entity.getType(), regListener.getEntityType());
 
-        shardPropsCreator.expectShardMessage(UnregisterListenerLocal.class);
+        shardBuilder.expectShardMessage(UnregisterListenerLocal.class);
 
         reg.close();
 
-        UnregisterListenerLocal unregListener = shardPropsCreator.waitForShardMessage();
+        UnregisterListenerLocal unregListener = shardBuilder.waitForShardMessage();
         assertEquals("getEntityType", entity.getType(), unregListener.getEntityType());
         assertSame("getListener", listener, unregListener.getListener());
 
@@ -249,18 +247,18 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh
 
     @Test
     public void testGetOwnershipState() throws Exception {
-        final TestShardPropsCreator shardPropsCreator = new TestShardPropsCreator();
+        final TestShardBuilder shardBuilder = new TestShardBuilder();
         DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) {
             @Override
-            protected EntityOwnershipShardPropsCreator newShardPropsCreator() {
-                return shardPropsCreator;
+            protected EntityOwnershipShard.Builder newShardBuilder() {
+                return shardBuilder;
             }
         };
 
         service.start();
 
         ShardDataTree shardDataTree = new ShardDataTree(SchemaContextHelper.entityOwners());
-        shardPropsCreator.setDataTree(shardDataTree.getDataTree());
+        shardBuilder.setDataTree(shardDataTree.getDataTree());
 
         Entity entity1 = new Entity(ENTITY_TYPE, "one");
         writeNode(ENTITY_OWNERS_PATH, entityOwnersWithEntityTypeEntry(entityTypeEntryWithEntityEntry(entity1.getType(),
@@ -309,8 +307,8 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh
                 });
     }
 
-    private static void verifyRegisterCandidateLocal(final TestShardPropsCreator shardPropsCreator, Entity entity) {
-        RegisterCandidateLocal regCandidate = shardPropsCreator.waitForShardMessage();
+    private static void verifyRegisterCandidateLocal(final TestShardBuilder shardBuilder, Entity entity) {
+        RegisterCandidateLocal regCandidate = shardBuilder.waitForShardMessage();
         assertEquals("getEntity", entity, regCandidate.getEntity());
     }
 
@@ -319,9 +317,9 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh
         assertEquals("getInstance", entity, reg.getInstance());
     }
 
-    static class TestShardPropsCreator extends EntityOwnershipShardPropsCreator {
-        TestShardPropsCreator() {
-            super("member-1");
+    static class TestShardBuilder extends EntityOwnershipShard.Builder {
+        TestShardBuilder() {
+            localMemberName("member-1");
         }
 
         private final AtomicReference<CountDownLatch> messageReceived = new AtomicReference<>();
@@ -330,10 +328,9 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh
         private final AtomicReference<DataTree> dataTree = new AtomicReference<>();
 
         @Override
-        public Props newProps(ShardIdentifier shardId, Map<String, String> peerAddresses,
-                DatastoreContext datastoreContext, SchemaContext schemaContext) {
-            return Props.create(TestEntityOwnershipShard.class, shardId, peerAddresses, datastoreContext,
-                    schemaContext, "member-1", messageClass, messageReceived, receivedMessage, dataTree);
+        public Props props() {
+            return Props.create(TestEntityOwnershipShard.class,this, messageClass, messageReceived,
+                    receivedMessage, dataTree);
         }
 
         @SuppressWarnings("unchecked")
@@ -361,11 +358,10 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh
         private final AtomicReference<Class<?>> messageClass;
         private final AtomicReference<DataTree> dataTree;
 
-        protected TestEntityOwnershipShard(ShardIdentifier name, Map<String, String> peerAddresses,
-                DatastoreContext datastoreContext, SchemaContext schemaContext, String localMemberName,
+        protected TestEntityOwnershipShard(EntityOwnershipShard.Builder builder,
                 AtomicReference<Class<?>> messageClass, AtomicReference<CountDownLatch> messageReceived,
                 AtomicReference<Object> receivedMessage, AtomicReference<DataTree> dataTree) {
-            super(name, peerAddresses, datastoreContext, schemaContext, localMemberName);
+            super(builder);
             this.messageClass = messageClass;
             this.messageReceived = messageReceived;
             this.receivedMessage = receivedMessage;