From f01f64aab0fbcc383582bb211599b0cd09083111 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 24 Apr 2022 10:45:15 +0200 Subject: [PATCH] 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 --- .../access/client/AbstractClientConnection.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 149f38f9b6..f190e14b61 100644 --- 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 { 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; + @GuardedBy("lock") + private final TransmitQueue queue; @GuardedBy("lock") private boolean haveTimer; @@ -95,8 +95,8 @@ public abstract class AbstractClientConnection { // Private constructor to avoid code duplication. private AbstractClientConnection(final AbstractClientConnection 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. @@ -128,7 +128,7 @@ public abstract class AbstractClientConnection { requireNonNull(oldConn.context).messageSlicer()), newBackend.getName()); } - public final ClientActorContext context() { + public final @NonNull ClientActorContext context() { return context; } @@ -136,7 +136,7 @@ public abstract class AbstractClientConnection { return cookie; } - public final ActorRef localActor() { + public final @NonNull ActorRef localActor() { return context.self(); } -- 2.36.6