From f202ef2398038327618b69795249f51f5f2343b0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 15 Feb 2017 12:08:55 +0100 Subject: [PATCH] Clean MockClusterWrapper up - use immutable set builder directly - do not use deprecated UniqueAddress constructor Change-Id: I6905f1feb46302e36a246938a7e0189b82025ede Signed-off-by: Robert Varga --- .../datastore/utils/MockClusterWrapper.java | 86 +++++++------------ 1 file changed, 31 insertions(+), 55 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockClusterWrapper.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockClusterWrapper.java index 9822559d5d..36ac74b0c4 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockClusterWrapper.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockClusterWrapper.java @@ -11,14 +11,16 @@ package org.opendaylight.controller.cluster.datastore.utils; import akka.actor.ActorRef; import akka.actor.Address; import akka.actor.AddressFromURIString; -import akka.cluster.ClusterEvent; +import akka.cluster.ClusterEvent.MemberRemoved; +import akka.cluster.ClusterEvent.MemberUp; +import akka.cluster.ClusterEvent.ReachableMember; +import akka.cluster.ClusterEvent.UnreachableMember; +import akka.cluster.Member; import akka.cluster.MemberStatus; import akka.cluster.UniqueAddress; -import java.util.HashSet; -import java.util.Set; import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.ClusterWrapper; -import scala.collection.JavaConversions; +import scala.collection.immutable.Set; public class MockClusterWrapper implements ClusterWrapper { @@ -29,12 +31,12 @@ public class MockClusterWrapper implements ClusterWrapper { this("member-1"); } - public MockClusterWrapper(String currentMemberName) { + public MockClusterWrapper(final String currentMemberName) { this.currentMemberName = MemberName.forName(currentMemberName); } @Override - public void subscribeToMemberEvents(ActorRef actorRef) { + public void subscribeToMemberEvents(final ActorRef actorRef) { } @Override @@ -47,74 +49,48 @@ public class MockClusterWrapper implements ClusterWrapper { return selfAddress; } - public void setSelfAddress(Address selfAddress) { + public void setSelfAddress(final Address selfAddress) { this.selfAddress = selfAddress; } - public static void sendMemberUp(ActorRef to, String memberName, String address) { + public static void sendMemberUp(final ActorRef to, final String memberName, final String address) { to.tell(createMemberUp(memberName, address), null); } - public static void sendMemberRemoved(ActorRef to, String memberName, String address) { + public static void sendMemberRemoved(final ActorRef to, final String memberName, final String address) { to.tell(createMemberRemoved(memberName, address), null); } - public static ClusterEvent.MemberRemoved createMemberRemoved(String memberName, String address) { - akka.cluster.UniqueAddress uniqueAddress = new UniqueAddress( - AddressFromURIString.parse(address), 55); - - Set roles = new HashSet<>(); - - roles.add(memberName); - - akka.cluster.Member member = new akka.cluster.Member(uniqueAddress, 1, MemberStatus - .removed(), - JavaConversions.asScalaSet(roles).toSet()); - - return new ClusterEvent.MemberRemoved(member, MemberStatus.up()); + public static MemberRemoved createMemberRemoved(final String memberName, final String address) { + UniqueAddress uniqueAddress = new UniqueAddress(AddressFromURIString.parse(address), 55L); + Member member = new Member(uniqueAddress, 1, MemberStatus.removed(), setOf(memberName)); + return new MemberRemoved(member, MemberStatus.up()); } + public static MemberUp createMemberUp(final String memberName, final String address) { + UniqueAddress uniqueAddress = new UniqueAddress(AddressFromURIString.parse(address), 55L); + Member member = new Member(uniqueAddress, 1, MemberStatus.up(), setOf(memberName)); - public static ClusterEvent.MemberUp createMemberUp(String memberName, String address) { - akka.cluster.UniqueAddress uniqueAddress = new UniqueAddress( - AddressFromURIString.parse(address), 55); - - Set roles = new HashSet<>(); - - roles.add(memberName); - - akka.cluster.Member member = new akka.cluster.Member(uniqueAddress, 1, MemberStatus.up(), - JavaConversions.asScalaSet(roles).toSet()); - - return new ClusterEvent.MemberUp(member); + return new MemberUp(member); } - public static ClusterEvent.UnreachableMember createUnreachableMember(String memberName, String address) { - akka.cluster.UniqueAddress uniqueAddress = new UniqueAddress( - AddressFromURIString.parse(address), 55); - - Set roles = new HashSet<>(); - - roles.add(memberName); - - akka.cluster.Member member = new akka.cluster.Member(uniqueAddress, 1, MemberStatus.up(), - JavaConversions.asScalaSet(roles).toSet()); + public static UnreachableMember createUnreachableMember(final String memberName, final String address) { + UniqueAddress uniqueAddress = new UniqueAddress(AddressFromURIString.parse(address), 55L); + Member member = new Member(uniqueAddress, 1, MemberStatus.up(), setOf(memberName)); - return new ClusterEvent.UnreachableMember(member); + return new UnreachableMember(member); } - public static ClusterEvent.ReachableMember createReachableMember(String memberName, String address) { - akka.cluster.UniqueAddress uniqueAddress = new UniqueAddress( - AddressFromURIString.parse(address), 55); + public static ReachableMember createReachableMember(final String memberName, final String address) { + UniqueAddress uniqueAddress = new UniqueAddress(AddressFromURIString.parse(address), 55L); + Member member = new Member(uniqueAddress, 1, MemberStatus.up(), setOf(memberName)); - Set roles = new HashSet<>(); - - roles.add(memberName); - - akka.cluster.Member member = new akka.cluster.Member(uniqueAddress, 1, MemberStatus.up(), - JavaConversions.asScalaSet(roles).toSet()); + return new ReachableMember(member); + } - return new ClusterEvent.ReachableMember(member); + @SuppressWarnings("unchecked") + private static Set setOf(final String str) { + return scala.collection.immutable.Set$.MODULE$.newBuilder().$plus$eq(str).result(); } } -- 2.36.6