Migrate to UntypedAbstractActor

As per the 2.4-to-2.5 migration guide using UntypedAbstractActor
UntypedActor is our cheapest migration option. This requires
updating MeteringBehavior to integrate with Receive.

Change-Id: I692f723dffc966bb7e117124b7a0cd714572ab4f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ClientActor.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ClientActor.java
index 11857b9936fba6122bdaa82ccc8e7fbb069a1611..e16f363f0e0441589f644466ba0f9eec7ec9b6bb 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ClientActor.java
+++ b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/ClientActor.java
@@ -5,23 +5,22 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.controller.cluster.example;
 
 import akka.actor.ActorRef;
 import akka.actor.Props;
 package org.opendaylight.controller.cluster.example;
 
 import akka.actor.ActorRef;
 import akka.actor.Props;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import org.opendaylight.controller.cluster.example.messages.KeyValue;
 import org.opendaylight.controller.cluster.example.messages.KeyValueSaved;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.opendaylight.controller.cluster.example.messages.KeyValue;
 import org.opendaylight.controller.cluster.example.messages.KeyValueSaved;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

-public class ClientActor extends UntypedActor {
+public class ClientActor extends UntypedAbstractActor {

     private static final Logger LOG = LoggerFactory.getLogger(ClientActor.class);
 
     private final ActorRef target;
 
     private static final Logger LOG = LoggerFactory.getLogger(ClientActor.class);
 
     private final ActorRef target;
 

-    public ClientActor(ActorRef target) {
+    public ClientActor(final ActorRef target) {

         this.target = target;
     }
 
         this.target = target;
     }
 


@@ -29,7 +28,8 @@ public class ClientActor extends UntypedActor {
         return Props.create(ClientActor.class, target);
     }
 
         return Props.create(ClientActor.class, target);
     }
 

-    @Override public void onReceive(Object message) {
+    @Override
+    public void onReceive(final Object message) {

         if (message instanceof KeyValue) {
             target.tell(message, getSelf());
         } else if (message instanceof KeyValueSaved) {
         if (message instanceof KeyValue) {
             target.tell(message, getSelf());
         } else if (message instanceof KeyValueSaved) {

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java
index 89b454425ea56a935ccc1c15dd9fb4add95b4cbe..0e8847c259883a23ce39a129b8450884d840df10 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java
@@ -11,7 +11,7 @@ import akka.actor.ActorRef;
 import akka.actor.PoisonPill;
 import akka.actor.Props;
 import akka.actor.ReceiveTimeout;
 import akka.actor.PoisonPill;
 import akka.actor.Props;
 import akka.actor.ReceiveTimeout;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import com.google.common.base.Preconditions;
 import java.util.concurrent.TimeoutException;
 import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshot;
 import com.google.common.base.Preconditions;
 import java.util.concurrent.TimeoutException;
 import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshot;


@@ -28,7 +28,7 @@ import scala.concurrent.duration.Duration;
  *
  * @author Thomas Pantelis
  */
  *
  * @author Thomas Pantelis
  */

-class GetSnapshotReplyActor extends UntypedActor {
+class GetSnapshotReplyActor extends UntypedAbstractActor {

     private static final Logger LOG = LoggerFactory.getLogger(GetSnapshotReplyActor.class);
 
     private final Params params;
     private static final Logger LOG = LoggerFactory.getLogger(GetSnapshotReplyActor.class);
 
     private final Params params;

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java
index b1231d62d345b3477df95b4837da3c8ce2bcb46f..97ab20a48b8a319e9f09903600edf5f6cb767c1d 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java
@@ -15,9 +15,9 @@ import static org.opendaylight.controller.cluster.raft.utils.MessageCollectorAct
 import static org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor.expectFirstMatching;
 import static org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor.expectMatching;
 
 import static org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor.expectFirstMatching;
 import static org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor.expectMatching;
 

+import akka.actor.AbstractActor;

 import akka.actor.ActorRef;
 import akka.actor.Props;
 import akka.actor.ActorRef;
 import akka.actor.Props;

-import akka.actor.UntypedActor;

 import akka.dispatch.Dispatchers;
 import akka.testkit.TestActorRef;
 import akka.testkit.javadsl.TestKit;
 import akka.dispatch.Dispatchers;
 import akka.testkit.TestActorRef;
 import akka.testkit.javadsl.TestKit;


@@ -1469,7 +1469,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest {
         assertEquals("Server config", Sets.newHashSet(expected), Sets.newHashSet(payload.getServerConfig()));
     }
 
         assertEquals("Server config", Sets.newHashSet(expected), Sets.newHashSet(payload.getServerConfig()));
     }
 

-    private static RaftActorContextImpl newFollowerContext(String id, TestActorRef<? extends UntypedActor> actor) {
+    private static RaftActorContextImpl newFollowerContext(String id, TestActorRef<? extends AbstractActor> actor) {

         DefaultConfigParamsImpl configParams = new DefaultConfigParamsImpl();
         configParams.setHeartBeatInterval(new FiniteDuration(100, TimeUnit.MILLISECONDS));
         configParams.setElectionTimeoutFactor(100000);
         DefaultConfigParamsImpl configParams = new DefaultConfigParamsImpl();
         configParams.setHeartBeatInterval(new FiniteDuration(100, TimeUnit.MILLISECONDS));
         configParams.setElectionTimeoutFactor(100000);

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/DoNothingActor.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/DoNothingActor.java
index 4a73aadc197779acc4b992ec98e9f865d64deeb8..1080aadfe9c40c05c45db1db8aede93a7ec3f29b 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/DoNothingActor.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/DoNothingActor.java
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.controller.cluster.raft.utils;
 
 package org.opendaylight.controller.cluster.raft.utils;
 

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 
 

-public class DoNothingActor extends UntypedActor {
-    @Override public void onReceive(Object message) {
+public class DoNothingActor extends UntypedAbstractActor {
+    @Override
+    public void onReceive(final Object message) throws Exception {

 
     }
 }
 
     }
 }

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/EchoActor.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/EchoActor.java
index 1a730f90764e733f1fa0bcc7e3fc259bf2d8f51f..bd0c6bf4e3b9178d7145abcc034e4e1e17674310 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/EchoActor.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/EchoActor.java
@@ -5,18 +5,16 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.controller.cluster.raft.utils;
 
 package org.opendaylight.controller.cluster.raft.utils;
 

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 
 /**
  * The EchoActor simply responds back with the same message that it receives.
  */
 
 /**
  * The EchoActor simply responds back with the same message that it receives.
  */

-public class EchoActor extends UntypedActor {
-
+public class EchoActor extends UntypedAbstractActor {

     @Override
     @Override

-    public void onReceive(Object message) {
+    public void onReceive(final Object message) {

         getSender().tell(message, getSelf());
     }
 }
         getSender().tell(message, getSelf());
     }
 }

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/MessageCollectorActor.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/MessageCollectorActor.java
index d234913944910e5272da8eac09416bcfe066f160..861c04c875af86dba06e6ef83779cceec8bef7ca 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/MessageCollectorActor.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/MessageCollectorActor.java
@@ -10,7 +10,7 @@ package org.opendaylight.controller.cluster.raft.utils;
 
 import akka.actor.ActorRef;
 import akka.actor.Props;
 
 import akka.actor.ActorRef;
 import akka.actor.Props;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import akka.dispatch.ControlMessage;
 import akka.pattern.Patterns;
 import akka.util.Timeout;
 import akka.dispatch.ControlMessage;
 import akka.pattern.Patterns;
 import akka.util.Timeout;


@@ -30,7 +30,7 @@ import scala.concurrent.Future;
 import scala.concurrent.duration.Duration;
 import scala.concurrent.duration.FiniteDuration;
 
 import scala.concurrent.duration.Duration;
 import scala.concurrent.duration.FiniteDuration;
 

-public class MessageCollectorActor extends UntypedActor {
+public class MessageCollectorActor extends UntypedAbstractActor {

     private static final String ARE_YOU_READY = "ARE_YOU_READY";
     public static final String GET_ALL_MESSAGES = "messages";
 
     private static final String ARE_YOU_READY = "ARE_YOU_READY";
     public static final String GET_ALL_MESSAGES = "messages";
 

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/QuarantinedMonitorActor.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/QuarantinedMonitorActor.java
index 2ed5a24f535dda9a0171f889d9900e81d63311e7..52df6ab7b388314879e72160890a624fc0104529 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/QuarantinedMonitorActor.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/QuarantinedMonitorActor.java
@@ -9,7 +9,7 @@
 package org.opendaylight.controller.cluster.common.actor;
 
 import akka.actor.Props;
 package org.opendaylight.controller.cluster.common.actor;
 
 import akka.actor.Props;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import akka.japi.Effect;
 import akka.remote.ThisActorSystemQuarantinedEvent;
 import org.slf4j.Logger;
 import akka.japi.Effect;
 import akka.remote.ThisActorSystemQuarantinedEvent;
 import org.slf4j.Logger;


@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
  * @author Gary Wu gary.wu1@huawei.com
  *
  */
  * @author Gary Wu gary.wu1@huawei.com
  *
  */

-public class QuarantinedMonitorActor extends UntypedActor {
+public class QuarantinedMonitorActor extends UntypedAbstractActor {

 
     private static final Logger LOG = LoggerFactory.getLogger(QuarantinedMonitorActor.class);
 
 
     private static final Logger LOG = LoggerFactory.getLogger(QuarantinedMonitorActor.class);
 

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java
index 9c909e519a503e33b661ab744c37188e55f45b3c..673b4b1876f0eeb2ec718634793bb0cfba1674bb 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailboxTest.java
@@ -11,7 +11,7 @@ import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import akka.actor.DeadLetter;
 import akka.actor.Props;
 import akka.actor.ActorSystem;
 import akka.actor.DeadLetter;
 import akka.actor.Props;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import akka.testkit.TestKit;
 import com.typesafe.config.ConfigFactory;
 import java.util.concurrent.TimeUnit;
 import akka.testkit.TestKit;
 import com.typesafe.config.ConfigFactory;
 import java.util.concurrent.TimeUnit;


@@ -73,7 +73,7 @@ public class MeteredBoundedMailboxTest {
     /**
      * For testing.
      */
     /**
      * For testing.
      */

-    public static class PingPongActor extends UntypedActor {
+    public static class PingPongActor extends UntypedAbstractActor {

 
         ReentrantLock lock;
 
 
         ReentrantLock lock;
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TerminationMonitor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TerminationMonitor.java
index c596f12a091ec394f9bb3d55f71341ab4e10308a..d449ebc31afd8b531b13df98cdde273b132745ea 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TerminationMonitor.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TerminationMonitor.java
@@ -5,16 +5,15 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.controller.cluster.datastore;
 
 import akka.actor.Terminated;
 package org.opendaylight.controller.cluster.datastore;
 
 import akka.actor.Terminated;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import org.opendaylight.controller.cluster.common.actor.Monitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.opendaylight.controller.cluster.common.actor.Monitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

-public class TerminationMonitor extends UntypedActor {
+public class TerminationMonitor extends UntypedAbstractActor {

     private static final Logger LOG = LoggerFactory.getLogger(TerminationMonitor.class);
     public static final String ADDRESS = "termination-monitor";
 
     private static final Logger LOG = LoggerFactory.getLogger(TerminationMonitor.class);
     public static final String ADDRESS = "termination-monitor";
 


@@ -23,7 +22,7 @@ public class TerminationMonitor extends UntypedActor {
     }
 
     @Override
     }
 
     @Override

-    public void onReceive(Object message) {
+    public void onReceive(final Object message) {

         if (message instanceof Terminated) {
             Terminated terminated = (Terminated) message;
             LOG.debug("Actor terminated : {}", terminated.actor());
         if (message instanceof Terminated) {
             Terminated terminated = (Terminated) message;
             LOG.debug("Actor terminated : {}", terminated.actor());

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 c767eb208f8b04efb56c9050f490a5327752a57e..21af2c49697ed65f58458816b17c467f708e703d 100644 (file)
--- 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
@@ -12,7 +12,7 @@ import akka.actor.PoisonPill;
 import akka.actor.Props;
 import akka.actor.ReceiveTimeout;
 import akka.actor.Status.Failure;
 import akka.actor.Props;
 import akka.actor.ReceiveTimeout;
 import akka.actor.Status.Failure;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;


@@ -34,7 +34,7 @@ import scala.concurrent.duration.Duration;
  *
  * @author Thomas Pantelis
  */
  *
  * @author Thomas Pantelis
  */

-final class ShardManagerGetSnapshotReplyActor extends UntypedActor {
+final class ShardManagerGetSnapshotReplyActor extends UntypedAbstractActor {

     private static final Logger LOG = LoggerFactory.getLogger(ShardManagerGetSnapshotReplyActor.class);
 
     private final Set<String> remainingShardNames;
     private static final Logger LOG = LoggerFactory.getLogger(ShardManagerGetSnapshotReplyActor.class);
 
     private final Set<String> remainingShardNames;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java
index ba7295bcea75a7a3b4f9806549065211a0290f13..066be88aa39e4ccd086902b5e4c0b201d292e7b9 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java
@@ -16,7 +16,7 @@ import static org.opendaylight.controller.cluster.datastore.DataStoreVersions.CU
 
 import akka.actor.ActorSelection;
 import akka.actor.Props;
 
 import akka.actor.ActorSelection;
 import akka.actor.Props;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import akka.dispatch.Dispatchers;
 import akka.dispatch.Futures;
 import akka.testkit.TestActorRef;
 import akka.dispatch.Dispatchers;
 import akka.dispatch.Futures;
 import akka.testkit.TestActorRef;


@@ -308,7 +308,7 @@ public class ThreePhaseCommitCohortProxyTest extends AbstractActorTest {
         assertEquals("canCommit", expected, actual);
     }
 
         assertEquals("canCommit", expected, actual);
     }
 

-    private static class CohortActor extends UntypedActor {
+    private static class CohortActor extends UntypedAbstractActor {

         private final Builder builder;
         private final AtomicInteger canCommitCount = new AtomicInteger();
         private final AtomicInteger commitCount = new AtomicInteger();
         private final Builder builder;
         private final AtomicInteger canCommitCount = new AtomicInteger();
         private final AtomicInteger commitCount = new AtomicInteger();

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
index 89a50b84e446fe4e8bc99191f8c83ff7799e5765..22cc77f88bd246b63481d024b2272fb0b240e133 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
@@ -23,7 +23,7 @@ import akka.actor.ActorSelection;
 import akka.actor.ActorSystem;
 import akka.actor.Address;
 import akka.actor.Props;
 import akka.actor.ActorSystem;
 import akka.actor.Address;
 import akka.actor.Props;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import akka.dispatch.Futures;
 import akka.japi.Creator;
 import akka.testkit.TestActorRef;
 import akka.dispatch.Futures;
 import akka.japi.Creator;
 import akka.testkit.TestActorRef;


@@ -73,7 +73,7 @@ public class ActorContextTest extends AbstractActorTest {
     private static class TestMessage {
     }
 
     private static class TestMessage {
     }
 

-    private static final class MockShardManager extends UntypedActor {
+    private static final class MockShardManager extends UntypedAbstractActor {

 
         private final boolean found;
         private final ActorRef actorRef;
 
         private final boolean found;
         private final ActorRef actorRef;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ForwardingActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ForwardingActor.java
index 790d6443a07c49204066867d8240c13d45506ca5..64631fe42f62468f875e813295e2e8b9cbf603f7 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ForwardingActor.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ForwardingActor.java
@@ -5,13 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.controller.cluster.datastore.utils;
 
 import akka.actor.ActorRef;
 package org.opendaylight.controller.cluster.datastore.utils;
 
 import akka.actor.ActorRef;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 
 

-public final class ForwardingActor extends UntypedActor {
+public final class ForwardingActor extends UntypedAbstractActor {

     private final ActorRef target;
 
     private ForwardingActor(final ActorRef target) {
     private final ActorRef target;
 
     private ForwardingActor(final ActorRef target) {


@@ -22,5 +21,4 @@ public final class ForwardingActor extends UntypedActor {
     public void onReceive(final Object obj) {
         target.forward(obj, context());
     }
     public void onReceive(final Object obj) {
         target.forward(obj, context());
     }

-

 }
 }

diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShard.java b/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShard.java
index c5a3a032d463e99b7744e38fc619c4102f6f9a3a..62eb392f2d58d3b55d04da2c00d1e44ebf55919a 100644 (file)
--- a/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShard.java
+++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShard.java
@@ -9,7 +9,7 @@
 package org.opendaylight.controller.dummy.datastore;
 
 import akka.actor.Props;
 package org.opendaylight.controller.dummy.datastore;
 
 import akka.actor.Props;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import com.google.common.base.Stopwatch;
 import java.util.concurrent.TimeUnit;
 import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
 import com.google.common.base.Stopwatch;
 import java.util.concurrent.TimeUnit;
 import org.opendaylight.controller.cluster.datastore.DataStoreVersions;


@@ -23,7 +23,7 @@ import org.opendaylight.controller.cluster.raft.messages.RequestVoteReply;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

-public class DummyShard extends UntypedActor {
+public class DummyShard extends UntypedAbstractActor {

     private static final Logger LOG = LoggerFactory.getLogger(DummyShard.class);
 
     private final Configuration configuration;
     private static final Logger LOG = LoggerFactory.getLogger(DummyShard.class);
 
     private final Configuration configuration;

diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShardManager.java b/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShardManager.java
index a25a0814c26f77b3bb6de0942d089bc8e76d304d..05f83368f6ec334e8c5ccc2bda7503c14f63bec8 100644 (file)
--- a/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShardManager.java
+++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShardManager.java
@@ -5,25 +5,24 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.controller.dummy.datastore;
 
 package org.opendaylight.controller.dummy.datastore;
 

-import akka.actor.ActorContext;

 import akka.actor.Props;
 import akka.actor.Props;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 
 

-public class DummyShardManager extends UntypedActor {
-    public DummyShardManager(Configuration configuration, String memberName, String[] shardNames,
-            String type) {
-        new DummyShardsCreator(configuration, context(), memberName, shardNames, type).create();
+public class DummyShardManager extends UntypedAbstractActor {
+    public DummyShardManager(final Configuration configuration, final String memberName, final String[] shardNames,
+            final String type) {
+        new DummyShardsCreator(configuration, getContext(), memberName, shardNames, type).create();

     }
 
     @Override
     }
 
     @Override

-    public void onReceive(Object message) {
+    public void onReceive(final Object message) {

 
     }
 
 
     }
 

-    public static Props props(Configuration configuration, String memberName, String[] shardNames, String type) {
+    public static Props props(final Configuration configuration, final String memberName, final String[] shardNames,
+            final String type) {

         return Props.create(DummyShardManager.class, configuration, memberName, shardNames, type);
     }
 
         return Props.create(DummyShardManager.class, configuration, memberName, shardNames, type);
     }
 


@@ -34,8 +33,8 @@ public class DummyShardManager extends UntypedActor {
         private final String[] shardNames;
         private final String type;
 
         private final String[] shardNames;
         private final String type;
 

-        DummyShardsCreator(Configuration configuration, ActorContext actorSystem, String memberName,
-                String[] shardNames, String type) {
+        DummyShardsCreator(final Configuration configuration, final ActorContext actorSystem, final String memberName,
+                final String[] shardNames, final String type) {

             this.configuration = configuration;
             this.actorSystem = actorSystem;
             this.memberName = memberName;
             this.configuration = configuration;
             this.actorSystem = actorSystem;
             this.memberName = memberName;

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/TerminationMonitor.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/TerminationMonitor.java
index 127238942bdb7328ce9d946eca12479a8c8242f9..6590941e39e85d638550e6f391dc11081fae52ea 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/TerminationMonitor.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/TerminationMonitor.java
@@ -9,12 +9,12 @@
 package org.opendaylight.controller.remote.rpc;
 
 import akka.actor.Terminated;
 package org.opendaylight.controller.remote.rpc;
 
 import akka.actor.Terminated;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import org.opendaylight.controller.cluster.common.actor.Monitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.opendaylight.controller.cluster.common.actor.Monitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

-public class TerminationMonitor extends UntypedActor {
+public class TerminationMonitor extends UntypedAbstractActor {

     private static final Logger LOG = LoggerFactory.getLogger(TerminationMonitor.class);
 
     public TerminationMonitor() {
     private static final Logger LOG = LoggerFactory.getLogger(TerminationMonitor.class);
 
     public TerminationMonitor() {

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfigTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfigTest.java
index a6be665ead8c633764c2999411d6c95b342329f6..41de6a48c75b86a5837798abc413e54d0c5e3ac6 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfigTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfigTest.java
@@ -9,7 +9,7 @@ package org.opendaylight.controller.remote.rpc;
 
 import akka.actor.ActorSystem;
 import akka.actor.Props;
 
 import akka.actor.ActorSystem;
 import akka.actor.Props;

-import akka.actor.UntypedActor;
+import akka.actor.UntypedAbstractActor;

 import akka.testkit.TestActorRef;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import akka.testkit.TestActorRef;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;


@@ -78,7 +78,7 @@ public class RemoteRpcProviderConfigTest {
         Assert.assertEquals(expectedTimeout.toMillis(), config.getMailBoxPushTimeout().toMillis());
     }
 
         Assert.assertEquals(expectedTimeout.toMillis(), config.getMailBoxPushTimeout().toMillis());
     }
 

-    public static class ConfigTestActor extends UntypedActor {
+    public static class ConfigTestActor extends UntypedAbstractActor {

 
         private final Config actorSystemConfig;
 
 
         private final Config actorSystemConfig;