X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fcds-access-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fconcepts%2FMemberName.java;fp=opendaylight%2Fmd-sal%2Fcds-access-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fconcepts%2FMemberName.java;h=daab643f8a6e13647d7e92554718a49e70b14570;hb=cd05b148126134dc5ed4f037f203ff260c1afa1a;hp=47af6b3b1ebd01395aaeb1fd10e0183d29111398;hpb=a8345412733be4e36c37ce6fa508559f99e09593;p=controller.git

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java
index 47af6b3b1e..daab643f8a 100644
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java
@@ -16,10 +16,7 @@ import com.google.common.base.Strings;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.Externalizable;
 import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.nio.charset.StandardCharsets;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.WritableIdentifier;
@@ -28,64 +25,6 @@ import org.opendaylight.yangtools.concepts.WritableIdentifier;
  * Type-safe encapsulation of a cluster member name.
  */
 public final class MemberName implements Comparable<MemberName>, WritableIdentifier {
-    interface SerialForm extends Externalizable {
-        @NonNull MemberName name();
-
-        void setName(@NonNull MemberName name);
-
-        @java.io.Serial
-        Object readResolve();
-
-        @Override
-        default void writeExternal(final ObjectOutput out) throws IOException {
-            final var serialized = name().getSerialized();
-            out.writeInt(serialized.length);
-            out.write(serialized);
-        }
-
-        @Override
-        default void readExternal(final ObjectInput in) throws IOException {
-            final var serialized = new byte[in.readInt()];
-            in.readFully(serialized);
-            // TODO: consider caching instances here
-            setName(new MemberName(new String(serialized, StandardCharsets.UTF_8), serialized));
-        }
-    }
-
-    @Deprecated(since = "7.0.0", forRemoval = true)
-    private static final class Proxy implements SerialForm {
-        @java.io.Serial
-        private static final long serialVersionUID = 1L;
-
-        private MemberName name;
-
-        // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to
-        // be able to create instances via reflection.
-        @SuppressWarnings("checkstyle:RedundantModifier")
-        public Proxy() {
-            // For Externalizable
-        }
-
-        Proxy(final MemberName name) {
-            this.name = requireNonNull(name);
-        }
-
-        @Override
-        public MemberName name() {
-            return verifyNotNull(name);
-        }
-
-        @Override
-        public void setName(final MemberName name) {
-            this.name = requireNonNull(name);
-        }
-
-        @Override
-        public Object readResolve() {
-            return name();
-        }
-    }
-
     @java.io.Serial
     private static final long serialVersionUID = 1L;
 
@@ -164,6 +103,6 @@ public final class MemberName implements Comparable<MemberName>, WritableIdentif
 
     @java.io.Serial
     Object writeReplace() {
-        return new MN(this);
+        return new MN(getSerialized());
     }
 }