X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2Fmessages%2FInstallSnapshot.java;h=5b6f030431e217016f7156b3c56172ba9e09fae1;hp=119b43ce83acad53740566e50187411308d2fc69;hb=bad1f8b8f3c1780cd37ec8a817ef4b0f23901654;hpb=ee303a25aa7c90ab9f7f28c1effef5254a4c7676

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java
index 119b43ce83..5b6f030431 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java
@@ -9,24 +9,26 @@
 package org.opendaylight.controller.cluster.raft.messages;
 
 import com.google.common.base.Optional;
-import com.google.protobuf.ByteString;
-import org.opendaylight.controller.protobuff.messages.cluster.raft.InstallSnapshotMessages;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.opendaylight.controller.cluster.raft.persisted.ServerConfigurationPayload;
 
 public class InstallSnapshot extends AbstractRaftRPC {
-
-    public static final Class<InstallSnapshotMessages.InstallSnapshot> SERIALIZABLE_CLASS = InstallSnapshotMessages.InstallSnapshot.class;
     private static final long serialVersionUID = 1L;
 
     private final String leaderId;
     private final long lastIncludedIndex;
     private final long lastIncludedTerm;
-    private final ByteString data;
+    private final byte[] data;
     private final int chunkIndex;
     private final int totalChunks;
     private final Optional<Integer> lastChunkHashCode;
+    private final Optional<ServerConfigurationPayload> serverConfig;
 
-    public InstallSnapshot(long term, String leaderId, long lastIncludedIndex,
-        long lastIncludedTerm, ByteString data, int chunkIndex, int totalChunks, Optional<Integer> lastChunkHashCode) {
+    public InstallSnapshot(long term, String leaderId, long lastIncludedIndex, long lastIncludedTerm, byte[] data,
+            int chunkIndex, int totalChunks, Optional<Integer> lastChunkHashCode, Optional<ServerConfigurationPayload> serverConfig) {
         super(term);
         this.leaderId = leaderId;
         this.lastIncludedIndex = lastIncludedIndex;
@@ -35,14 +37,15 @@ public class InstallSnapshot extends AbstractRaftRPC {
         this.chunkIndex = chunkIndex;
         this.totalChunks = totalChunks;
         this.lastChunkHashCode = lastChunkHashCode;
+        this.serverConfig = serverConfig;
     }
 
     public InstallSnapshot(long term, String leaderId, long lastIncludedIndex,
-                           long lastIncludedTerm, ByteString data, int chunkIndex, int totalChunks) {
-        this(term, leaderId, lastIncludedIndex, lastIncludedTerm, data, chunkIndex, totalChunks, Optional.<Integer>absent());
+                           long lastIncludedTerm, byte[] data, int chunkIndex, int totalChunks) {
+        this(term, leaderId, lastIncludedIndex, lastIncludedTerm, data, chunkIndex, totalChunks,
+                Optional.<Integer>absent(), Optional.<ServerConfigurationPayload>absent());
     }
 
-
     public String getLeaderId() {
         return leaderId;
     }
@@ -55,7 +58,7 @@ public class InstallSnapshot extends AbstractRaftRPC {
         return lastIncludedTerm;
     }
 
-    public ByteString getData() {
+    public byte[] getData() {
         return data;
     }
 
@@ -71,46 +74,90 @@ public class InstallSnapshot extends AbstractRaftRPC {
         return lastChunkHashCode;
     }
 
-    public <T extends Object> Object toSerializable(){
-        InstallSnapshotMessages.InstallSnapshot.Builder builder = InstallSnapshotMessages.InstallSnapshot.newBuilder()
-                .setLeaderId(this.getLeaderId())
-                .setChunkIndex(this.getChunkIndex())
-                .setData(this.getData())
-                .setLastIncludedIndex(this.getLastIncludedIndex())
-                .setLastIncludedTerm(this.getLastIncludedTerm())
-                .setTotalChunks(this.getTotalChunks());
-
-        if(lastChunkHashCode.isPresent()){
-            builder.setLastChunkHashCode(lastChunkHashCode.get());
-        }
-        return builder.build();
+    public Optional<ServerConfigurationPayload> getServerConfig() {
+        return serverConfig;
     }
 
-    public static InstallSnapshot fromSerializable (Object o) {
-        InstallSnapshotMessages.InstallSnapshot from =
-            (InstallSnapshotMessages.InstallSnapshot) o;
-
-        Optional<Integer> lastChunkHashCode = Optional.absent();
-        if(from.hasLastChunkHashCode()){
-            lastChunkHashCode = Optional.of(from.getLastChunkHashCode());
-        }
 
-        InstallSnapshot installSnapshot = new InstallSnapshot(from.getTerm(),
-            from.getLeaderId(), from.getLastIncludedIndex(),
-            from.getLastIncludedTerm(), from.getData(),
-            from.getChunkIndex(), from.getTotalChunks(), lastChunkHashCode);
-
-        return installSnapshot;
+    public <T extends Object> Object toSerializable(short version) {
+        return this;
     }
 
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("InstallSnapshot [term=").append(term).append(", leaderId=").append(leaderId)
-                .append(", lastIncludedIndex=").append(lastIncludedIndex).append(", lastIncludedTerm=")
-                .append(lastIncludedTerm).append(", data=").append(data).append(", chunkIndex=").append(chunkIndex)
-                .append(", totalChunks=").append(totalChunks).append(", lastChunkHashCode=").append(lastChunkHashCode)
-                .append("]");
-        return builder.toString();
+        return "InstallSnapshot [term=" + getTerm() + ", leaderId=" + leaderId + ", lastIncludedIndex="
+                + lastIncludedIndex + ", lastIncludedTerm=" + lastIncludedTerm + ", datasize=" + data.length
+                + ", Chunk=" + chunkIndex + "/" + totalChunks + ", lastChunkHashCode=" + lastChunkHashCode
+                + ", serverConfig=" + serverConfig.orNull() + "]";
+    }
+
+    private Object writeReplace() {
+        return new Proxy(this);
+    }
+
+    private static class Proxy implements Externalizable {
+        private static final long serialVersionUID = 1L;
+
+        private InstallSnapshot installSnapshot;
+
+        public Proxy() {
+        }
+
+        Proxy(InstallSnapshot installSnapshot) {
+            this.installSnapshot = installSnapshot;
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeLong(installSnapshot.getTerm());
+            out.writeObject(installSnapshot.leaderId);
+            out.writeLong(installSnapshot.lastIncludedIndex);
+            out.writeLong(installSnapshot.lastIncludedTerm);
+            out.writeInt(installSnapshot.chunkIndex);
+            out.writeInt(installSnapshot.totalChunks);
+
+            out.writeByte(installSnapshot.lastChunkHashCode.isPresent() ? 1 : 0);
+            if(installSnapshot.lastChunkHashCode.isPresent()) {
+                out.writeInt(installSnapshot.lastChunkHashCode.get().intValue());
+            }
+
+            out.writeByte(installSnapshot.serverConfig.isPresent() ? 1 : 0);
+            if(installSnapshot.serverConfig.isPresent()) {
+                out.writeObject(installSnapshot.serverConfig.get());
+            }
+
+            out.writeObject(installSnapshot.data);
+        }
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            long term = in.readLong();
+            String leaderId = (String) in.readObject();
+            long lastIncludedIndex = in.readLong();
+            long lastIncludedTerm = in.readLong();
+            int chunkIndex = in.readInt();
+            int totalChunks = in.readInt();
+
+            Optional<Integer> lastChunkHashCode = Optional.absent();
+            boolean chunkHashCodePresent = in.readByte() == 1;
+            if(chunkHashCodePresent) {
+                lastChunkHashCode = Optional.of(in.readInt());
+            }
+
+            Optional<ServerConfigurationPayload> serverConfig = Optional.absent();
+            boolean serverConfigPresent = in.readByte() == 1;
+            if(serverConfigPresent) {
+                serverConfig = Optional.of((ServerConfigurationPayload)in.readObject());
+            }
+
+            byte[] data = (byte[])in.readObject();
+
+            installSnapshot = new InstallSnapshot(term, leaderId, lastIncludedIndex, lastIncludedTerm, data,
+                    chunkIndex, totalChunks, lastChunkHashCode, serverConfig);
+        }
+
+        private Object readResolve() {
+            return installSnapshot;
+        }
     }
 }