Fixup IOMv1

We are missing serialVersionUID, fix that up.

Change-Id: I21b8f7146a52f8c6c004df30acf386086a452d8d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 ac7b00c878c487c7adfe37f48677e7c8a2cdeee4..7982faa39152de948392e8d2b96db55a1a1fa1e0 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/IOMv1.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/IOMv1.java
@@ -22,6 +22,9 @@ import org.eclipse.jdt.annotation.NonNull;
  * Base class for {@link ImmutableOffsetMap} serialization proxies. Implements most of the serialization form at logic.
  */
 abstract sealed class IOMv1<T extends ImmutableOffsetMap<?, ?>> implements Externalizable permits OIOMv1, UIOMv1 {
+    @Serial
+    private static final long serialVersionUID = 1;
+
     private ImmutableOffsetMap<?, ?> map;
 
     IOMv1() {
@@ -53,13 +56,13 @@ abstract sealed class IOMv1<T extends ImmutableOffsetMap<?, ?>> implements Exter
             values[i] = in.readObject();
         }
 
-        map = verifyNotNull(readReplace(keysBuilder.build(), values));
+        map = verifyNotNull(createInstance(keysBuilder.build(), values));
     }
 
+    abstract @NonNull T createInstance(@NonNull ImmutableList<Object> keys, @NonNull Object[] values);
+
     @Serial
-    final Object readReplace() {
+    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 fd50413289161919e4fc5a156066fc5e077f9cac..778a56edbd8a64449693241a82544706f7def519 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/OIOMv1.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/OIOMv1.java
@@ -29,7 +29,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 a2d40a814792d6a7d4c33c7d4eab134fb9309bd5..7798226e05e93c7277bb514b4dcddf2fdc88f502 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/UIOMv1.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/UIOMv1.java
@@ -29,7 +29,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));
     }