Bump odlparent to 5.0.0

[controller.git] / opendaylight / md-sal / cds-access-client / src / main / java / org / opendaylight / controller / cluster / access / client / AbstractClientActorContext.java

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 0ca3545cf33eba797b6b278a5da675d75e4d442e..a09d06c61f17e21977fd49566ba9430375fcfb6f 100644 (file)
--- 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,31 +7,33 @@
  */
 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;
 
 /**
- * Common, externally-invisible superclass of contexts associated with a {@link AbstractClientActor}. End users pass this
- * object via opaque {@link ClientActorContext}.
+ * Common, externally-invisible superclass of contexts associated with a {@link AbstractClientActor}. End users pass
+ * this object via opaque {@link ClientActorContext}.
  *
  * @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(final @Nonnull ActorRef self, final @Nonnull 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);
     }
 
-    final @Nonnull String persistenceId() {
+    // TODO: rename this to logContext()
+    final @NonNull String persistenceId() {
         return persistenceId;
     }
 
-    public final @Nonnull ActorRef self() {
+    public final @NonNull ActorRef self() {
         return self;
     }
 }