Split out AbstractBuilder and rename it

[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 39158e0c1877cfaec95076d6752c2975cd24353f..8883a5e10b18b018e8ff7a48b91baedeb8f7fafb 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
@@ -312,8 +312,8 @@ public class ShardManagerTest extends AbstractActorTest {
         final PrimaryShardInfoFutureCache primaryShardInfoCache = new PrimaryShardInfoFutureCache();
         final CountDownLatch newShardActorLatch = new CountDownLatch(2);
         class LocalShardManager extends ShardManager {
-            public LocalShardManager(AbstractBuilder<?> builder) {
-                super(builder);
+            public LocalShardManager(AbstractShardManagerCreator<?> creator) {
+                super(creator);
             }
 
             @Override
@@ -334,7 +334,7 @@ public class ShardManagerTest extends AbstractActorTest {
             private static final long serialVersionUID = 1L;
             @Override
             public ShardManager create() throws Exception {
-                return new LocalShardManager(new GenericBuilder<LocalShardManager>(LocalShardManager.class).
+                return new LocalShardManager(new GenericCreator<LocalShardManager>(LocalShardManager.class).
                         datastoreContextFactory(mockFactory).primaryShardInfoCache(primaryShardInfoCache).
                         configuration(mockConfig));
             }
@@ -2085,7 +2085,7 @@ public class ShardManagerTest extends AbstractActorTest {
             return new Builder(datastoreContextBuilder);
         }
 
-        private static class Builder extends AbstractGenericBuilder<Builder, TestShardManager> {
+        private static class Builder extends AbstractGenericCreator<Builder, TestShardManager> {
             private ActorRef shardActor;
             private final Map<String, ActorRef> shardActors = new HashMap<>();
 
@@ -2132,11 +2132,11 @@ public class ShardManagerTest extends AbstractActorTest {
         }
     }
 
-    private static abstract class AbstractGenericBuilder<T extends AbstractGenericBuilder<T, ?>, C extends ShardManager>
-                                                     extends ShardManager.AbstractBuilder<T> {
+    private static abstract class AbstractGenericCreator<T extends AbstractGenericCreator<T, ?>, C extends ShardManager>
+                                                     extends AbstractShardManagerCreator<T> {
         private final Class<C> shardManagerClass;
 
-        AbstractGenericBuilder(Class<C> shardManagerClass) {
+        AbstractGenericCreator(Class<C> shardManagerClass) {
             this.shardManagerClass = shardManagerClass;
             cluster(new MockClusterWrapper()).configuration(new MockConfiguration()).
                     waitTillReadyCountdownLatch(ready).primaryShardInfoCache(new PrimaryShardInfoFutureCache());
@@ -2149,8 +2149,8 @@ public class ShardManagerTest extends AbstractActorTest {
         }
     }
 
-    private static class GenericBuilder<C extends ShardManager> extends AbstractGenericBuilder<GenericBuilder<C>, C> {
-        GenericBuilder(Class<C> shardManagerClass) {
+    private static class GenericCreator<C extends ShardManager> extends AbstractGenericCreator<GenericCreator<C>, C> {
+        GenericCreator(Class<C> shardManagerClass) {
             super(shardManagerClass);
         }
     }