Move ServerConfigurationPayload to cluster.raft.persisted

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

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ServerConfigurationPayload.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ServerConfigurationPayload.java
index 034af3b48bb140bc39222eab080598cde35eb2c5..2c20041e2e916b472192a5574e2f4c059aa6888b 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ServerConfigurationPayload.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ServerConfigurationPayload.java
@@ -8,6 +8,7 @@
 package org.opendaylight.controller.cluster.raft;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
@@ -23,7 +24,10 @@ import org.slf4j.LoggerFactory;
  * Payload data for server configuration log entries.
  *
  * @author Thomas Pantelis
+ *
+ * @deprecated Use {@link org.opendaylight.controller.cluster.raft.persisted.ServerConfigurationPayload} instead.
  */
+@Deprecated
 public class ServerConfigurationPayload extends Payload implements PersistentPayload, Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -65,6 +69,12 @@ public class ServerConfigurationPayload extends Payload implements PersistentPay
         return "ServerConfigurationPayload [serverConfig=" + serverConfig + "]";
     }
 
+    private Object readResolve() {
+        return org.opendaylight.controller.cluster.raft.persisted.ServerConfigurationPayload.createMigrated(
+            Lists.transform(serverConfig, t -> new org.opendaylight.controller.cluster.raft.persisted.ServerInfo(
+                t.getId(), t.isVoting)));
+    }
+
     public static class ServerInfo implements Serializable {
         private static final long serialVersionUID = 1L;
 
@@ -89,7 +99,7 @@ public class ServerConfigurationPayload extends Payload implements PersistentPay
         public int hashCode() {
             final int prime = 31;
             int result = 1;
-            result = prime * result + (isVoting ? 1231 : 1237);
+            result = prime * result + Boolean.hashCode(isVoting);
             result = prime * result + id.hashCode();
             return result;
         }