Reduce JSR305 proliferation

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / main / java / org / opendaylight / controller / cluster / raft / messages / AbstractServerChangeReply.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AbstractServerChangeReply.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AbstractServerChangeReply.java
index 3f0cf43ac942238f814190af05a45bc3241712f1..d37b52cc69eb0f1f4dc4cf118234e5d95c7e5985 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AbstractServerChangeReply.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AbstractServerChangeReply.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.controller.cluster.raft.messages;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
 import java.io.Serializable;
 import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * Abstract base class for a server configuration change reply.
@@ -26,17 +27,17 @@ public abstract class AbstractServerChangeReply implements Serializable {
     private final String leaderHint;
     private final ServerChangeStatus status;
 
-    AbstractServerChangeReply(final @Nonnull ServerChangeStatus status, final @Nullable String leaderHint) {
-        this.status = Preconditions.checkNotNull(status);
+    AbstractServerChangeReply(final @NonNull ServerChangeStatus status, final @Nullable String leaderHint) {
+        this.status = requireNonNull(status);
         this.leaderHint = leaderHint;
     }
 
     @VisibleForTesting
-    @Nonnull public final Optional<String> getLeaderHint() {
+    public final @NonNull Optional<String> getLeaderHint() {
         return Optional.ofNullable(leaderHint);
     }
 
-    @Nonnull public final ServerChangeStatus getStatus() {
+    public final @NonNull ServerChangeStatus getStatus() {
         return status;
     }