From 79c3bfabee03c5c03961af7229cc3d8cabac06d4 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Mon, 19 Sep 2016 15:19:35 -0400 Subject: [PATCH 1/1] Remove deprecated RaftActor inner classes These classes have been split out and deprecated in Lithium timeframe, remove them. Change-Id: If79245a39202e3bbfc6797d1a570ce8fe5af4363 Signed-off-by: Robert Varga Signed-off-by: Tom Pantelis --- .../controller/cluster/raft/RaftActor.java | 55 ------------------- 1 file changed, 55 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java index 660a6463f0..139f1e1ca5 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java @@ -17,7 +17,6 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.collect.Lists; -import java.io.Serializable; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -851,60 +850,6 @@ public abstract class RaftActor extends AbstractUntypedPersistentActor { } } - /** - * @deprecated Deprecated in favor of {@link org.opendaylight.controller.cluster.raft.persisted.DeleteEntries} - * whose type for fromIndex is long instead of int. This class was kept for backwards - * compatibility with Helium. - */ - // Suppressing this warning as we can't set serialVersionUID to maintain backwards compatibility. - @SuppressWarnings("serial") - @Deprecated - static class DeleteEntries implements Serializable { - private final int fromIndex; - - public DeleteEntries(int fromIndex) { - this.fromIndex = fromIndex; - } - - public int getFromIndex() { - return fromIndex; - } - - private Object readResolve() { - return org.opendaylight.controller.cluster.raft.persisted.DeleteEntries.createMigrated(fromIndex); - } - } - - /** - * @deprecated Deprecated in favor of non-inner class {@link org.opendaylight.controller.cluster.raft.persisted.UpdateElectionTerm} - * which has serialVersionUID set. This class was kept for backwards compatibility with Helium. - */ - // Suppressing this warning as we can't set serialVersionUID to maintain backwards compatibility. - @SuppressWarnings("serial") - @Deprecated - static class UpdateElectionTerm implements Serializable { - private final long currentTerm; - private final String votedFor; - - public UpdateElectionTerm(long currentTerm, String votedFor) { - this.currentTerm = currentTerm; - this.votedFor = votedFor; - } - - public long getCurrentTerm() { - return currentTerm; - } - - public String getVotedFor() { - return votedFor; - } - - private Object readResolve() { - return org.opendaylight.controller.cluster.raft.persisted.UpdateElectionTerm.createMigrated( - currentTerm, votedFor); - } - } - /** * A point-in-time capture of {@link RaftActorBehavior} state critical for transitioning between behaviors. */ -- 2.36.6