From: Robert Varga Date: Fri, 1 Apr 2016 14:34:22 +0000 (+0200) Subject: Remove unused TestEntityOwnershipShard X-Git-Tag: release/boron~253 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=3542d3faeb0056c728111fd53e817d2256cebcd9 Remove unused TestEntityOwnershipShard This class is not used anywhere, remove it. Change-Id: I3d2aeb4219315681229eda35e749f732bb1f2b73 Signed-off-by: Robert Varga --- 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 e9d837c17f..aad0a21d74 100644 --- 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 @@ -32,9 +32,7 @@ import akka.actor.PoisonPill; import com.google.common.base.Optional; import com.google.common.collect.Sets; import java.util.Collection; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -52,7 +50,6 @@ import org.opendaylight.controller.cluster.datastore.entityownership.messages.Re import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterCandidateLocal; import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterListenerLocal; import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.EntityOwnerSelectionStrategyConfig; -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; import org.opendaylight.controller.md.sal.common.api.clustering.CandidateAlreadyRegisteredException; @@ -63,7 +60,6 @@ import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipL import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import scala.concurrent.Await; @@ -302,38 +298,4 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh assertNotNull("EntityOwnershipCandidateRegistration null", reg); assertEquals("getInstance", entity, reg.getInstance()); } - - static class TestEntityOwnershipShard extends EntityOwnershipShard { - private final AtomicReference messageReceived; - private final AtomicReference receivedMessage; - private final AtomicReference> messageClass; - private final AtomicReference dataTree; - - protected TestEntityOwnershipShard(final EntityOwnershipShard.Builder builder, - final AtomicReference> messageClass, final AtomicReference messageReceived, - final AtomicReference receivedMessage, final AtomicReference dataTree) { - super(builder); - this.messageClass = messageClass; - this.messageReceived = messageReceived; - this.receivedMessage = receivedMessage; - this.dataTree = dataTree; - } - - @Override - public void handleCommand(final Object message) { - try { - if(dataTree.get() != null && message instanceof GetShardDataTree) { - sender().tell(dataTree.get(), self()); - } else { - super.handleCommand(message); - } - } finally { - Class expMsgClass = messageClass.get(); - if(expMsgClass != null && expMsgClass.equals(message.getClass())) { - receivedMessage.set(message); - messageReceived.get().countDown(); - } - } - } - } }