X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2Fpersisted%2FUpdateElectionTerm.java;h=3ef7acbea369c35f4fa365ac5736aa0b3f34df7f;hb=HEAD;hp=55096d677e60019cfd86378a0f5fda71b8e61fdb;hpb=660c3e22ca97bc613ea6f6288503620bba6fb233;p=controller.git diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/UpdateElectionTerm.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/UpdateElectionTerm.java index 55096d677e..3ef7acbea3 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/UpdateElectionTerm.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/UpdateElectionTerm.java @@ -7,62 +7,21 @@ */ package org.opendaylight.controller.cluster.raft.persisted; -import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.io.Serializable; /** * Message class to persist election term information. */ -public class UpdateElectionTerm implements Serializable, MigratedSerializable { - private static final class Proxy implements Externalizable { - private static final long serialVersionUID = 1L; - - private UpdateElectionTerm updateElectionTerm; - - // 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() { - // For Externalizable - } - - Proxy(final UpdateElectionTerm updateElectionTerm) { - this.updateElectionTerm = updateElectionTerm; - } - - @Override - public void writeExternal(final ObjectOutput out) throws IOException { - out.writeLong(updateElectionTerm.currentTerm); - out.writeObject(updateElectionTerm.votedFor); - } - - @Override - public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { - updateElectionTerm = new UpdateElectionTerm(in.readLong(), (String) in.readObject()); - } - - private Object readResolve() { - return updateElectionTerm; - } - } - +public final class UpdateElectionTerm implements Serializable { + @java.io.Serial private static final long serialVersionUID = 1L; private final long currentTerm; private final String votedFor; - private final boolean migrated; - private UpdateElectionTerm(final long currentTerm, final String votedFor, final boolean migrated) { + public UpdateElectionTerm(final long currentTerm, final String votedFor) { this.currentTerm = currentTerm; this.votedFor = votedFor; - this.migrated = migrated; - } - - public UpdateElectionTerm(final long currentTerm, final String votedFor) { - this(currentTerm, votedFor, false); } public long getCurrentTerm() { @@ -73,24 +32,14 @@ public class UpdateElectionTerm implements Serializable, MigratedSerializable { return votedFor; } - @Override - public boolean isMigrated() { - return migrated; - } - - @Override - public Object writeReplace() { - return new Proxy(this); - } - - @Deprecated - public static UpdateElectionTerm createMigrated(final long currentTerm, final String votedFor) { - return new UpdateElectionTerm(currentTerm, votedFor, true); - } - @Override public String toString() { return "UpdateElectionTerm [currentTerm=" + currentTerm + ", votedFor=" + votedFor + "]"; } + + @java.io.Serial + private Object writeReplace() { + return new UT(this); + } }