Fixup IOMv1

[yangtools.git] / common / util / src / main / java / org / opendaylight / yangtools / util / IOMv1.java

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);
 }