Remove legacy RaftRPC proxies

These proxies have not been used since version 7.0.0, remove them.

JIRA: CONTROLLER-2081
Change-Id: I6a2ff617c8e356b0ab3e05ffc25ba432fb6096a9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotReply.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotReply.java
index 978ae8006d1716a8a868d7f704d4eaeae549cc2c..ed8b2800816f29a42c46b34adfa1aa5ca3004067 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotReply.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotReply.java
@@ -7,11 +7,6 @@
  */
 package org.opendaylight.controller.cluster.raft.messages;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
 public final class InstallSnapshotReply extends AbstractRaftRPC {
     @java.io.Serial
     private static final long serialVersionUID = 642227896390779503L;
@@ -53,38 +48,4 @@ public final class InstallSnapshotReply extends AbstractRaftRPC {
     Object writeReplace() {
         return new IR(this);
     }
-
-    @Deprecated(since = "7.0.0", forRemoval = true)
-    private static class Proxy implements Externalizable {
-        @java.io.Serial
-        private static final long serialVersionUID = 1L;
-
-        private InstallSnapshotReply installSnapshotReply;
-
-        // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't
-        // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection.
-        @SuppressWarnings("checkstyle:RedundantModifier")
-        public Proxy() {
-        }
-
-        @Override
-        public void writeExternal(final ObjectOutput out) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
-            long term = in.readLong();
-            String followerId = (String) in.readObject();
-            int chunkIndex = in.readInt();
-            boolean success = in.readBoolean();
-
-            installSnapshotReply = new InstallSnapshotReply(term, followerId, chunkIndex, success);
-        }
-
-        @java.io.Serial
-        private Object readResolve() {
-            return installSnapshotReply;
-        }
-    }
 }

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVote.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVote.java
index 2ac4d7e355481da2cfa5a1b37d6b1015363191a7..2b33a12950620accf369300b23074710c8b5b3c2 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVote.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVote.java
@@ -7,11 +7,6 @@
  */
 package org.opendaylight.controller.cluster.raft.messages;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
 /**
  * Invoked by candidates to gather votes (§5.2).
  */
@@ -60,38 +55,4 @@ public final class RequestVote extends AbstractRaftRPC {
     Object writeReplace() {
         return new RV(this);
     }
-
-    @Deprecated(since = "7.0.0", forRemoval = true)
-    private static class Proxy implements Externalizable {
-        @java.io.Serial
-        private static final long serialVersionUID = 1L;
-
-        private RequestVote requestVote;
-
-        // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't
-        // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection.
-        @SuppressWarnings("checkstyle:RedundantModifier")
-        public Proxy() {
-        }
-
-        @Override
-        public void writeExternal(final ObjectOutput out) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
-            long term = in.readLong();
-            String candidateId = (String) in.readObject();
-            long lastLogIndex = in.readLong();
-            long lastLogTerm = in.readLong();
-
-            requestVote = new RequestVote(term, candidateId, lastLogIndex, lastLogTerm);
-        }
-
-        @java.io.Serial
-        private Object readResolve() {
-            return requestVote;
-        }
-    }
 }

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVoteReply.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVoteReply.java
index 8aa74e7037f6d4c0aefaef127acc3093ec11d94b..01fd9abe2e1266572122e155630e4eca82cfb4d1 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVoteReply.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestVoteReply.java
@@ -7,11 +7,6 @@
  */
 package org.opendaylight.controller.cluster.raft.messages;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
 public final class RequestVoteReply extends AbstractRaftRPC {
     @java.io.Serial
     private static final long serialVersionUID = 8427899326488775660L;
@@ -37,36 +32,4 @@ public final class RequestVoteReply extends AbstractRaftRPC {
     Object writeReplace() {
         return new VR(this);
     }
-
-    @Deprecated(since = "7.0.0", forRemoval = true)
-    private static class Proxy implements Externalizable {
-        @java.io.Serial
-        private static final long serialVersionUID = 1L;
-
-        private RequestVoteReply requestVoteReply;
-
-        // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't
-        // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection.
-        @SuppressWarnings("checkstyle:RedundantModifier")
-        public Proxy() {
-        }
-
-        @Override
-        public void writeExternal(final ObjectOutput out) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void readExternal(final ObjectInput in) throws IOException {
-            long term = in.readLong();
-            boolean voteGranted = in.readBoolean();
-
-            requestVoteReply = new RequestVoteReply(term, voteGranted);
-        }
-
-        @java.io.Serial
-        private Object readResolve() {
-            return requestVoteReply;
-        }
-    }
 }