BUG-5280: fix a few warnings

This fixes javadoc warnings, addsa tiny bit of documentation
and corrects logging during recovery.

Change-Id: I13076ec052febb801a08c05adb7d8affca1fea82
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorBehavior.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorBehavior.java
index 79b876f626800106bb8d3885710a0a8bb60fde48..e564359fccb1d4e106318727aed970efa0804411 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorBehavior.java
+++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorBehavior.java
@@ -52,7 +52,7 @@ public abstract class AbstractClientActorBehavior<C extends AbstractClientActorC
     /**
      * Return an {@link ActorRef} of this ClientActor.
      *
-     * @return
+     * @return Actor associated with this behavior
      */
     public final @Nonnull ActorRef self() {
         return context.self();

diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java
index 38ce67a5085ec6b5b77137321619566da1e12a8e..5e2b455abc4f8f88e685d0aff9cea882d6fbb7f3 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java
+++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java
@@ -16,7 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @param <T> Frontend type
+ * Transient behavior handling messages during initial actor recovery.
  *
  * @author Robert Varga
  */
@@ -41,8 +41,8 @@ final class RecoveringClientActorBehavior extends AbstractClientActorBehavior<In
             final ClientIdentifier nextId;
             if (lastId != null) {
                 if (!currentFrontend.equals(lastId.getFrontendId())) {
-                    LOG.error("Mismatched frontend identifier, shutting down. Current: {} Saved: {}", currentFrontend,
-                    lastId.getFrontendId());
+                    LOG.error("{}: Mismatched frontend identifier, shutting down. Current: {} Saved: {}",
+                        persistenceId(), currentFrontend, lastId.getFrontendId());
                     return null;
                 }
 
@@ -56,9 +56,9 @@ final class RecoveringClientActorBehavior extends AbstractClientActorBehavior<In
             return new SavingClientActorBehavior(context(), nextId);
         } else if (recover instanceof SnapshotOffer) {
             lastId = (ClientIdentifier) ((SnapshotOffer)recover).snapshot();
-            LOG.debug("{}: recovered identifier {}", lastId);
+            LOG.debug("{}: recovered identifier {}", persistenceId(), lastId);
         } else {
-            LOG.warn("{}: ignoring recovery message {}", recover);
+            LOG.warn("{}: ignoring recovery message {}", persistenceId(), recover);
         }
 
         return this;

diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/SavingClientActorBehavior.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/SavingClientActorBehavior.java
index 05abf8407b1273bc90cc9375d8dbcb9efa7aa39f..5fc3ef38841d51c811ea792d55677a145590b1b0 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/SavingClientActorBehavior.java
+++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/SavingClientActorBehavior.java
@@ -18,6 +18,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * Transient behavior handling messages while the new generation is being persisted.
+ *
  * @author Robert Varga
  */
 final class SavingClientActorBehavior extends RecoveredClientActorBehavior<InitialClientActorContext> {