From 50664aceae387ef6dc9a952f5a6d4105d0d3b4a7 Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Thu, 25 Aug 2016 10:44:00 +0200
Subject: [PATCH] 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>
---
 .../access/client/AbstractClientActorBehavior.java     |  2 +-
 .../access/client/RecoveringClientActorBehavior.java   | 10 +++++-----
 .../access/client/SavingClientActorBehavior.java       |  2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

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 79b876f626..e564359fcc 100644
--- 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 38ce67a508..5e2b455abc 100644
--- 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 05abf8407b..5fc3ef3884 100644
--- 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> {
-- 
2.36.6