Improve AbstractClientConnection nullness guarantees

We have a few missing @NonNull annotations, make sure to add them.
Also remove a superfluous requireNonNull() in copy constructor.

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

diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnection.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnection.java
index 149f38f9b6cb5ad455c698b00da81ada8ebf0c67..f190e14b61e01d4f2a48c78e1a6761fd84028e78 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnection.java
+++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnection.java
@@ -76,11 +76,11 @@ public abstract class AbstractClientConnection<T extends BackendInfo> {
     private static final long MAX_DELAY_NANOS = TimeUnit.SECONDS.toNanos(MAX_DELAY_SECONDS);
 
     private final Lock lock = new ReentrantLock();
     private static final long MAX_DELAY_NANOS = TimeUnit.SECONDS.toNanos(MAX_DELAY_SECONDS);
 
     private final Lock lock = new ReentrantLock();

-    private final ClientActorContext context;
-    @GuardedBy("lock")
-    private final TransmitQueue queue;
+    private final @NonNull ClientActorContext context;

     private final @NonNull Long cookie;
     private final String backendName;
     private final @NonNull Long cookie;
     private final String backendName;

+    @GuardedBy("lock")
+    private final TransmitQueue queue;

 
     @GuardedBy("lock")
     private boolean haveTimer;
 
     @GuardedBy("lock")
     private boolean haveTimer;


@@ -95,8 +95,8 @@ public abstract class AbstractClientConnection<T extends BackendInfo> {
     // Private constructor to avoid code duplication.
     private AbstractClientConnection(final AbstractClientConnection<T> oldConn, final TransmitQueue newQueue,
             final String backendName) {
     // Private constructor to avoid code duplication.
     private AbstractClientConnection(final AbstractClientConnection<T> oldConn, final TransmitQueue newQueue,
             final String backendName) {

-        this.context = requireNonNull(oldConn.context);
-        this.cookie = requireNonNull(oldConn.cookie);
+        this.context = oldConn.context;
+        this.cookie = oldConn.cookie;

         this.backendName = requireNonNull(backendName);
         this.queue = requireNonNull(newQueue);
         // Will be updated in finishReplay if needed.
         this.backendName = requireNonNull(backendName);
         this.queue = requireNonNull(newQueue);
         // Will be updated in finishReplay if needed.


@@ -128,7 +128,7 @@ public abstract class AbstractClientConnection<T extends BackendInfo> {
             requireNonNull(oldConn.context).messageSlicer()), newBackend.getName());
     }
 
             requireNonNull(oldConn.context).messageSlicer()), newBackend.getName());
     }
 

-    public final ClientActorContext context() {
+    public final @NonNull ClientActorContext context() {

         return context;
     }
 
         return context;
     }
 


@@ -136,7 +136,7 @@ public abstract class AbstractClientConnection<T extends BackendInfo> {
         return cookie;
     }
 
         return cookie;
     }
 

-    public final ActorRef localActor() {
+    public final @NonNull ActorRef localActor() {

         return context.self();
     }
 
         return context.self();
     }