Simplify QuarantinedMonitorActor

[controller.git] / opendaylight / md-sal / sal-clustering-commons / src / main / java / org / opendaylight / controller / cluster / common / actor / AbstractUntypedPersistentActor.java

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractUntypedPersistentActor.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractUntypedPersistentActor.java
index 326733f377e21d62fcf4865a0eeab10ad14e7ad6..c50ec64e841d288bcb8fafd4f0c10745042db314 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractUntypedPersistentActor.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractUntypedPersistentActor.java
@@ -14,42 +14,31 @@ import org.slf4j.LoggerFactory;
 
 public abstract class AbstractUntypedPersistentActor extends UntypedPersistentActor {
 
+    // The member name should be lower case but it's referenced in many subclasses. Suppressing the CS warning for now.
+    @SuppressWarnings("checkstyle:MemberName")
     protected final Logger LOG = LoggerFactory.getLogger(getClass());
 
-    public AbstractUntypedPersistentActor() {
-        if(LOG.isTraceEnabled()) {
-            LOG.trace("Actor created {}", getSelf());
-        }
-        getContext().
-            system().
-            actorSelection("user/termination-monitor").
-            tell(new Monitor(getSelf()), getSelf());
-
+    protected AbstractUntypedPersistentActor() {
+        LOG.trace("Actor created {}", getSelf());
+        getContext().system().actorSelection("user/termination-monitor").tell(new Monitor(getSelf()), getSelf());
     }
 
-
-    @Override public void onReceiveCommand(Object message) throws Exception {
+    @Override
+    public final void onReceiveCommand(Object message) throws Exception {
         final String messageType = message.getClass().getSimpleName();
-        if(LOG.isTraceEnabled()) {
-            LOG.trace("Received message {}", messageType);
-        }
+        LOG.trace("Received message {}", messageType);
+
         handleCommand(message);
-        if(LOG.isTraceEnabled()) {
-            LOG.trace("Done handling message {}", messageType);
-        }
 
+        LOG.trace("Done handling message {}", messageType);
     }
 
-    @Override public void onReceiveRecover(Object message) throws Exception {
+    @Override
+    public final void onReceiveRecover(Object message) throws Exception {
         final String messageType = message.getClass().getSimpleName();
-        if(LOG.isTraceEnabled()) {
-            LOG.trace("Received message {}", messageType);
-        }
+        LOG.trace("Received message {}", messageType);
         handleRecover(message);
-        if(LOG.isTraceEnabled()) {
-            LOG.trace("Done handling message {}", messageType);
-        }
-
+        LOG.trace("Done handling message {}", messageType);
     }
 
     protected abstract void handleRecover(Object message) throws Exception;
@@ -61,9 +50,7 @@ public abstract class AbstractUntypedPersistentActor extends UntypedPersistentAc
     }
 
     protected void unknownMessage(Object message) throws Exception {
-        if(LOG.isDebugEnabled()) {
-            LOG.debug("Received unhandled message {}", message);
-        }
+        LOG.debug("Received unhandled message {}", message);
         unhandled(message);
     }
 }