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 95e9344f60cb376199b8899a77a4bde2d2c2004a..e27c767b5018d625c2056daa96087a12ef7be11d 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
@@ -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 8c776ee1d99a4ad46677bc13268873ccc13ecfbd..fb1a55f24f84aba8da976eebcc19f80b96f06041 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
@@ -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 e38b176bb520924e224925d1053573ad67b96ba8..a3c114350f66b3a0fc0d7aced180bb236597453a 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
@@ -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));
     }