From: Robert Varga Date: Mon, 3 Apr 2023 14:34:22 +0000 (+0200) Subject: Remove legacy RaftRPC proxies X-Git-Tag: v8.0.0~3 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=185b965d5450aeba211ec8afdaecc139c941a474 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 --- 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 978ae8006d..ed8b280081 100644 --- 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 2ac4d7e355..2b33a12950 100644 --- 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 8aa74e7037..01fd9abe2e 100644 --- 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; - } - } }