X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-client%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fclient%2FAbstractClientActorContext.java;h=a09d06c61f17e21977fd49566ba9430375fcfb6f;hb=refs%2Fchanges%2F11%2F80211%2F6;hp=7899358a17f86e07b18588fd5f6caca98e1e007d;hpb=314d5b41ea6b464db939da95a33c872f594ccada;p=controller.git

diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorContext.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorContext.java
index 7899358a17..a09d06c61f 100644
--- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorContext.java
+++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActorContext.java
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.controller.cluster.access.client;
 
+import static java.util.Objects.requireNonNull;
+
 import akka.actor.ActorRef;
-import com.google.common.base.Preconditions;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.Mutable;
 
 /**
@@ -19,21 +20,20 @@ import org.opendaylight.yangtools.concepts.Mutable;
  * @author Robert Varga
  */
 abstract class AbstractClientActorContext implements Mutable {
-    private final String persistenceId;
-    private final ActorRef self;
+    private final @NonNull String persistenceId;
+    private final @NonNull ActorRef self;
 
-    AbstractClientActorContext(@Nonnull final ActorRef self, @Nonnull final String persistenceId) {
-        this.persistenceId = Preconditions.checkNotNull(persistenceId);
-        this.self = Preconditions.checkNotNull(self);
+    AbstractClientActorContext(final @NonNull ActorRef self, final @NonNull String persistenceId) {
+        this.persistenceId = requireNonNull(persistenceId);
+        this.self = requireNonNull(self);
     }
 
-    @Nonnull
-    final String persistenceId() {
+    // TODO: rename this to logContext()
+    final @NonNull String persistenceId() {
         return persistenceId;
     }
 
-    @Nonnull
-    public final ActorRef self() {
+    public final @NonNull ActorRef self() {
         return self;
     }
 }