From dc6370feeb5fc47be3e267bf85d6354013d0409b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 12 May 2016 16:46:52 +0200 Subject: [PATCH] BUG-5626: Eliminate ShardIdentifier.Builder This builder is completely useless, migrate it to static factory methods, which provide equivalent functionality. Change-Id: Ib2b5a1b14cb133bd819b3e163c217a05ed892787 Signed-off-by: Robert Varga --- .../entityownership/EntityOwnershipShard.java | 2 +- .../identifiers/ShardIdentifier.java | 29 ++++++++++--------- .../datastore/shardmanager/ShardManager.java | 7 +++-- .../ShardManagerGetSnapshotReplyActor.java | 2 +- .../shardmanager/ShardManagerInfo.java | 3 +- .../ShardPeerAddressResolver.java | 8 ++--- .../cluster/datastore/AbstractShardTest.java | 4 +-- .../cluster/datastore/MemberNode.java | 7 +++-- .../cluster/datastore/ShardTest.java | 23 ++++++--------- .../ShardTransactionFailureTest.java | 3 +- .../datastore/ShardTransactionTest.java | 3 +- .../EntityOwnershipShardTest.java | 4 +-- .../identifiers/ShardIdentifierTest.java | 5 ++-- ...ShardManagerGetSnapshotReplyActorTest.java | 16 +++++----- .../shardmanager/ShardManagerTest.java | 27 ++++++++--------- .../ShardPeerAddressResolverTest.java | 3 +- 16 files changed, 69 insertions(+), 77 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java index 9e3de6ba27..8726dc5bd3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java @@ -96,7 +96,7 @@ class EntityOwnershipShard extends Shard { this.entityOwnershipStatistics.init(getDataStore()); for(String peerId: getRaftActorContext().getPeerIds()) { - ShardIdentifier shardId = ShardIdentifier.builder().fromShardIdString(peerId).build(); + ShardIdentifier shardId = ShardIdentifier.fromShardIdString(peerId); peerIdToMemberNames.put(peerId, shardId.getMemberName()); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java index 037bafda67..fc3aa592f9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java @@ -23,18 +23,23 @@ public class ShardIdentifier { private final String type; private final String fullName; - public ShardIdentifier(String shardName, MemberName memberName, String type) { + private ShardIdentifier(String shardName, MemberName memberName, String type) { + this.shardName = Preconditions.checkNotNull(shardName, "shardName should not be null"); + this.memberName = Preconditions.checkNotNull(memberName, "memberName should not be null"); + this.type = Preconditions.checkNotNull(type, "type should not be null"); - Preconditions.checkNotNull(shardName, "shardName should not be null"); - Preconditions.checkNotNull(memberName, "memberName should not be null"); - Preconditions.checkNotNull(type, "type should not be null"); + fullName = memberName.getName() + "-shard-" + shardName + "-" + type; + } + + public static ShardIdentifier create(final String shardName, final MemberName memberName, final String type) { + return new ShardIdentifier(shardName, memberName, type); + } - this.shardName = shardName; - this.memberName = memberName; - this.type = type; + public static ShardIdentifier fromShardIdString(final String shardIdString) { + final Matcher matcher = PATTERN.matcher(shardIdString); + Preconditions.checkArgument(matcher.matches(), "Invalid shard id \"%s\"", shardIdString); - fullName = new StringBuilder(memberName.getName()).append("-shard-").append(shardName).append("-") - .append(type).toString(); + return new ShardIdentifier(matcher.group(2), MemberName.forName(matcher.group(1)), matcher.group(3)); } @Override @@ -71,14 +76,10 @@ public class ShardIdentifier { @Override public String toString() { - //ensure the output of toString matches the pattern above + // ensure the output of toString matches the pattern above return fullName; } - public static Builder builder(){ - return new Builder(); - } - public String getShardName() { return shardName; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java index aa2c524fe7..04c64ddca7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java @@ -601,9 +601,12 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering { String actorName = sender.path().name(); //find shard name from actor name; actor name is stringified shardId - ShardIdentifier shardId = ShardIdentifier.builder().fromShardIdString(actorName).build(); - if (shardId.getShardName() == null) { + final ShardIdentifier shardId; + try { + shardId = ShardIdentifier.fromShardIdString(actorName); + } catch (IllegalArgumentException e) { + LOG.debug("{}: ignoring actor {}", actorName, e); return; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActor.java index a1628bb37c..e4e71a492c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActor.java @@ -72,7 +72,7 @@ class ShardManagerGetSnapshotReplyActor extends UntypedActor { private void onGetSnapshotReply(GetSnapshotReply getSnapshotReply) { LOG.debug("{}: Received {}", params.id, getSnapshotReply); - ShardIdentifier shardId = ShardIdentifier.builder().fromShardIdString(getSnapshotReply.getId()).build(); + ShardIdentifier shardId = ShardIdentifier.fromShardIdString(getSnapshotReply.getId()); shardSnapshots.add(new ShardSnapshot(shardId.getShardName(), getSnapshotReply.getSnapshot())); remainingShardNames.remove(shardId.getShardName()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java index 9a3faa090b..41a2afe193 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerInfo.java @@ -97,8 +97,7 @@ final class ShardManagerInfo extends AbstractMXBean implements ShardManagerInfoM @Override public void switchShardState(String shardId, String newState, long term) { - final ShardIdentifier identifier = ShardIdentifier.builder().fromShardIdString( - Preconditions.checkNotNull(shardId, "Shard id may not be null")).build(); + final ShardIdentifier identifier = ShardIdentifier.fromShardIdString(shardId); LOG.info("switchShardState called shardName = {}, newState = {}, term = {}", shardId, newState, term); requestSwitchShardState(identifier, newState, term); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolver.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolver.java index d7bd3fa1f6..62b8e93fb5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolver.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolver.java @@ -62,8 +62,8 @@ class ShardPeerAddressResolver implements PeerAddressResolver { return peerAddresses; } - ShardIdentifier getShardIdentifier(MemberName memberName, String shardName){ - return ShardIdentifier.builder().memberName(memberName).shardName(shardName).type(shardManagerType).build(); + ShardIdentifier getShardIdentifier(MemberName memberName, String shardName) { + return ShardIdentifier.create(shardName, memberName, shardManagerType); } String getShardActorAddress(String shardName, MemberName memberName) { @@ -82,11 +82,11 @@ class ShardPeerAddressResolver implements PeerAddressResolver { @Override public String resolve(String peerId) { - if(peerId == null) { + if (peerId == null) { return null; } - ShardIdentifier shardId = ShardIdentifier.builder().fromShardIdString(peerId).build(); + ShardIdentifier shardId = ShardIdentifier.fromShardIdString(peerId); return getShardActorAddress(shardId.getShardName(), shardId.getMemberName()); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java index f6295765da..88caa86376 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java @@ -88,8 +88,8 @@ public abstract class AbstractShardTest extends AbstractActorTest{ private static final AtomicInteger NEXT_SHARD_NUM = new AtomicInteger(); - protected final ShardIdentifier shardID = ShardIdentifier.builder().memberName(MemberName.forName("member-1")) - .shardName("inventory").type("config" + NEXT_SHARD_NUM.getAndIncrement()).build(); + protected final ShardIdentifier shardID = ShardIdentifier.create("inventory", MemberName.forName("member-1"), + "config" + NEXT_SHARD_NUM.getAndIncrement()); protected final Builder dataStoreContextBuilder = DatastoreContext.newBuilder(). shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000). diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java index e3686fd227..d018ce4a91 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java @@ -147,11 +147,12 @@ public class MemberNode { String... peerMemberNames) throws Exception { final Set peerIds = Sets.newHashSet(); for(String p: peerMemberNames) { - peerIds.add(ShardIdentifier.builder().memberName(MemberName.forName(p)).shardName(shardName). - type(datastore.getActorContext().getDataStoreName()).build().toString()); + peerIds.add(ShardIdentifier.create(shardName, MemberName.forName(p), + datastore.getActorContext().getDataStoreName()).toString()); } - verifyRaftState(datastore, shardName, raftState -> assertEquals("Peers for shard " + shardName, peerIds, raftState.getPeerAddresses().keySet())); + verifyRaftState(datastore, shardName, raftState -> assertEquals("Peers for shard " + shardName, peerIds, + raftState.getPeerAddresses().keySet())); } public static void verifyNoShardPresent(DistributedDataStore datastore, String shardName) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java index 5b5f861724..2f1918077c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java @@ -390,8 +390,7 @@ public class ShardTest extends AbstractShardTest { @Test public void testPeerAddressResolved() throws Exception { new ShardTestKit(getSystem()) {{ - ShardIdentifier peerID = ShardIdentifier.builder().memberName(MemberName.forName("member-2")) - .shardName("inventory").type("config").build(); + ShardIdentifier peerID = ShardIdentifier.create("inventory", MemberName.forName("member-2"), "config"); final TestActorRef shard = actorFactory.createTestActor(newShardBuilder(). peerAddresses(Collections.singletonMap(peerID.toString(), null)).props(). withDispatcher(Dispatchers.DefaultDispatcherId()), "testPeerAddressResolved"); @@ -2308,13 +2307,11 @@ public class ShardTest extends AbstractShardTest { public void testClusteredDataChangeListenerRegistration() throws Exception { new ShardTestKit(getSystem()) {{ String testName = "testClusteredDataChangeListenerRegistration"; - final ShardIdentifier followerShardID = ShardIdentifier.builder() - .memberName(MemberName.forName(actorFactory.generateActorId(testName + "-follower"))) - .shardName("inventory").type("config").build(); + final ShardIdentifier followerShardID = ShardIdentifier.create("inventory", + MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config"); - final ShardIdentifier leaderShardID = ShardIdentifier.builder() - .memberName(MemberName.forName(actorFactory.generateActorId(testName + "-leader"))) - .shardName("inventory").type("config").build(); + final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory", + MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config"); final TestActorRef followerShard = actorFactory.createTestActor( Shard.builder().id(followerShardID). @@ -2386,13 +2383,11 @@ public class ShardTest extends AbstractShardTest { public void testClusteredDataTreeChangeListenerRegistration() throws Exception { new ShardTestKit(getSystem()) {{ String testName = "testClusteredDataTreeChangeListenerRegistration"; - final ShardIdentifier followerShardID = ShardIdentifier.builder() - .memberName(MemberName.forName(actorFactory.generateActorId(testName + "-follower"))) - .shardName("inventory").type("config").build(); + final ShardIdentifier followerShardID = ShardIdentifier.create("inventory", + MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config"); - final ShardIdentifier leaderShardID = ShardIdentifier.builder() - .memberName(MemberName.forName(actorFactory.generateActorId(testName + "-leader"))) - .shardName("inventory").type("config").build(); + final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory", + MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config"); final TestActorRef followerShard = actorFactory.createTestActor( Shard.builder().id(followerShardID). diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java index 757795acbe..75fdc36146 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionFailureTest.java @@ -42,8 +42,7 @@ public class ShardTransactionFailureTest extends AbstractActorTest { private static final ShardDataTree store = new ShardDataTree(testSchemaContext, TreeType.OPERATIONAL); private static final ShardIdentifier SHARD_IDENTIFIER = - ShardIdentifier.builder().memberName(MemberName.forName("member-1")) - .shardName("inventory").type("operational").build(); + ShardIdentifier.create("inventory", MemberName.forName("member-1"), "operational"); private final DatastoreContext datastoreContext = DatastoreContext.newBuilder().build(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java index 1ea06efcf0..a94a9a6d93 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java @@ -62,8 +62,7 @@ public class ShardTransactionTest extends AbstractActorTest { private static final TransactionType WO = TransactionType.WRITE_ONLY; private static final ShardIdentifier SHARD_IDENTIFIER = - ShardIdentifier.builder().memberName(MemberName.forName("member-1")) - .shardName("inventory").type("config").build(); + ShardIdentifier.create("inventory", MemberName.forName("member-1"), "config"); private DatastoreContext datastoreContext = DatastoreContext.newBuilder().build(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java index 5e528e8c76..26811444d8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java @@ -823,8 +823,8 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { } private static ShardIdentifier newShardId(String memberName) { - return ShardIdentifier.builder().memberName(MemberName.forName(memberName)).shardName("entity-ownership"). - type("operational" + NEXT_SHARD_NUM.getAndIncrement()).build(); + return ShardIdentifier.create("entity-ownership", MemberName.forName(memberName), + "operational" + NEXT_SHARD_NUM.getAndIncrement()); } private static class TestEntityOwnershipShard extends EntityOwnershipShard { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifierTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifierTest.java index 2dedb0e4cc..60e4539da8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifierTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifierTest.java @@ -16,8 +16,7 @@ public class ShardIdentifierTest { @Test public void testBasic(){ - ShardIdentifier id = ShardIdentifier.builder().memberName(MemberName.forName("member-1")) - .shardName("inventory").type("config").build(); + ShardIdentifier id = ShardIdentifier.create("inventory", MemberName.forName("member-1"), "config"); assertEquals("member-1-shard-inventory-config", id.toString()); } @@ -26,7 +25,7 @@ public class ShardIdentifierTest { public void testFromShardIdString(){ String shardIdStr = "member-1-shard-inventory-config"; - ShardIdentifier id = ShardIdentifier.builder().fromShardIdString(shardIdStr).build(); + ShardIdentifier id = ShardIdentifier.fromShardIdString(shardIdStr); assertEquals("member-1", id.getMemberName().getName()); assertEquals("inventory", id.getShardName()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java index beabd5e3f8..d319b3858c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java @@ -57,18 +57,18 @@ public class ShardManagerGetSnapshotReplyActorTest extends AbstractActorTest { kit.watch(replyActor); byte[] shard1Snapshot = new byte[]{1,2,3}; - replyActor.tell(new GetSnapshotReply(ShardIdentifier.builder().memberName(MEMBER_1).type("config"). - shardName("shard1").build().toString(), shard1Snapshot), ActorRef.noSender()); + replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard1", MEMBER_1, "config").toString(), + shard1Snapshot), ActorRef.noSender()); byte[] shard2Snapshot = new byte[]{4,5,6}; - replyActor.tell(new GetSnapshotReply(ShardIdentifier.builder().memberName(MEMBER_1).type("config"). - shardName("shard2").build().toString(), shard2Snapshot), ActorRef.noSender()); + replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard2", MEMBER_1, "config").toString(), + shard2Snapshot), ActorRef.noSender()); kit.expectNoMsg(FiniteDuration.create(500, TimeUnit.MILLISECONDS)); byte[] shard3Snapshot = new byte[]{7,8,9}; - replyActor.tell(new GetSnapshotReply(ShardIdentifier.builder().memberName(MEMBER_1).type("config"). - shardName("shard3").build().toString(), shard3Snapshot), ActorRef.noSender()); + replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard3", MEMBER_1, "config").toString(), + shard3Snapshot), ActorRef.noSender()); DatastoreSnapshot datastoreSnapshot = kit.expectMsgClass(DatastoreSnapshot.class); @@ -98,8 +98,8 @@ public class ShardManagerGetSnapshotReplyActorTest extends AbstractActorTest { kit.watch(replyActor); - replyActor.tell(new GetSnapshotReply(ShardIdentifier.builder().memberName(MEMBER_1).type("config"). - shardName("shard1").build().toString(), new byte[]{1,2,3}), ActorRef.noSender()); + replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard1", MEMBER_1, "config").toString(), + new byte[]{1,2,3}), ActorRef.noSender()); replyActor.tell(new Failure(new RuntimeException()), ActorRef.noSender()); 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 bd452a73e6..f0f051f163 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 @@ -167,7 +167,7 @@ public class ShardManagerTest extends AbstractActorTest { InMemorySnapshotStore.clear(); if(mockShardActor == null) { - mockShardName = new ShardIdentifier(Shard.DEFAULT_NAME, MEMBER_1, "config"); + mockShardName = ShardIdentifier.create(Shard.DEFAULT_NAME, MEMBER_1, "config"); mockShardActor = TestActorRef.create(getSystem(), Props.create(MessageCollectorActor.class), mockShardName.toString()); } @@ -194,7 +194,7 @@ public class ShardManagerTest extends AbstractActorTest { } private ActorRef newMockShardActor(ActorSystem system, String shardName, String memberName) { - String name = new ShardIdentifier(shardName, MemberName.forName(memberName), "config").toString(); + String name = ShardIdentifier.create(shardName, MemberName.forName(memberName), "config").toString(); if(system == getSystem()) { return actorFactory.createTestActor(Props.create(MessageCollectorActor.class), name); } @@ -1222,10 +1222,10 @@ public class ShardManagerTest extends AbstractActorTest { assertTrue("Epxected ShardPeerAddressResolver", shardBuilder.getDatastoreContext().getShardRaftConfig(). getPeerAddressResolver() instanceof ShardPeerAddressResolver); assertEquals("peerMembers", Sets.newHashSet( - new ShardIdentifier("foo", MemberName.forName("member-5"), shardMrgIDSuffix).toString(), - new ShardIdentifier("foo", MemberName.forName("member-6"), shardMrgIDSuffix).toString()), + ShardIdentifier.create("foo", MemberName.forName("member-5"), shardMrgIDSuffix).toString(), + ShardIdentifier.create("foo", MemberName.forName("member-6"), shardMrgIDSuffix).toString()), shardBuilder.getPeerAddresses().keySet()); - assertEquals("ShardIdentifier", new ShardIdentifier("foo", MEMBER_1, shardMrgIDSuffix), + assertEquals("ShardIdentifier", ShardIdentifier.create("foo", MEMBER_1, shardMrgIDSuffix), shardBuilder.getId()); assertSame("schemaContext", schemaContext, shardBuilder.getSchemaContext()); @@ -1442,7 +1442,7 @@ public class ShardManagerTest extends AbstractActorTest { final ActorSystem system2 = newActorSystem("Member2"); Cluster.get(system2).join(AddressFromURIString.parse("akka.tcp://cluster-test@127.0.0.1:2558")); - String name = new ShardIdentifier("astronauts", MEMBER_2, "config").toString(); + String name = ShardIdentifier.create("astronauts", MEMBER_2, "config").toString(); final TestActorRef mockShardLeaderActor = TestActorRef.create(system2, Props.create(MockRespondActor.class). withDispatcher(Dispatchers.DefaultDispatcherId()), name); @@ -1689,7 +1689,7 @@ public class ShardManagerTest extends AbstractActorTest { respondActor.underlyingActor().updateResponse(new RemoveServerReply(ServerChangeStatus.OK, null)); shardManager.tell(new RemoveShardReplica(Shard.DEFAULT_NAME, MEMBER_1), getRef()); final RemoveServer removeServer = MessageCollectorActor.expectFirstMatching(respondActor, RemoveServer.class); - assertEquals(new ShardIdentifier("default", MEMBER_1, shardMrgIDSuffix).toString(), + assertEquals(ShardIdentifier.create("default", MEMBER_1, shardMrgIDSuffix).toString(), removeServer.getServerId()); expectMsgClass(duration("5 seconds"), Success.class); }}; @@ -1718,7 +1718,7 @@ public class ShardManagerTest extends AbstractActorTest { final ActorSystem system2 = newActorSystem("Member2"); Cluster.get(system2).join(AddressFromURIString.parse("akka.tcp://cluster-test@127.0.0.1:2558")); - String name = new ShardIdentifier("default", MEMBER_2, shardMrgIDSuffix).toString(); + String name = ShardIdentifier.create("default", MEMBER_2, shardMrgIDSuffix).toString(); final TestActorRef mockShardLeaderActor = TestActorRef.create(system2, Props.create(MockRespondActor.class), name); @@ -1776,7 +1776,7 @@ public class ShardManagerTest extends AbstractActorTest { newReplicaShardManager.tell(new RemoveShardReplica("default", MEMBER_1), getRef()); RemoveServer removeServer = MessageCollectorActor.expectFirstMatching(mockShardLeaderActor, RemoveServer.class); - String removeServerId = new ShardIdentifier("default", MEMBER_1, shardMrgIDSuffix).toString(); + String removeServerId = ShardIdentifier.create("default", MEMBER_1, shardMrgIDSuffix).toString(); assertEquals("RemoveServer serverId", removeServerId, removeServer.getServerId()); expectMsgClass(duration("5 seconds"), Status.Success.class); }}; @@ -1866,8 +1866,7 @@ public class ShardManagerTest extends AbstractActorTest { put("astronauts", Arrays.asList("member-2")). put("people", Arrays.asList("member-1", "member-2")).build()); - String shardId = ShardIdentifier.builder().shardName("default").memberName(MEMBER_1). - type(shardMrgIDSuffix).build().toString(); + String shardId = ShardIdentifier.create("default", MEMBER_1, shardMrgIDSuffix).toString(); TestActorRef shard = actorFactory.createTestActor( MessageCollectorActor.props(), shardId); @@ -1939,13 +1938,11 @@ public class ShardManagerTest extends AbstractActorTest { put("shard1", Arrays.asList("member-1")). put("shard2", Arrays.asList("member-1")).build()); - String shardId1 = ShardIdentifier.builder().shardName("shard1").memberName(MEMBER_1). - type(shardMrgIDSuffix).build().toString(); + String shardId1 = ShardIdentifier.create("shard1", MEMBER_1, shardMrgIDSuffix).toString(); TestActorRef shard1 = actorFactory.createTestActor( MessageCollectorActor.props().withDispatcher(Dispatchers.DefaultDispatcherId()), shardId1); - String shardId2 = ShardIdentifier.builder().shardName("shard2").memberName(MEMBER_1). - type(shardMrgIDSuffix).build().toString(); + String shardId2 = ShardIdentifier.create("shard2", MEMBER_1, shardMrgIDSuffix).toString(); TestActorRef shard2 = actorFactory.createTestActor( MessageCollectorActor.props().withDispatcher(Dispatchers.DefaultDispatcherId()), shardId2); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolverTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolverTest.java index 84504d3ae4..bb76d08560 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolverTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolverTest.java @@ -65,8 +65,7 @@ public class ShardPeerAddressResolverTest { ShardPeerAddressResolver resolver = new ShardPeerAddressResolver(type, MEMBER_1); MemberName memberName = MEMBER_2; - String peerId = ShardIdentifier.builder().memberName(memberName).shardName("default"). - type(type).build().toString(); + String peerId = ShardIdentifier.create("default", memberName, type).toString(); assertEquals("resolve", null, resolver.resolve(peerId)); -- 2.36.6