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%2FServerConfigurationPayload.java;h=82c049d7cfd54ccae50fa1ad9048c02b550ba8ac;hb=6751227ff9443018d75e3a99da5693230d23d82b;hp=7138b634f4b49307e034d041709b082e154b1997;hpb=97542f208267cb5392fc8c8d9baf6c1d3ee4ae32;p=controller.git diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/ServerConfigurationPayload.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/ServerConfigurationPayload.java index 7138b634f4..82c049d7cf 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/ServerConfigurationPayload.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/ServerConfigurationPayload.java @@ -15,6 +15,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import java.io.ObjectOutputStream; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; import javax.annotation.Nonnull; @@ -28,7 +29,7 @@ import org.slf4j.LoggerFactory; * * @author Thomas Pantelis */ -public final class ServerConfigurationPayload extends Payload implements PersistentPayload, MigratedSerializable { +public final class ServerConfigurationPayload extends Payload implements PersistentPayload, Serializable { private static final class Proxy implements Externalizable { private static final long serialVersionUID = 1L; @@ -77,27 +78,10 @@ public final class ServerConfigurationPayload extends Payload implements Persist + "implements writeReplace to delegate serialization to a Proxy class and thus instances of this class " + "aren't serialized. FindBugs does not recognize this.") private final List serverConfig; - private final boolean migrated; private int serializedSize = -1; - private ServerConfigurationPayload(@Nonnull final List serverConfig, boolean migrated) { - this.serverConfig = ImmutableList.copyOf(serverConfig); - this.migrated = migrated; - } - public ServerConfigurationPayload(@Nonnull final List serverConfig) { - this(serverConfig, false); - } - - @Deprecated - public static ServerConfigurationPayload createMigrated(@Nonnull final List serverConfig) { - return new ServerConfigurationPayload(serverConfig, true); - } - - @Deprecated - @Override - public boolean isMigrated() { - return migrated; + this.serverConfig = ImmutableList.copyOf(serverConfig); } @Nonnull @@ -128,8 +112,7 @@ public final class ServerConfigurationPayload extends Payload implements Persist return "ServerConfigurationPayload [serverConfig=" + serverConfig + "]"; } - @Override - public Object writeReplace() { + private Object writeReplace() { return new Proxy(this); } }