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%2FSimpleReplicatedLogEntry.java;h=56c3f769ff18306f746496c48f387409697ecf10;hb=8874f15140aa20aa205b5469e02f319076d53860;hp=56a81f57f366bfc75874fc53e2d360019c994ecc;hpb=9a091425d16dadf09a5be4e764785707f5253013;p=controller.git diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/SimpleReplicatedLogEntry.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/SimpleReplicatedLogEntry.java index 56a81f57f3..56c3f769ff 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/SimpleReplicatedLogEntry.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/SimpleReplicatedLogEntry.java @@ -24,7 +24,9 @@ import org.opendaylight.controller.cluster.raft.messages.Payload; * @author Thomas Pantelis */ public final class SimpleReplicatedLogEntry implements ReplicatedLogEntry, Serializable { + @Deprecated(since = "7.0.0", forRemoval = true) private static final class Proxy implements Externalizable { + @java.io.Serial private static final long serialVersionUID = 1L; private long index; @@ -58,14 +60,16 @@ public final class SimpleReplicatedLogEntry implements ReplicatedLogEntry, Seria data = (Payload) in.readObject(); } + @java.io.Serial private Object readResolve() { return new SimpleReplicatedLogEntry(index, term, data); } } + @java.io.Serial private static final long serialVersionUID = 1L; - // Estimate to how big the proxy is. Note this includes object stream overhead, so it is a bit conservative - private static final int PROXY_SIZE = SerializationUtils.serialize(new Proxy()).length; + // Estimate to how big the proxy is. Note this includes object stream overhead, so it is a bit conservative. + private static final int PROXY_SIZE = SerializationUtils.serialize(new LE((Void) null)).length; private final long index; private final long term; @@ -121,7 +125,7 @@ public final class SimpleReplicatedLogEntry implements ReplicatedLogEntry, Seria } private Object writeReplace() { - return new Proxy(this); + return new LE(this); } @Override @@ -139,12 +143,11 @@ public final class SimpleReplicatedLogEntry implements ReplicatedLogEntry, Seria if (this == obj) { return true; } - if (obj == null || getClass() != obj.getClass()) { return false; } - SimpleReplicatedLogEntry other = (SimpleReplicatedLogEntry) obj; + var other = (SimpleReplicatedLogEntry) obj; return index == other.index && term == other.term && payload.equals(other.payload); }