From 93c17c55ca0c3690d77c96cdfed91b6f186fe56a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 21 Mar 2016 17:58:54 +0100 Subject: [PATCH] Move MessageTracker to sal-clustering-commons Message tracker is useful outside of the data store, move it to commons. This will allow us to use it in RaftActor's recovery code. Change-Id: Ia1d8074d6dad7ea051d3650cd417cc773292506c Signed-off-by: Robert Varga --- .../cluster/common/actor}/MessageTracker.java | 4 +-- .../controller/cluster/datastore/Shard.java | 2 +- .../actor}/MessageTrackerTest.java | 25 ++++++++++--------- 3 files changed, 16 insertions(+), 15 deletions(-) rename opendaylight/md-sal/{sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils => sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor}/MessageTracker.java (98%) rename opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/{datastore/utils => common/actor}/MessageTrackerTest.java (93%) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/MessageTracker.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MessageTracker.java similarity index 98% rename from opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/MessageTracker.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MessageTracker.java index d90cf500b0..f046240734 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/MessageTracker.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MessageTracker.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.cluster.datastore.utils; +package org.opendaylight.controller.cluster.common.actor; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit; * * */ -public class MessageTracker { +public final class MessageTracker { private static final Context NO_OP_CONTEXT = new NoOpContext(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index 1978c5559b..ab878055ae 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -24,6 +24,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; import org.opendaylight.controller.cluster.common.actor.CommonConfig; +import org.opendaylight.controller.cluster.common.actor.MessageTracker; import org.opendaylight.controller.cluster.common.actor.MeteringBehavior; import org.opendaylight.controller.cluster.datastore.ShardCommitCoordinator.CohortEntry; import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException; @@ -53,7 +54,6 @@ import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContex import org.opendaylight.controller.cluster.datastore.modification.Modification; import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification; import org.opendaylight.controller.cluster.datastore.utils.Dispatchers; -import org.opendaylight.controller.cluster.datastore.utils.MessageTracker; import org.opendaylight.controller.cluster.notifications.LeaderStateChanged; import org.opendaylight.controller.cluster.notifications.RegisterRoleChangeListener; import org.opendaylight.controller.cluster.notifications.RoleChangeNotifier; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MessageTrackerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/common/actor/MessageTrackerTest.java similarity index 93% rename from opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MessageTrackerTest.java rename to opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/common/actor/MessageTrackerTest.java index e59dcbd0a5..12e79d2e00 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MessageTrackerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/common/actor/MessageTrackerTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.cluster.datastore.utils; +package org.opendaylight.controller.cluster.common.actor; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -20,12 +20,14 @@ import org.slf4j.LoggerFactory; public class MessageTrackerTest { - private final Logger LOG = LoggerFactory.getLogger(getClass()); + private final static Logger LOG = LoggerFactory.getLogger(MessageTrackerTest.class); - private class Foo {} + private class Foo { + + } @Test - public void testNoTracking(){ + public void testNoTracking() { MessageTracker messageTracker = new MessageTracker(Foo.class, 10); MessageTracker.Context context1 = messageTracker.received(new Foo()); @@ -39,7 +41,7 @@ public class MessageTrackerTest { } @Test - public void testFailedExpectationOnTracking(){ + public void testFailedExpectationOnTracking() { MessageTracker messageTracker = new MessageTracker(Foo.class, 10); messageTracker.begin(); @@ -55,7 +57,7 @@ public class MessageTrackerTest { } @Test - public void testFailedExpectationOnTrackingWithMessagesInBetween(){ + public void testFailedExpectationOnTrackingWithMessagesInBetween() { MessageTracker messageTracker = new MessageTracker(Foo.class, 10); messageTracker.begin(); @@ -89,12 +91,11 @@ public class MessageTrackerTest { Assert.assertEquals(Foo.class, error.getCurrentExpectedMessage().getClass()); LOG.error("An error occurred : {}" , error); - } @Test - public void testMetExpectationOnTracking(){ + public void testMetExpectationOnTracking() { MessageTracker messageTracker = new MessageTracker(Foo.class, 10); messageTracker.begin(); @@ -109,7 +110,7 @@ public class MessageTrackerTest { } @Test - public void testIllegalStateExceptionWhenDoneIsNotCalledWhileTracking(){ + public void testIllegalStateExceptionWhenDoneIsNotCalledWhileTracking() { MessageTracker messageTracker = new MessageTracker(Foo.class, 10); messageTracker.begin(); @@ -124,7 +125,7 @@ public class MessageTrackerTest { } @Test - public void testNoIllegalStateExceptionWhenDoneIsNotCalledWhileNotTracking(){ + public void testNoIllegalStateExceptionWhenDoneIsNotCalledWhileNotTracking() { MessageTracker messageTracker = new MessageTracker(Foo.class, 10); messageTracker.received(new Foo()); @@ -155,7 +156,7 @@ public class MessageTrackerTest { } @Test - public void testCallingBeginDoesNotResetWatch(){ + public void testCallingBeginDoesNotResetWatch() { MessageTracker messageTracker = new MessageTracker(Foo.class, 10); messageTracker.begin(); @@ -170,7 +171,7 @@ public class MessageTrackerTest { } @Test - public void testMessagesSinceLastExpectedMessage(){ + public void testMessagesSinceLastExpectedMessage() { MessageTracker messageTracker = new MessageTracker(Foo.class, 10); messageTracker.begin(); -- 2.36.6