From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 16 Aug 2022 21:50:36 +0000 (+0200)
Subject: Fixup IOMv1
X-Git-Tag: v8.0.7~3
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=38552833a69bd3e679e2202c59a2d51ad430e546;hp=1e0ef4c38ec9cc0c555832b6bfc088be5cc49781;p=yangtools.git

Fixup IOMv1

We are missing serialVersionUID, fix that up.

Change-Id: I21b8f7146a52f8c6c004df30acf386086a452d8d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 8165d1ca88da1ba03aa13e25aa69326fad7cf1d8)
---

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/IOMv1.java b/common/util/src/main/java/org/opendaylight/yangtools/util/IOMv1.java
index 95e9344f60..e27c767b50 100644
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/IOMv1.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/IOMv1.java
@@ -21,6 +21,8 @@ import org.eclipse.jdt.annotation.NonNull;
  * Base class for {@link ImmutableOffsetMap} serialization proxies. Implements most of the serialization form at logic.
  */
 abstract class IOMv1<T extends ImmutableOffsetMap<?, ?>> implements Externalizable {
+    private static final long serialVersionUID = 1;
+
     private ImmutableOffsetMap<?, ?> map;
 
     IOMv1() {
@@ -52,12 +54,12 @@ abstract class IOMv1<T extends ImmutableOffsetMap<?, ?>> implements Externalizab
             values[i] = in.readObject();
         }
 
-        map = verifyNotNull(readReplace(keysBuilder.build(), values));
+        map = verifyNotNull(createInstance(keysBuilder.build(), values));
     }
 
-    final Object readReplace() {
+    abstract @NonNull T createInstance(@NonNull ImmutableList<Object> keys, @NonNull Object[] values);
+
+    final Object readResolve() {
         return verifyNotNull(map);
     }
-
-    abstract @NonNull T readReplace(@NonNull ImmutableList<Object> keys, @NonNull Object[] values);
 }
diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/OIOMv1.java b/common/util/src/main/java/org/opendaylight/yangtools/util/OIOMv1.java
index 8c776ee1d9..fb1a55f24f 100644
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/OIOMv1.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/OIOMv1.java
@@ -27,7 +27,7 @@ final class OIOMv1 extends IOMv1<Ordered<?, ?>> {
     }
 
     @Override
-    Ordered<?, ?> readReplace(final ImmutableList<Object> keys, final Object[] values) {
+    Ordered<?, ?> createInstance(final ImmutableList<Object> keys, final Object[] values) {
         return new Ordered<>(OffsetMapCache.orderedOffsets(keys), values);
     }
 }
diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/UIOMv1.java b/common/util/src/main/java/org/opendaylight/yangtools/util/UIOMv1.java
index e38b176bb5..a3c114350f 100644
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/UIOMv1.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/UIOMv1.java
@@ -27,7 +27,7 @@ final class UIOMv1 extends IOMv1<Unordered<?, ?>> {
     }
 
     @Override
-    Unordered<?, ?> readReplace(final ImmutableList<Object> keys, final Object[] values) {
+    Unordered<?, ?> createInstance(final ImmutableList<Object> keys, final Object[] values) {
         final var newOffsets = OffsetMapCache.unorderedOffsets(keys);
         return new Unordered<>(newOffsets, OffsetMapCache.adjustedArray(newOffsets, keys, values));
     }