Update to newer Core, Bytes & Wire dependency versions; make all enum marshallers ordinary classes with static INSTANCE fields, because of difficulties with Wire serialization of enums

This commit is contained in:
leventov
2016-06-24 17:49:34 +07:00
parent fc6e2af7e4
commit 4cffff652f
23 changed files with 138 additions and 55 deletions
@@ -32,9 +32,11 @@ import java.util.zip.InflaterInputStream;
/**
* Created by peter on 24/10/14.
*/
public enum DeflatorStringMarshaller implements BytesReader<CharSequence>,
public final class DeflatorStringMarshaller implements BytesReader<CharSequence>,
BytesWriter<CharSequence>, EnumMarshallable<DeflatorStringMarshaller> {
INSTANCE;
public static final DeflatorStringMarshaller INSTANCE = new DeflatorStringMarshaller();
private DeflatorStringMarshaller() {}
private static final StringFactory STRING_FACTORY = getStringFactory();
@@ -54,9 +54,12 @@ public class Issue43Test {
}
}
private enum ArrayMarshaller implements BytesReader<ValueWrapper>, BytesWriter<ValueWrapper>,
private static final class ArrayMarshaller
implements BytesReader<ValueWrapper>, BytesWriter<ValueWrapper>,
EnumMarshallable<ArrayMarshaller> {
INSTANCE;
public static final ArrayMarshaller INSTANCE = new ArrayMarshaller();
private ArrayMarshaller() {}
@Override
public void write(Bytes bytes, @NotNull ValueWrapper vw) {
@@ -129,9 +129,11 @@ public class Issue58 {
}
enum UuidMarshaller
static final class UuidMarshaller
implements BytesReader<UUID>, BytesWriter<UUID>, EnumMarshallable<UuidMarshaller> {
INSTANCE;
public static final UuidMarshaller INSTANCE = new UuidMarshaller();
private UuidMarshaller() {}
@Override
public void write(Bytes bytes, @NotNull UUID uuid) {
@@ -53,8 +53,11 @@ public class PointListSerializationTest {
}
}
enum AMarshaller implements BytesReader<A>, BytesWriter<A>, EnumMarshallable<AMarshaller> {
INSTANCE;
static final class AMarshaller implements BytesReader<A>, BytesWriter<A>,
EnumMarshallable<AMarshaller> {
public static final AMarshaller INSTANCE = new AMarshaller();
private AMarshaller() {}
@Override
public void write(Bytes out, @NotNull A toWrite) {
@@ -28,11 +28,13 @@ import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
public enum CharSequenceArrayBytesMarshaller
public final class CharSequenceArrayBytesMarshaller
implements BytesWriter<CharSequence[]>, BytesReader<CharSequence[]>,
ReadResolvable<CharSequenceArrayBytesMarshaller> {
INSTANCE;
static final CharSequenceArrayBytesMarshaller INSTANCE = new CharSequenceArrayBytesMarshaller();
private CharSequenceArrayBytesMarshaller() {}
@Override
public void write(Bytes out, @NotNull CharSequence[] toWrite) {
@@ -28,11 +28,13 @@ import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
public enum PointListSizedMarshaller
public final class PointListSizedMarshaller
implements SizedReader<List<Point>>, SizedWriter<List<Point>>,
ReadResolvable<PointListSizedMarshaller> {
INSTANCE;
static final PointListSizedMarshaller INSTANCE = new PointListSizedMarshaller();
private PointListSizedMarshaller() {}
/** A point takes 16 bytes in serialized form: 8 bytes for both x and y value */
private static final long ELEMENT_SIZE = 16;