diff --git a/pom.xml b/pom.xml
index 16c805b..c9a26a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,9 +10,6 @@
0.9.${revision}
maven-plugin
- 16
- 16
- UTF-8
0-SNAPSHOT
@@ -70,6 +67,15 @@
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.1
+
+ 16
+ UTF-8
+
+
@@ -77,50 +83,41 @@
commons-io
commons-io
- 2.8.0
org.yaml
snakeyaml
- 1.28
com.squareup
javapoet
- 1.14.0-records
org.jetbrains
annotations
- 20.1.0
it.unimi.dsi
fastutil
- 8.5.4
org.apache.maven
maven-core
- 3.8.1
provided
org.apache.maven
maven-plugin-api
- 3.8.1
provided
org.apache.maven.plugin-tools
maven-plugin-annotations
- 3.6.1
provided
org.apache.maven
maven-project
- 2.2.1
junit
@@ -131,27 +128,22 @@
io.soabase.record-builder
record-builder-core
- 1.19
org.slf4j
slf4j-api
- 1.7.30
org.apache.logging.log4j
log4j-core
- 2.14.1
org.apache.logging.log4j
log4j-slf4j-impl
- 2.14.1
org.junit.jupiter
junit-jupiter-api
- 5.8.0-M1
test
@@ -160,5 +152,100 @@
+
+ it.cavallium
+ data-generator-runtime
+
+
+
+
+ commons-io
+ commons-io
+ 2.8.0
+
+
+ org.yaml
+ snakeyaml
+ 1.28
+
+
+ com.squareup
+ javapoet
+ 1.14.0-records
+
+
+ org.jetbrains
+ annotations
+ 20.1.0
+
+
+ it.unimi.dsi
+ fastutil
+ 8.5.4
+
+
+ org.apache.maven
+ maven-core
+ 3.8.1
+
+
+ org.apache.maven
+ maven-plugin-api
+ 3.8.1
+
+
+ org.apache.maven.plugin-tools
+ maven-plugin-annotations
+ 3.6.1
+
+
+ org.apache.maven
+ maven-project
+ 2.2.1
+
+
+ junit
+ junit
+
+
+
+
+ io.soabase.record-builder
+ record-builder-core
+ 1.19
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.30
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.14.1
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ 2.14.1
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ 5.8.0-M1
+
+
+ org.hamcrest
+ hamcrest-core
+
+
+
+
+ it.cavallium
+ data-generator-runtime
+ [1.0.1,)
+
+
+
\ No newline at end of file
diff --git a/src/main/java/it/cavallium/data/generator/CommonField.java b/src/main/java/it/cavallium/data/generator/CommonField.java
deleted file mode 100644
index 9b6b1fa..0000000
--- a/src/main/java/it/cavallium/data/generator/CommonField.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package it.cavallium.data.generator;
-
-public class CommonField {
- public final String fieldName;
- public final String fieldType;
- public final boolean hasSetter;
-
- public CommonField(String fieldName, String fieldType, boolean hasSetter) {
- this.fieldName = fieldName;
- this.fieldType = fieldType;
- this.hasSetter = hasSetter;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/DataInitializer.java b/src/main/java/it/cavallium/data/generator/DataInitializer.java
deleted file mode 100644
index 493853d..0000000
--- a/src/main/java/it/cavallium/data/generator/DataInitializer.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package it.cavallium.data.generator;
-
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public interface DataInitializer {
-
- @NotNull T initialize() throws IOException;
-}
diff --git a/src/main/java/it/cavallium/data/generator/DataInput3.java b/src/main/java/it/cavallium/data/generator/DataInput3.java
deleted file mode 100644
index b7672d4..0000000
--- a/src/main/java/it/cavallium/data/generator/DataInput3.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package it.cavallium.data.generator;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-
-public class DataInput3 extends DataInputStream {
-
- private final byte[] buffer;
-
- /**
- * Creates a DataInputStream that uses the specified underlying InputStream.
- *
- * @param in the specified input stream
- */
- public DataInput3(byte[] in) {
- super(new ByteArrayInputStream(in));
- this.buffer = in;
- }
-
- public byte[] asBytes() {
- return buffer;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/DataSerializer.java b/src/main/java/it/cavallium/data/generator/DataSerializer.java
deleted file mode 100644
index 7ed43e0..0000000
--- a/src/main/java/it/cavallium/data/generator/DataSerializer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package it.cavallium.data.generator;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public interface DataSerializer {
-
- void serialize(DataOutput dataOutput, @NotNull T data) throws IOException;
-
- @NotNull T deserialize(DataInput dataInput) throws IOException;
-}
diff --git a/src/main/java/it/cavallium/data/generator/DataUpgrader.java b/src/main/java/it/cavallium/data/generator/DataUpgrader.java
deleted file mode 100644
index d6e3f61..0000000
--- a/src/main/java/it/cavallium/data/generator/DataUpgrader.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package it.cavallium.data.generator;
-
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public interface DataUpgrader {
-
- @NotNull U upgrade(@NotNull T data) throws IOException;
-}
diff --git a/src/main/java/it/cavallium/data/generator/Nullable.java b/src/main/java/it/cavallium/data/generator/Nullable.java
deleted file mode 100644
index e153dd6..0000000
--- a/src/main/java/it/cavallium/data/generator/Nullable.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package it.cavallium.data.generator;
-
-public class Nullable {
-
- private static final long serialVersionUID = 1L;
-
- private final T value;
-
- public Nullable(T value) {
- this.value = value;
- }
-
- public static Nullable of(T value) {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return new Nullable<>(value);
- }
- }
-
- public static Nullable ofNullable(T value) {
- return new Nullable<>(value);
- }
-
- public static Nullable empty() {
- return new Nullable<>(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- @org.jetbrains.annotations.NotNull
- public T get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- @org.jetbrains.annotations.Nullable
- public T getNullable() {
- return value;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/ArrayInt52Serializer.java b/src/main/java/it/cavallium/data/generator/nativedata/ArrayInt52Serializer.java
deleted file mode 100644
index 65276a9..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/ArrayInt52Serializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.List;
-import org.jetbrains.annotations.NotNull;
-
-public class ArrayInt52Serializer implements DataSerializer< List> {
-
- @Override
- public void serialize(DataOutput dataOutput, List data) throws IOException {
- dataOutput.writeInt(data.size());
- for (int i = 0; i < data.size(); i++) {
- Int52Serializer.INSTANCE.serialize(dataOutput, data.get(i));
- }
- }
-
- @NotNull
- @Override
- public List deserialize(DataInput dataInput) throws IOException {
- var data = new Int52[dataInput.readInt()];
- for (int i = 0; i < data.length; i++) {
- data[i] = Int52Serializer.INSTANCE.deserialize(dataInput);
- }
- return List.of(data);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/ArrayStringSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/ArrayStringSerializer.java
deleted file mode 100644
index d4aa6a1..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/ArrayStringSerializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.List;
-import org.jetbrains.annotations.NotNull;
-
-public class ArrayStringSerializer implements DataSerializer> {
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull List data) throws IOException {
- dataOutput.writeInt(data.size());
- for (int i = 0; i < data.size(); i++) {
- dataOutput.writeUTF(data.get(i));
- }
- }
-
- @NotNull
- @Override
- public List deserialize(DataInput dataInput) throws IOException {
- var data = new String[dataInput.readInt()];
- for (int i = 0; i < data.length; i++) {
- data[i] = dataInput.readUTF();
- }
- return List.of(data);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/ArraybooleanSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/ArraybooleanSerializer.java
deleted file mode 100644
index e80357c..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/ArraybooleanSerializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import it.unimi.dsi.fastutil.booleans.BooleanList;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class ArraybooleanSerializer implements DataSerializer {
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull BooleanList data) throws IOException {
- dataOutput.writeInt(data.size());
- for (int i = 0; i < data.size(); i++) {
- dataOutput.writeBoolean(data.getBoolean(i));
- }
- }
-
- @NotNull
- @Override
- public BooleanList deserialize(DataInput dataInput) throws IOException {
- var data = new boolean[dataInput.readInt()];
- for (int i = 0; i < data.length; i++) {
- data[i] = dataInput.readBoolean();
- }
- return BooleanList.of(data);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/ArraybyteSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/ArraybyteSerializer.java
deleted file mode 100644
index f5bff1e..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/ArraybyteSerializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import it.unimi.dsi.fastutil.bytes.ByteList;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class ArraybyteSerializer implements DataSerializer {
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull ByteList data) throws IOException {
- dataOutput.writeInt(data.size());
- for (int i = 0; i < data.size(); i++) {
- dataOutput.writeByte(data.getByte(i));
- }
- }
-
- @NotNull
- @Override
- public ByteList deserialize(DataInput dataInput) throws IOException {
- var data = new byte[dataInput.readInt()];
- for (int i = 0; i < data.length; i++) {
- data[i] = dataInput.readByte();
- }
- return ByteList.of(data);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/ArraycharSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/ArraycharSerializer.java
deleted file mode 100644
index e1b37e2..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/ArraycharSerializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import it.unimi.dsi.fastutil.chars.CharList;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class ArraycharSerializer implements DataSerializer {
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull CharList data) throws IOException {
- dataOutput.writeInt(data.size());
- for (int i = 0; i < data.size(); i++) {
- dataOutput.writeChar(data.getChar(i));
- }
- }
-
- @NotNull
- @Override
- public CharList deserialize(DataInput dataInput) throws IOException {
- var data = new char[dataInput.readInt()];
- for (int i = 0; i < data.length; i++) {
- data[i] = dataInput.readChar();
- }
- return CharList.of(data);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/ArraydoubleSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/ArraydoubleSerializer.java
deleted file mode 100644
index 8c99145..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/ArraydoubleSerializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import it.unimi.dsi.fastutil.doubles.DoubleList;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class ArraydoubleSerializer implements DataSerializer {
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull DoubleList data) throws IOException {
- dataOutput.writeInt(data.size());
- for (int i = 0; i < data.size(); i++) {
- dataOutput.writeDouble(data.getDouble(i));
- }
- }
-
- @NotNull
- @Override
- public DoubleList deserialize(DataInput dataInput) throws IOException {
- var data = new double[dataInput.readInt()];
- for (int i = 0; i < data.length; i++) {
- data[i] = dataInput.readDouble();
- }
- return DoubleList.of(data);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/ArrayfloatSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/ArrayfloatSerializer.java
deleted file mode 100644
index 712f6ba..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/ArrayfloatSerializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import it.unimi.dsi.fastutil.floats.FloatList;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class ArrayfloatSerializer implements DataSerializer {
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull FloatList data) throws IOException {
- dataOutput.writeInt(data.size());
- for (int i = 0; i < data.size(); i++) {
- dataOutput.writeFloat(data.getFloat(i));
- }
- }
-
- @NotNull
- @Override
- public FloatList deserialize(DataInput dataInput) throws IOException {
- var data = new float[dataInput.readInt()];
- for (int i = 0; i < data.length; i++) {
- data[i] = dataInput.readFloat();
- }
- return FloatList.of(data);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/ArrayintSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/ArrayintSerializer.java
deleted file mode 100644
index fdf3739..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/ArrayintSerializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import it.unimi.dsi.fastutil.ints.IntList;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class ArrayintSerializer implements DataSerializer {
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull IntList data) throws IOException {
- dataOutput.writeInt(data.size());
- for (int i = 0; i < data.size(); i++) {
- dataOutput.writeInt(data.getInt(i));
- }
- }
-
- @NotNull
- @Override
- public IntList deserialize(DataInput dataInput) throws IOException {
- var data = new int[dataInput.readInt()];
- for (int i = 0; i < data.length; i++) {
- data[i] = dataInput.readInt();
- }
- return IntList.of(data);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/ArraylongSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/ArraylongSerializer.java
deleted file mode 100644
index 1b93e28..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/ArraylongSerializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import it.unimi.dsi.fastutil.longs.LongList;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class ArraylongSerializer implements DataSerializer {
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull LongList data) throws IOException {
- dataOutput.writeInt(data.size());
- for (int i = 0; i < data.size(); i++) {
- dataOutput.writeLong(data.getLong(i));
- }
- }
-
- @NotNull
- @Override
- public LongList deserialize(DataInput dataInput) throws IOException {
- var data = new long[dataInput.readInt()];
- for (int i = 0; i < data.length; i++) {
- data[i] = dataInput.readLong();
- }
- return LongList.of(data);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/ArrayshortSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/ArrayshortSerializer.java
deleted file mode 100644
index a1e43b2..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/ArrayshortSerializer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import it.unimi.dsi.fastutil.shorts.ShortList;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class ArrayshortSerializer implements DataSerializer {
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull ShortList data) throws IOException {
- dataOutput.writeInt(data.size());
- for (int i = 0; i < data.size(); i++) {
- dataOutput.writeShort(data.getShort(i));
- }
- }
-
- @NotNull
- @Override
- public ShortList deserialize(DataInput dataInput) throws IOException {
- var data = new short[dataInput.readInt()];
- for (int i = 0; i < data.length; i++) {
- data[i] = dataInput.readShort();
- }
- return ShortList.of(data);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/IGenericNullable.java b/src/main/java/it/cavallium/data/generator/nativedata/IGenericNullable.java
deleted file mode 100644
index e36a670..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/IGenericNullable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-public interface IGenericNullable {
- Object $getNullable();
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/Int52.java b/src/main/java/it/cavallium/data/generator/nativedata/Int52.java
deleted file mode 100644
index 6ef1205..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/Int52.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.lang.annotation.Native;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-
-public class Int52 extends Number implements Comparable {
-
- /**
- * The number of bits used to represent a {@code Int52} value in two's
- * complement binary form.
- */
- @Native
- public static final int SIZE = 52;
-
- /**
- * The number of bytes used to represent a {@code Int52} value in two's
- * complement binary form.
- */
- public static final int BYTES = 7;
-
- public static final Int52 ZERO = new Int52(0);
-
- private final long value;
-
- private Int52(long value) {
- this.value = value;
- }
-
- public static Int52 fromLong(long value) {
- if (value < 0) {
- throw new IllegalArgumentException("Only positive values are supported");
- }
- if (value > 0x0F_FF_FF_FF_FF_FF_FFL) {
- throw new IllegalArgumentException("Only values below or equal to " + 0xFFFFFFFFFFFFFL + " are supported");
- }
- return new Int52(value);
- }
-
- long getValue() {
- return value;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- Int52 int52 = (Int52) o;
- return value == int52.value;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- return Long.toString(value);
- }
-
- @Override
- public int intValue() {
- return (int) value;
- }
-
- @Override
- public long longValue() {
- return value;
- }
-
- @Override
- public float floatValue() {
- return (float) value;
- }
-
- @Override
- public double doubleValue() {
- return (double) value;
- }
-
- @Override
- public int compareTo(@NotNull Int52 o) {
- return Long.compareUnsigned(this.value, o.value);
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/Int52Serializer.java b/src/main/java/it/cavallium/data/generator/nativedata/Int52Serializer.java
deleted file mode 100644
index efa0260..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/Int52Serializer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class Int52Serializer implements DataSerializer {
-
- public static final Int52Serializer INSTANCE = new Int52Serializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull Int52 data) throws IOException {
- serializeValue(dataOutput, data);
- }
-
- @NotNull
- @Override
- public Int52 deserialize(DataInput dataInput) throws IOException {
- return deserializeValue(dataInput);
- }
-
- public static void serializeValue(DataOutput dataOutput, @NotNull Int52 data) throws IOException {
- long value = data.getValue();
-
- for(int i = 0; i < 7; i++) {
- dataOutput.writeByte(((int)((value >> (6 - i) * 8) & (i == 0 ? 0b00001111L : 255L))));
- }
- }
-
- public static Int52 deserializeValue(DataInput dataInput) throws IOException {
- long value = 0;
-
- return Int52.fromLong(
- ((long) dataInput.readUnsignedByte() & 0b00001111) << 48
- | ((long) dataInput.readUnsignedByte()) << 40
- | ((long) dataInput.readUnsignedByte() << 32)
- | ((long) dataInput.readUnsignedByte() << 24)
- | ((long) dataInput.readUnsignedByte()) << 16
- | ((long) dataInput.readUnsignedByte()) << 8
- | ((long) dataInput.readUnsignedByte())
- );
- }
-
- public static byte[] toByteArray(long value) {
- byte[] result = new byte[7];
-
- for(int i = 6; i >= 0; --i) {
- result[i] = (byte)((int)(value & (i == 0 ? 0b00001111L : 255L)));
- value >>= 8;
- }
-
- return result;
- }
-
- public static long fromByteArray(byte[] bytes) {
- if (bytes.length != 7) {
- throw new IllegalArgumentException("Size must be 7, got " + bytes.length + " instead");
- }
- return fromBytes((byte) (bytes[0] & 0b00001111), bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6]);
- }
-
- public static long fromBytes(byte b1, byte b2, byte b3, byte b4, byte b5, byte b6, byte b7) {
- return ((long)b1 & 0b00001111) << 48 | ((long)b2 & 255L) << 40 | ((long)b3 & 255L) << 32 | ((long)b4 & 255L) << 24 | ((long)b5 & 255L) << 16 | ((long)b6 & 255L) << 8 | (long)b7 & 255L;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52.java b/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52.java
deleted file mode 100644
index d38e1d4..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class NullableInt52 implements Serializable, IGenericNullable {
-
- private static final long serialVersionUID = 1L;
-
- private final Int52 value;
-
- public NullableInt52(Int52 value) {
- this.value = value;
- }
-
- public static NullableInt52 of(@NotNull Int52 value) {
- return new NullableInt52(value);
- }
-
- public static NullableInt52 ofNullable(@Nullable Int52 value) {
- return new NullableInt52(value);
- }
-
- public static NullableInt52 empty() {
- return new NullableInt52(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- @NotNull
- public Int52 get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- public Int52 orElse(Int52 defaultValue) {
- if (value == null) {
- return defaultValue;
- } else {
- return value;
- }
- }
-
- @Override
- public Object $getNullable() {
- return this.getNullable();
- }
-
- @Nullable
- public Int52 getNullable() {
- return value;
- }
-
- @Nullable
- public Int52 getNullable(Int52 defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- @NotNull
- @Override
- public NullableInt52 clone() {
- if (value != null) {
- return NullableInt52.of(value);
- } else {
- return NullableInt52.empty();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- var that = (NullableInt52) o;
- return Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- if (value == null) return "null";
- return "" + value;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52Serializer.java b/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52Serializer.java
deleted file mode 100644
index dcb22eb..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52Serializer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class NullableInt52Serializer implements DataSerializer {
-
- public static final NullableInt52Serializer INSTANCE = new NullableInt52Serializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull NullableInt52 data) throws IOException {
- // 0b10000000 = empty, 0b00000000 = with value
- if (data.isEmpty()) {
- dataOutput.writeByte(0b10000000);
- } else {
- dataOutput.write(Int52Serializer.toByteArray(data.get().getValue()));
- }
- }
-
- @NotNull
- @Override
- public NullableInt52 deserialize(DataInput dataInput) throws IOException {
- // 0b10000000 = empty, 0b00000000 = with value
- byte firstByteAndIsPresent = dataInput.readByte();
- if ((firstByteAndIsPresent & 0b10000000) != 0) {
- return NullableInt52.empty();
- } else {
- byte[] secondPart = new byte[7];
- secondPart[0] = (byte) (firstByteAndIsPresent & 0b00001111);
- dataInput.readFully(secondPart, 1, secondPart.length - 1);
- return NullableInt52.of(Int52.fromLong(Int52Serializer.fromByteArray(secondPart)));
- }
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullableString.java b/src/main/java/it/cavallium/data/generator/nativedata/NullableString.java
deleted file mode 100644
index 9233429..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullableString.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class NullableString implements Serializable, IGenericNullable {
-
- private static final long serialVersionUID = 1L;
-
- private final String value;
-
- public NullableString(String value) {
- this.value = value;
- }
-
- public static NullableString of(@NotNull String value) {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return new NullableString(value);
- }
- }
-
- public static NullableString ofNullable(@Nullable String value) {
- return new NullableString(value);
- }
-
- public static NullableString ofNullableBlank(@Nullable String value) {
- if (value == null || value.isBlank()) {
- return empty();
- }
- return new NullableString(value);
- }
-
- public static NullableString empty() {
- return new NullableString(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- public boolean isContentful() {
- return value != null && !value.isBlank();
- }
-
- @NotNull
- public String get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- public String orElse(String defaultValue) {
- if (value == null) {
- return defaultValue;
- } else {
- return value;
- }
- }
-
- @Override
- public String $getNullable() {
- return this.getNullable();
- }
-
- @Nullable
- public String getNullable() {
- return value;
- }
-
- @NotNull
- public String getNullable(String defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- @NotNull
- @Override
- public NullableString clone() {
- if (value != null) {
- return NullableString.of(value);
- } else {
- return NullableString.empty();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- var that = (NullableString) o;
- return Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- if (value == null) return "null";
- return "" + value;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullableStringSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/NullableStringSerializer.java
deleted file mode 100644
index 6bcc6cd..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullableStringSerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class NullableStringSerializer implements DataSerializer {
-
- public static final NullableStringSerializer INSTANCE = new NullableStringSerializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull NullableString data) throws IOException {
- if (data.isEmpty()) {
- dataOutput.writeBoolean(false);
- } else {
- dataOutput.writeBoolean(true);
- String dataContent = data.get();
- dataOutput.writeUTF(dataContent);
- }
- }
-
- @NotNull
- @Override
- public NullableString deserialize(DataInput dataInput) throws IOException {
- var isPresent = dataInput.readBoolean();
- if (!isPresent) {
- return NullableString.empty();
- } else {
- return NullableString.of(dataInput.readUTF());
- }
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/Nullableboolean.java b/src/main/java/it/cavallium/data/generator/nativedata/Nullableboolean.java
deleted file mode 100644
index d7061de..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/Nullableboolean.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class Nullableboolean implements Serializable, IGenericNullable {
-
- private static final long serialVersionUID = 1L;
-
- private final Boolean value;
-
- public Nullableboolean(Boolean value) {
- this.value = value;
- }
-
- public static Nullableboolean of(boolean value) {
- return new Nullableboolean(value);
- }
-
- public static Nullableboolean ofNullable(@Nullable Boolean value) {
- return new Nullableboolean(value);
- }
-
- public static Nullableboolean empty() {
- return new Nullableboolean(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- public boolean get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- public boolean orElse(boolean defaultValue) {
- if (value == null) {
- return defaultValue;
- } else {
- return value;
- }
- }
-
- @Override
- public Boolean $getNullable() {
- return this.getNullable();
- }
-
- @Nullable
- public Boolean getNullable() {
- return value;
- }
-
- public boolean getNullable(boolean defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- @NotNull
- @Override
- public Nullableboolean clone() {
- if (value != null) {
- return Nullableboolean.of(value);
- } else {
- return Nullableboolean.empty();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- Nullableboolean that = (Nullableboolean) o;
- return Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- if (value == null) return "null";
- return "" + value;
- }
-
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullablebooleanSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/NullablebooleanSerializer.java
deleted file mode 100644
index dad1d70..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullablebooleanSerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class NullablebooleanSerializer implements DataSerializer {
-
- public static final NullablebooleanSerializer INSTANCE = new NullablebooleanSerializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull Nullableboolean data) throws IOException {
- if (data.isEmpty()) {
- dataOutput.writeBoolean(false);
- } else {
- dataOutput.writeBoolean(true);
- boolean dataContent = data.get();
- dataOutput.writeBoolean(dataContent);
- }
- }
-
- @NotNull
- @Override
- public Nullableboolean deserialize(DataInput dataInput) throws IOException {
- var isPresent = dataInput.readBoolean();
- if (!isPresent) {
- return Nullableboolean.empty();
- } else {
- return Nullableboolean.of(dataInput.readBoolean());
- }
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/Nullablebyte.java b/src/main/java/it/cavallium/data/generator/nativedata/Nullablebyte.java
deleted file mode 100644
index 1bd0abe..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/Nullablebyte.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class Nullablebyte implements Serializable, IGenericNullable {
-
- private static final long serialVersionUID = 1L;
-
- private final Byte value;
-
- public Nullablebyte(Byte value) {
- this.value = value;
- }
-
- public static Nullablebyte of(byte value) {
- return new Nullablebyte(value);
- }
-
- public static Nullablebyte ofNullable(@Nullable Byte value) {
- return new Nullablebyte(value);
- }
-
- public static Nullablebyte empty() {
- return new Nullablebyte(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- public byte get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- public byte orElse(byte defaultValue) {
- if (value == null) {
- return defaultValue;
- } else {
- return value;
- }
- }
-
- @Override
- public Byte $getNullable() {
- return this.getNullable();
- }
-
- @Nullable
- public Byte getNullable() {
- return value;
- }
-
- public byte getNullable(byte defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- @NotNull
- @Override
- public Nullablebyte clone() {
- if (value != null) {
- return Nullablebyte.of(value);
- } else {
- return Nullablebyte.empty();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- Nullablebyte that = (Nullablebyte) o;
- return Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- if (value == null) return "null";
- return "" + value;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullablebyteSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/NullablebyteSerializer.java
deleted file mode 100644
index 027e5de..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullablebyteSerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class NullablebyteSerializer implements DataSerializer {
-
- public static final NullablebyteSerializer INSTANCE = new NullablebyteSerializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull Nullablebyte data) throws IOException {
- if (data.isEmpty()) {
- dataOutput.writeBoolean(false);
- } else {
- dataOutput.writeBoolean(true);
- byte dataContent = data.get();
- dataOutput.writeByte(dataContent);
- }
- }
-
- @NotNull
- @Override
- public Nullablebyte deserialize(DataInput dataInput) throws IOException {
- var isPresent = dataInput.readBoolean();
- if (!isPresent) {
- return Nullablebyte.empty();
- } else {
- return Nullablebyte.of(dataInput.readByte());
- }
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/Nullablechar.java b/src/main/java/it/cavallium/data/generator/nativedata/Nullablechar.java
deleted file mode 100644
index f7456b6..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/Nullablechar.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class Nullablechar implements Serializable, IGenericNullable {
-
- private static final long serialVersionUID = 1L;
-
- private final Character value;
-
- public Nullablechar(Character value) {
- this.value = value;
- }
-
- public static Nullablechar of(char value) {
- return new Nullablechar(value);
- }
-
- public static Nullablechar ofNullable(@Nullable Character value) {
- return new Nullablechar(value);
- }
-
- public static Nullablechar empty() {
- return new Nullablechar(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- public char get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- public char orElse(char defaultValue) {
- if (value == null) {
- return defaultValue;
- } else {
- return value;
- }
- }
-
- @Override
- public Character $getNullable() {
- return this.getNullable();
- }
-
- @Nullable
- public Character getNullable() {
- return value;
- }
-
- public char getNullable(char defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- @NotNull
- @Override
- public Nullablechar clone() {
- if (value != null) {
- return Nullablechar.of(value);
- } else {
- return Nullablechar.empty();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- var that = (Nullablechar) o;
- return Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- if (value == null) return "null";
- return "" + value;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullablecharSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/NullablecharSerializer.java
deleted file mode 100644
index c9a4d8b..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullablecharSerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class NullablecharSerializer implements DataSerializer {
-
- public static final NullablecharSerializer INSTANCE = new NullablecharSerializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull Nullablechar data) throws IOException {
- if (data.isEmpty()) {
- dataOutput.writeBoolean(false);
- } else {
- dataOutput.writeBoolean(true);
- char dataContent = data.get();
- dataOutput.writeChar(dataContent);
- }
- }
-
- @NotNull
- @Override
- public Nullablechar deserialize(DataInput dataInput) throws IOException {
- var isPresent = dataInput.readBoolean();
- if (!isPresent) {
- return Nullablechar.empty();
- } else {
- return Nullablechar.of(dataInput.readChar());
- }
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/Nullabledouble.java b/src/main/java/it/cavallium/data/generator/nativedata/Nullabledouble.java
deleted file mode 100644
index 27f21cd..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/Nullabledouble.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class Nullabledouble implements Serializable, IGenericNullable {
-
- private static final long serialVersionUID = 1L;
-
- private final Double value;
-
- public Nullabledouble(Double value) {
- this.value = value;
- }
-
- public static Nullabledouble of(double value) {
- return new Nullabledouble(value);
- }
-
- public static Nullabledouble ofNullable(@Nullable Double value) {
- return new Nullabledouble(value);
- }
-
- public static Nullabledouble empty() {
- return new Nullabledouble(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- public double get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- public double orElse(double defaultValue) {
- if (value == null) {
- return defaultValue;
- } else {
- return value;
- }
- }
-
- @Override
- public Double $getNullable() {
- return this.getNullable();
- }
-
- @Nullable
- public Double getNullable() {
- return value;
- }
-
- public double getNullable(double defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- @NotNull
- @Override
- public Nullabledouble clone() {
- if (value != null) {
- return Nullabledouble.of(value);
- } else {
- return Nullabledouble.empty();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- var that = (Nullabledouble) o;
- return Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- if (value == null) return "null";
- return "" + value;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullabledoubleSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/NullabledoubleSerializer.java
deleted file mode 100644
index 0904bb5..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullabledoubleSerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class NullabledoubleSerializer implements DataSerializer {
-
- public static final NullabledoubleSerializer INSTANCE = new NullabledoubleSerializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull Nullabledouble data) throws IOException {
- if (data.isEmpty()) {
- dataOutput.writeBoolean(false);
- } else {
- dataOutput.writeBoolean(true);
- double dataContent = data.get();
- dataOutput.writeDouble(dataContent);
- }
- }
-
- @NotNull
- @Override
- public Nullabledouble deserialize(DataInput dataInput) throws IOException {
- var isPresent = dataInput.readBoolean();
- if (!isPresent) {
- return Nullabledouble.empty();
- } else {
- return Nullabledouble.of(dataInput.readDouble());
- }
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/Nullablefloat.java b/src/main/java/it/cavallium/data/generator/nativedata/Nullablefloat.java
deleted file mode 100644
index 0280065..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/Nullablefloat.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class Nullablefloat implements Serializable, IGenericNullable {
-
- private static final long serialVersionUID = 1L;
-
- private final Float value;
-
- public Nullablefloat(Float value) {
- this.value = value;
- }
-
- public static Nullablefloat of(float value) {
- return new Nullablefloat(value);
- }
-
- public static Nullablefloat ofNullable(@Nullable Float value) {
- return new Nullablefloat(value);
- }
-
- public static Nullablefloat empty() {
- return new Nullablefloat(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- public float get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- public float orElse(float defaultValue) {
- if (value == null) {
- return defaultValue;
- } else {
- return value;
- }
- }
-
- @Override
- public Object $getNullable() {
- return this.getNullable();
- }
-
- @Nullable
- public Float getNullable() {
- return value;
- }
-
- public float getNullable(float defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- @NotNull
- @Override
- public Nullablefloat clone() {
- if (value != null) {
- return Nullablefloat.of(value);
- } else {
- return Nullablefloat.empty();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- var that = (Nullablefloat) o;
- return Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- if (value == null) return "null";
- return "" + value;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullablefloatSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/NullablefloatSerializer.java
deleted file mode 100644
index 2d8b150..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullablefloatSerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class NullablefloatSerializer implements DataSerializer {
-
- public static final NullablefloatSerializer INSTANCE = new NullablefloatSerializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull Nullablefloat data) throws IOException {
- if (data.isEmpty()) {
- dataOutput.writeBoolean(false);
- } else {
- dataOutput.writeBoolean(true);
- float dataContent = data.get();
- dataOutput.writeFloat(dataContent);
- }
- }
-
- @NotNull
- @Override
- public Nullablefloat deserialize(DataInput dataInput) throws IOException {
- var isPresent = dataInput.readBoolean();
- if (!isPresent) {
- return Nullablefloat.empty();
- } else {
- return Nullablefloat.of(dataInput.readFloat());
- }
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/Nullableint.java b/src/main/java/it/cavallium/data/generator/nativedata/Nullableint.java
deleted file mode 100644
index 4419758..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/Nullableint.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class Nullableint implements Serializable, IGenericNullable {
-
- private static final long serialVersionUID = 1L;
-
- private final Integer value;
-
- public Nullableint(Integer value) {
- this.value = value;
- }
-
- public static Nullableint of(int value) {
- return new Nullableint(value);
- }
-
- public static Nullableint ofNullable(@Nullable Integer value) {
- return new Nullableint(value);
- }
-
- public static Nullableint empty() {
- return new Nullableint(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- public int get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- public int orElse(int defaultValue) {
- if (value == null) {
- return defaultValue;
- } else {
- return value;
- }
- }
-
- @Override
- public Integer $getNullable() {
- return this.getNullable();
- }
-
- @Nullable
- public Integer getNullable() {
- return value;
- }
-
- public int getNullable(int defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- @NotNull
- @Override
- public Nullableint clone() {
- if (value != null) {
- return Nullableint.of(value);
- } else {
- return Nullableint.empty();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- var that = (Nullableint) o;
- return Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- if (value == null) return "null";
- return "" + value;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullableintSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/NullableintSerializer.java
deleted file mode 100644
index f9836db..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullableintSerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class NullableintSerializer implements DataSerializer {
-
- public static final NullableintSerializer INSTANCE = new NullableintSerializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull Nullableint data) throws IOException {
- if (data.isEmpty()) {
- dataOutput.writeBoolean(false);
- } else {
- dataOutput.writeBoolean(true);
- int dataContent = data.get();
- dataOutput.writeInt(dataContent);
- }
- }
-
- @NotNull
- @Override
- public Nullableint deserialize(DataInput dataInput) throws IOException {
- var isPresent = dataInput.readBoolean();
- if (!isPresent) {
- return Nullableint.empty();
- } else {
- return Nullableint.of(dataInput.readInt());
- }
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/Nullablelong.java b/src/main/java/it/cavallium/data/generator/nativedata/Nullablelong.java
deleted file mode 100644
index 8c1bcce..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/Nullablelong.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class Nullablelong implements Serializable, IGenericNullable {
-
- private static final long serialVersionUID = 1L;
-
- private final Long value;
-
- public Nullablelong(Long value) {
- this.value = value;
- }
-
- public static Nullablelong of(long value) {
- return new Nullablelong(value);
- }
-
- public static Nullablelong ofNullable(@Nullable Long value) {
- return new Nullablelong(value);
- }
-
- public static Nullablelong empty() {
- return new Nullablelong(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- public long get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- public long orElse(long defaultValue) {
- if (value == null) {
- return defaultValue;
- } else {
- return value;
- }
- }
-
- @Override
- public Long $getNullable() {
- return this.getNullable();
- }
-
- @Nullable
- public Long getNullable() {
- return value;
- }
-
- public long getNullable(long defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- @NotNull
- @Override
- public Nullablelong clone() {
- if (value != null) {
- return Nullablelong.of(value);
- } else {
- return Nullablelong.empty();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- var that = (Nullablelong) o;
- return Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- if (value == null) return "null";
- return "" + value;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullablelongSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/NullablelongSerializer.java
deleted file mode 100644
index 3b380c5..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullablelongSerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class NullablelongSerializer implements DataSerializer {
-
- public static final NullablelongSerializer INSTANCE = new NullablelongSerializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull Nullablelong data) throws IOException {
- if (data.isEmpty()) {
- dataOutput.writeBoolean(false);
- } else {
- dataOutput.writeBoolean(true);
- long dataContent = data.get();
- dataOutput.writeLong(dataContent);
- }
- }
-
- @NotNull
- @Override
- public Nullablelong deserialize(DataInput dataInput) throws IOException {
- var isPresent = dataInput.readBoolean();
- if (!isPresent) {
- return Nullablelong.empty();
- } else {
- return Nullablelong.of(dataInput.readLong());
- }
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/Nullableshort.java b/src/main/java/it/cavallium/data/generator/nativedata/Nullableshort.java
deleted file mode 100644
index c4c425b..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/Nullableshort.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.Serializable;
-import java.util.Objects;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class Nullableshort implements Serializable, IGenericNullable {
-
- private static final long serialVersionUID = 1L;
-
- private final Short value;
-
- public Nullableshort(Short value) {
- this.value = value;
- }
-
- public static Nullableshort of(short value) {
- return new Nullableshort(value);
- }
-
- public static Nullableshort ofNullable(@Nullable Short value) {
- return new Nullableshort(value);
- }
-
- public static Nullableshort empty() {
- return new Nullableshort(null);
- }
-
- public boolean isEmpty() {
- return value == null;
- }
-
- public boolean isPresent() {
- return value != null;
- }
-
- public short get() {
- if (value == null) {
- throw new NullPointerException();
- } else {
- return value;
- }
- }
-
- public short orElse(short defaultValue) {
- if (value == null) {
- return defaultValue;
- } else {
- return value;
- }
- }
-
- @Override
- public Short $getNullable() {
- return this.getNullable();
- }
-
- @Nullable
- public Short getNullable() {
- return value;
- }
-
- public short getNullable(short defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- @NotNull
- @Override
- public Nullableshort clone() {
- if (value != null) {
- return Nullableshort.of(value);
- } else {
- return Nullableshort.empty();
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- var that = (Nullableshort) o;
- return Objects.equals(value, that.value);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(value);
- }
-
- @Override
- public String toString() {
- if (value == null) return "null";
- return "" + value;
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/NullableshortSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/NullableshortSerializer.java
deleted file mode 100644
index b091a1a..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/NullableshortSerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class NullableshortSerializer implements DataSerializer {
-
- public static final NullableshortSerializer INSTANCE = new NullableshortSerializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull Nullableshort data) throws IOException {
- if (data.isEmpty()) {
- dataOutput.writeBoolean(false);
- } else {
- dataOutput.writeBoolean(true);
- short dataContent = data.get();
- dataOutput.writeShort(dataContent);
- }
- }
-
- @NotNull
- @Override
- public Nullableshort deserialize(DataInput dataInput) throws IOException {
- var isPresent = dataInput.readBoolean();
- if (!isPresent) {
- return Nullableshort.empty();
- } else {
- return Nullableshort.of(dataInput.readShort());
- }
- }
-}
diff --git a/src/main/java/it/cavallium/data/generator/nativedata/StringSerializer.java b/src/main/java/it/cavallium/data/generator/nativedata/StringSerializer.java
deleted file mode 100644
index 8ef7894..0000000
--- a/src/main/java/it/cavallium/data/generator/nativedata/StringSerializer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import it.cavallium.data.generator.DataSerializer;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import org.jetbrains.annotations.NotNull;
-
-public class StringSerializer implements DataSerializer {
-
- public static final StringSerializer INSTANCE = new StringSerializer();
-
- @Override
- public void serialize(DataOutput dataOutput, @NotNull String data) throws IOException {
- byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
- dataOutput.writeInt(bytes.length);
- dataOutput.write(bytes);
- }
-
- @NotNull
- @Override
- public String deserialize(DataInput dataInput) throws IOException {
- byte[] bytes = new byte[dataInput.readInt()];
- dataInput.readFully(bytes);
- return new String(bytes, StandardCharsets.UTF_8);
- }
-}
diff --git a/src/test/java/it/cavallium/data/generator/nativedata/TestInt52Serializer.java b/src/test/java/it/cavallium/data/generator/nativedata/TestInt52Serializer.java
deleted file mode 100644
index a8132fe..0000000
--- a/src/test/java/it/cavallium/data/generator/nativedata/TestInt52Serializer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package it.cavallium.data.generator.nativedata;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import org.jetbrains.annotations.Nullable;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class TestInt52Serializer {
-
- @Test
- public void testInt52Serialization() throws IOException {
- for (int i = 0; i <= 300; i++) {
- testInt52Serialization(i);
- }
- testInt52Serialization(0xF_FF_FF_FF_FF_FF_FFL);
- }
-
- public void testInt52Serialization(long n) throws IOException {
- var serializer = new Int52Serializer();
- byte[] out;
- try (var baos = new ByteArrayOutputStream()) {
- try (var dos = new DataOutputStream(baos)) {
- serializer.serialize(dos, Int52.fromLong(n));
- }
- out = baos.toByteArray();
- }
-
- var bais = new ByteArrayInputStream(out);
- var dis = new DataInputStream(bais);
- Assertions.assertEquals(n, serializer.deserialize(dis).longValue(), "Deserialized number differ");
- }
-
- @Test
- public void testInt52OptionalSerialization() throws IOException {
- testInt52OptionalSerialization(null);
- for (long i = 0; i <= 300; i++) {
- testInt52OptionalSerialization(i);
- }
- testInt52OptionalSerialization(0xF_FF_FF_FF_FF_FF_FFL);
- }
-
- public void testInt52OptionalSerialization(@Nullable Long n) throws IOException {
- var serializer = new NullableInt52Serializer();
- byte[] out;
- try (var baos = new ByteArrayOutputStream()) {
- try (var dos = new DataOutputStream(baos)) {
- if (n == null) {
- serializer.serialize(dos, NullableInt52.empty());
- } else {
- serializer.serialize(dos, NullableInt52.of(Int52.fromLong(n)));
- }
- }
- out = baos.toByteArray();
- }
-
- var bais = new ByteArrayInputStream(out);
- var dis = new DataInputStream(bais);
- if (n == null) {
- Assertions.assertNull(serializer.deserialize(dis).getNullable(), "Deserialized number is not empty");
- } else {
- Assertions.assertEquals(n, serializer.deserialize(dis).get().longValue(), "Deserialized number differ");
- }
- }
-
-}