summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
1e0ef4c)
We are missing serialVersionUID, fix that up.
Change-Id: I21b8f7146a52f8c6c004df30acf386086a452d8d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
8165d1ca88da1ba03aa13e25aa69326fad7cf1d8)
* Base class for {@link ImmutableOffsetMap} serialization proxies. Implements most of the serialization form at logic.
*/
abstract class IOMv1<T extends ImmutableOffsetMap<?, ?>> implements Externalizable {
* 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() {
private ImmutableOffsetMap<?, ?> map;
IOMv1() {
values[i] = in.readObject();
}
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);
}
return verifyNotNull(map);
}
-
- abstract @NonNull T readReplace(@NonNull ImmutableList<Object> keys, @NonNull Object[] values);
- 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);
}
}
return new Ordered<>(OffsetMapCache.orderedOffsets(keys), values);
}
}
- 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));
}
final var newOffsets = OffsetMapCache.unorderedOffsets(keys);
return new Unordered<>(newOffsets, OffsetMapCache.adjustedArray(newOffsets, keys, values));
}