Remove legacy raft.persisted proxies

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / main / java / org / opendaylight / controller / cluster / raft / persisted / NoopPayload.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/NoopPayload.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/NoopPayload.java
index f1a3a3b923cab4bd370511316663ce74e20d402e..0f076c55d755a3286433d388aad2e33faeef1fdb 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/NoopPayload.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/NoopPayload.java
@@ -8,7 +8,6 @@
 package org.opendaylight.controller.cluster.raft.persisted;
 
 import akka.dispatch.ControlMessage;
-import java.io.Serializable;
 import org.apache.commons.lang3.SerializationUtils;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.cluster.raft.messages.Payload;
@@ -19,33 +18,17 @@ import org.opendaylight.controller.cluster.raft.messages.Payload;
  *
  * @author Thomas Pantelis
  */
-// FIXME: do not implement MigratedSerializable once Proxy is gone
-public final class NoopPayload extends Payload implements ControlMessage, MigratedSerializable {
-    // There is no need for Externalizable
-    @Deprecated(since = "7.0.0", forRemoval = true)
-    private static final class Proxy implements Serializable {
-        @java.io.Serial
-        private static final long serialVersionUID = 1L;
-        private static final @NonNull NoopPayload INSTANCE = new NoopPayload(true);
-
-        @java.io.Serial
-        private Object readResolve() {
-            return INSTANCE;
-        }
-    }
-
+public final class NoopPayload extends Payload implements ControlMessage {
     @java.io.Serial
     private static final long serialVersionUID = 1L;
     private static final @NonNull NP PROXY = new NP();
     // 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(PROXY).length;
 
-    public static final @NonNull NoopPayload INSTANCE = new NoopPayload(false);
-
-    private final boolean migrated;
+    public static final @NonNull NoopPayload INSTANCE = new NoopPayload();
 
-    private NoopPayload(final boolean migrated) {
-        this.migrated = migrated;
+    private NoopPayload() {
+        // Hidden on purpose
     }
 
     @Override
@@ -59,13 +42,7 @@ public final class NoopPayload extends Payload implements ControlMessage, Migrat
     }
 
     @Override
-    public boolean isMigrated() {
-        return migrated;
-    }
-
-    // FIXME: protected once not MigratedSerializable
-    @Override
-    public Object writeReplace() {
+    protected Object writeReplace() {
         return PROXY;
     }
 }