Remove Helium protobuff code from AppendEntries

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

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java
index d8075f4381957a66e1958d36f7b9886c28efb5c5..896f3048bc83909512ef7d1493404c7352c00ab1 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java
@@ -8,19 +8,13 @@
 
 package org.opendaylight.controller.cluster.raft.messages;
 
-import com.google.protobuf.GeneratedMessage;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import org.opendaylight.controller.cluster.raft.RaftVersions;
 import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
-import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
-import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages;
 
 /**
  * Invoked by leader to replicate log entries (§5.3); also used as
@@ -29,9 +23,6 @@ import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntries
 public class AppendEntries extends AbstractRaftRPC {
     private static final long serialVersionUID = 1L;
 
-    public static final Class<AppendEntriesMessages.AppendEntries> LEGACY_SERIALIZABLE_CLASS =
-            AppendEntriesMessages.AppendEntries.class;
-
     private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(AppendEntries.class);
 
     // So that follower can redirect clients
@@ -126,100 +117,4 @@ public class AppendEntries extends AbstractRaftRPC {
                 .append(payloadVersion).append(", entries=").append(entries).append("]");
         return builder.toString();
     }
-
-    public <T extends Object> Object toSerializable() {
-        return toSerializable(RaftVersions.CURRENT_VERSION);
-    }
-
-    public <T extends Object> Object toSerializable(short version) {
-        if(version < RaftVersions.LITHIUM_VERSION) {
-            return toLegacySerializable();
-        } else {
-            return this;
-        }
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private <T> Object toLegacySerializable() {
-        AppendEntriesMessages.AppendEntries.Builder to = AppendEntriesMessages.AppendEntries.newBuilder();
-        to.setTerm(this.getTerm())
-            .setLeaderId(this.getLeaderId())
-            .setPrevLogTerm(this.getPrevLogTerm())
-            .setPrevLogIndex(this.getPrevLogIndex())
-            .setLeaderCommit(this.getLeaderCommit());
-
-        for (ReplicatedLogEntry logEntry : this.getEntries()) {
-
-            AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.Builder arBuilder =
-                AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.newBuilder();
-
-            AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.Payload.Builder arpBuilder =
-                AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.Payload.newBuilder();
-
-            //get the client specific payload extensions and add them to the payload builder
-            Map<GeneratedMessage.GeneratedExtension, T> map = logEntry.getData().encode();
-            Iterator<Map.Entry<GeneratedMessage.GeneratedExtension, T>> iter = map.entrySet().iterator();
-
-            while (iter.hasNext()) {
-                Map.Entry<GeneratedMessage.GeneratedExtension, T> entry = iter.next();
-                arpBuilder.setExtension(entry.getKey(), entry.getValue());
-            }
-
-            arpBuilder.setClientPayloadClassName(logEntry.getData().getClientPayloadClassName());
-
-            arBuilder.setData(arpBuilder).setIndex(logEntry.getIndex()).setTerm(logEntry.getTerm());
-            to.addLogEntries(arBuilder);
-        }
-
-        return to.build();
-    }
-
-    public static AppendEntries fromSerializable(Object serialized) {
-        if(serialized instanceof AppendEntries) {
-            return (AppendEntries)serialized;
-        }
-        else {
-            return fromLegacySerializable((AppendEntriesMessages.AppendEntries) serialized);
-        }
-    }
-
-    private static AppendEntries fromLegacySerializable(AppendEntriesMessages.AppendEntries from) {
-        List<ReplicatedLogEntry> logEntryList = new ArrayList<>();
-        for (AppendEntriesMessages.AppendEntries.ReplicatedLogEntry leProtoBuff : from.getLogEntriesList()) {
-
-            Payload payload = null ;
-            try {
-                if(leProtoBuff.getData() != null && leProtoBuff.getData().getClientPayloadClassName() != null) {
-                    String clientPayloadClassName = leProtoBuff.getData().getClientPayloadClassName();
-                    payload = (Payload) Class.forName(clientPayloadClassName).newInstance();
-                    payload = payload.decode(leProtoBuff.getData());
-                } else {
-                    LOG.error("Payload is null or payload does not have client payload class name");
-                }
-
-            } catch (InstantiationException e) {
-                LOG.error("InstantiationException when instantiating "+leProtoBuff.getData().getClientPayloadClassName(), e);
-            } catch (IllegalAccessException e) {
-                LOG.error("IllegalAccessException when accessing "+leProtoBuff.getData().getClientPayloadClassName(), e);
-            } catch (ClassNotFoundException e) {
-                LOG.error("ClassNotFoundException when loading "+leProtoBuff.getData().getClientPayloadClassName(), e);
-            }
-            ReplicatedLogEntry logEntry = new ReplicatedLogImplEntry(
-                leProtoBuff.getIndex(), leProtoBuff.getTerm(), payload);
-            logEntryList.add(logEntry);
-        }
-
-        AppendEntries to = new AppendEntries(from.getTerm(),
-            from.getLeaderId(),
-            from.getPrevLogIndex(),
-            from.getPrevLogTerm(),
-            logEntryList,
-            from.getLeaderCommit(), -1, (short)0);
-
-        return to;
-    }
-
-    public static boolean isSerializedType(Object message) {
-        return message instanceof AppendEntries || LEGACY_SERIALIZABLE_CLASS.isInstance(message);
-    }
 }