Reduce JSR305 proliferation

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

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/ChangeServersVotingStatus.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/ChangeServersVotingStatus.java
index 0f4601297ce39e01caca86ad3bb3a71ae6035873..625d970ddfa5e5300d474d289eab79a470fa91b6 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/ChangeServersVotingStatus.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/ChangeServersVotingStatus.java
@@ -7,11 +7,14 @@
  */
 package org.opendaylight.controller.cluster.raft.messages;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
+import com.google.common.collect.ImmutableSet;
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Message sent to change the raft voting status for servers.
@@ -22,17 +25,29 @@ public class ChangeServersVotingStatus implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private final Map<String, Boolean> serverVotingStatusMap;
+    private final Collection<String> serversVisited;
+
+    public ChangeServersVotingStatus(@NonNull Map<String, Boolean> serverVotingStatusMap) {
+        this(serverVotingStatusMap, ImmutableSet.of());
+    }
 
-    public ChangeServersVotingStatus(@Nonnull Map<String, Boolean> serverVotingStatusMap) {
-        this.serverVotingStatusMap = new HashMap<>(Preconditions.checkNotNull(serverVotingStatusMap));
+    public ChangeServersVotingStatus(@NonNull Map<String, Boolean> serverVotingStatusMap,
+            @NonNull Collection<String> serversVisited) {
+        this.serverVotingStatusMap = new HashMap<>(requireNonNull(serverVotingStatusMap));
+        this.serversVisited = ImmutableSet.copyOf(requireNonNull(serversVisited));
     }
 
-    public Map<String, Boolean> getServerVotingStatusMap() {
+    public @NonNull Map<String, Boolean> getServerVotingStatusMap() {
         return serverVotingStatusMap;
     }
 
+    public @NonNull Collection<String> getServersVisited() {
+        return serversVisited;
+    }
+
     @Override
     public String toString() {
-        return "ChangeServersVotingStatus [serverVotingStatusMap=" + serverVotingStatusMap + "]";
+        return "ChangeServersVotingStatus [serverVotingStatusMap=" + serverVotingStatusMap
+                + (serversVisited != null ? ", serversVisited=" + serversVisited : "") + "]";
     }
 }