X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fconcepts%2FLocalHistoryIdentifier.java;h=ddeb2936151b9b8b7f42affa9648a2e53d6a0cb4;hb=HEAD;hp=0e70edc76fb10d7c63e34f032722c4b5afbb2dfb;hpb=d92bd0e575983b3d6a09a73089ef8f9c62f94eaa;p=controller.git

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java
index 0e70edc76f..ddeb293615 100644
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java
@@ -7,16 +7,12 @@
  */
 package org.opendaylight.controller.cluster.access.concepts;
 
-import static com.google.common.base.Verify.verifyNotNull;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.MoreObjects;
 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 org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.WritableIdentifier;
 import org.opendaylight.yangtools.concepts.WritableObjects;
@@ -28,75 +24,6 @@ import org.opendaylight.yangtools.concepts.WritableObjects;
  * - an unsigned long cookie, assigned by the client and meaningless on the backend, which just reflects it back
  */
 public final class LocalHistoryIdentifier implements WritableIdentifier {
-    /**
-     * Serialized form of {@link LocalHistoryIdentifier}.
-     *
-     * @implNote
-     *     cookie is currently required only for module-based sharding, which is implemented as part of normal
-     *     DataBroker interfaces. For DOMDataTreeProducer cookie will always be zero, hence we may end up not needing
-     *     cookie at all.
-     *     We use WritableObjects.writeLongs() to output historyId and cookie (in that order). If we end up not needing
-     *     the cookie at all, we can switch to writeLong() and use zero flags for compatibility.
-     */
-    interface SerialForm extends Externalizable {
-        @NonNull LocalHistoryIdentifier identifier();
-
-        void setIdentifier(@NonNull LocalHistoryIdentifier identifier);
-
-        @java.io.Serial
-        Object readResolve();
-
-        @Override
-        default void writeExternal(final ObjectOutput out) throws IOException {
-            final var id = identifier();
-            id.getClientId().writeTo(out);
-            WritableObjects.writeLongs(out, id.getHistoryId(), id.getCookie());
-        }
-
-        @Override
-        default void readExternal(final ObjectInput in) throws IOException {
-            final var clientId = ClientIdentifier.readFrom(in);
-
-            final byte header = WritableObjects.readLongHeader(in);
-            final var historyId = WritableObjects.readFirstLong(in, header);
-            final var cookie = WritableObjects.readSecondLong(in, header);
-            setIdentifier(new LocalHistoryIdentifier(clientId, historyId, cookie));
-        }
-    }
-
-    private static final class Proxy implements SerialForm {
-        @java.io.Serial
-        private static final long serialVersionUID = 1L;
-
-        private LocalHistoryIdentifier identifier;
-
-        // 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 LocalHistoryIdentifier identifier) {
-            this.identifier = requireNonNull(identifier);
-        }
-
-        @Override
-        public LocalHistoryIdentifier identifier() {
-            return verifyNotNull(identifier);
-        }
-
-        @Override
-        public void setIdentifier(final LocalHistoryIdentifier identifier) {
-            this.identifier = requireNonNull(identifier);
-        }
-
-        @Override
-        public Object readResolve() {
-            return identifier();
-        }
-    }
-
     @java.io.Serial
     private static final long serialVersionUID = 1L;
 
@@ -169,6 +96,6 @@ public final class LocalHistoryIdentifier implements WritableIdentifier {
 
     @java.io.Serial
     private Object writeReplace() {
-        return new Proxy(this);
+        return new HI(this);
     }
 }