diff --git a/data-generator-plugin/.github/workflows/maven-publish.yml b/datagen-plugin/.github/workflows/maven-publish.yml similarity index 100% rename from data-generator-plugin/.github/workflows/maven-publish.yml rename to datagen-plugin/.github/workflows/maven-publish.yml diff --git a/data-generator-plugin/.gitignore b/datagen-plugin/.gitignore similarity index 100% rename from data-generator-plugin/.gitignore rename to datagen-plugin/.gitignore diff --git a/data-generator-plugin/README.md b/datagen-plugin/README.md similarity index 100% rename from data-generator-plugin/README.md rename to datagen-plugin/README.md diff --git a/data-generator-plugin/pom.xml b/datagen-plugin/pom.xml similarity index 98% rename from data-generator-plugin/pom.xml rename to datagen-plugin/pom.xml index c7a5f26..bf80e21 100644 --- a/data-generator-plugin/pom.xml +++ b/datagen-plugin/pom.xml @@ -5,13 +5,13 @@ 4.0.0 Data generator - data-generator-plugin + datagen-plugin ${revision} maven-plugin it.cavallium ${revision} - data-generator + datagen-parent 1.0.0.0-SNAPSHOT @@ -269,7 +269,7 @@ it.cavallium - data-generator-runtime + datagen ${revision} diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ClassConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ClassConfiguration.java similarity index 95% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ClassConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ClassConfiguration.java index 670210d..a07a86e 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ClassConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ClassConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.LinkedHashMap; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ClassGenerator.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ClassGenerator.java similarity index 98% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ClassGenerator.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ClassGenerator.java index eea77d7..8d15cfc 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ClassGenerator.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ClassGenerator.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import static java.nio.file.StandardOpenOption.CREATE; import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedType.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedType.java similarity index 92% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedType.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedType.java index c239d7c..0065646 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedType.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedType.java @@ -1,8 +1,8 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.TypeName; -import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; +import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType; import java.util.LinkedHashMap; import java.util.stream.Stream; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArray.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArray.java similarity index 86% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArray.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArray.java index a54b5cb..bd883b4 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArray.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArray.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArrayFixed.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArrayFixed.java similarity index 96% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArrayFixed.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArrayFixed.java index 5583006..8acbf9c 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArrayFixed.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArrayFixed.java @@ -1,10 +1,10 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; -import it.cavallium.data.generator.nativedata.UpgradeUtil; +import it.cavallium.datagen.nativedata.UpgradeUtil; import java.util.List; import java.util.Objects; import java.util.stream.Stream; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArrayNative.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArrayNative.java similarity index 83% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArrayNative.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArrayNative.java index a2b0c2c..18829f1 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArrayNative.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArrayNative.java @@ -1,19 +1,19 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; -import it.cavallium.data.generator.nativedata.ArrayInt52Serializer; -import it.cavallium.data.generator.nativedata.ArrayStringSerializer; -import it.cavallium.data.generator.nativedata.ArraybooleanSerializer; -import it.cavallium.data.generator.nativedata.ArraybyteSerializer; -import it.cavallium.data.generator.nativedata.ArraycharSerializer; -import it.cavallium.data.generator.nativedata.ArraydoubleSerializer; -import it.cavallium.data.generator.nativedata.ArrayfloatSerializer; -import it.cavallium.data.generator.nativedata.ArrayintSerializer; -import it.cavallium.data.generator.nativedata.ArraylongSerializer; -import it.cavallium.data.generator.nativedata.ArrayshortSerializer; -import it.cavallium.data.generator.nativedata.Serializers; +import it.cavallium.datagen.nativedata.ArrayInt52Serializer; +import it.cavallium.datagen.nativedata.ArrayStringSerializer; +import it.cavallium.datagen.nativedata.ArraybooleanSerializer; +import it.cavallium.datagen.nativedata.ArraybyteSerializer; +import it.cavallium.datagen.nativedata.ArraycharSerializer; +import it.cavallium.datagen.nativedata.ArraydoubleSerializer; +import it.cavallium.datagen.nativedata.ArrayfloatSerializer; +import it.cavallium.datagen.nativedata.ArrayintSerializer; +import it.cavallium.datagen.nativedata.ArraylongSerializer; +import it.cavallium.datagen.nativedata.ArrayshortSerializer; +import it.cavallium.datagen.nativedata.Serializers; import it.unimi.dsi.fastutil.booleans.BooleanList; import it.unimi.dsi.fastutil.bytes.ByteList; import it.unimi.dsi.fastutil.chars.CharList; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArrayVersioned.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArrayVersioned.java similarity index 95% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArrayVersioned.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArrayVersioned.java index 5e1625d..07aa1e4 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeArrayVersioned.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeArrayVersioned.java @@ -1,11 +1,11 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; -import it.cavallium.data.generator.nativedata.UpgradeUtil; -import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; +import it.cavallium.datagen.nativedata.UpgradeUtil; +import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType; import java.util.LinkedHashMap; import java.util.List; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeBase.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeBase.java similarity index 97% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeBase.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeBase.java index 12d86d9..f42f03f 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeBase.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeBase.java @@ -1,8 +1,8 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; -import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; +import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType; import java.util.LinkedHashMap; import java.util.Objects; import java.util.stream.Stream; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeCustom.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeCustom.java similarity index 95% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeCustom.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeCustom.java index 751f40f..7f397ea 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeCustom.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeCustom.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ParameterizedTypeName; @@ -64,7 +64,7 @@ public final class ComputedTypeCustom implements ComputedType { return false; } - it.cavallium.data.generator.plugin.ComputedTypeCustom that = (it.cavallium.data.generator.plugin.ComputedTypeCustom) o; + ComputedTypeCustom that = (ComputedTypeCustom) o; if (!Objects.equals(type, that.type)) { return false; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNative.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNative.java similarity index 82% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNative.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNative.java index 992dcf4..a14fe0b 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNative.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNative.java @@ -1,10 +1,11 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.TypeName; -import it.cavallium.data.generator.nativedata.Int52Serializer; -import it.cavallium.data.generator.nativedata.Serializers; -import it.cavallium.data.generator.nativedata.StringSerializer; +import it.cavallium.datagen.nativedata.Int52Serializer; +import it.cavallium.datagen.nativedata.Serializers; +import it.cavallium.datagen.nativedata.StringSerializer; +import it.cavallium.datagen.nativedata.Int52; import java.util.List; import java.util.Objects; import java.util.Set; @@ -40,7 +41,7 @@ public final class ComputedTypeNative implements ComputedType { case "float" -> TypeName.FLOAT; case "double" -> TypeName.DOUBLE; case "byte" -> TypeName.BYTE; - case "Int52" -> ClassName.get(it.cavallium.data.generator.nativedata.Int52.class); + case "Int52" -> ClassName.get(Int52.class); default -> throw new UnsupportedOperationException(type + " is not a known native type"); }; } @@ -81,7 +82,7 @@ public final class ComputedTypeNative implements ComputedType { return false; } - it.cavallium.data.generator.plugin.ComputedTypeNative that = (it.cavallium.data.generator.plugin.ComputedTypeNative) o; + ComputedTypeNative that = (ComputedTypeNative) o; return Objects.equals(type, that.type); } @@ -101,10 +102,10 @@ public final class ComputedTypeNative implements ComputedType { return computedTypeSupplier.getDependents(getName()); } - public static List get(ComputedTypeSupplier computedTypeSupplier) { + public static List get(ComputedTypeSupplier computedTypeSupplier) { return Stream .of("String", "boolean", "short", "char", "int", "long", "float", "double", "byte", "Int52") - .map(name -> new it.cavallium.data.generator.plugin.ComputedTypeNative(name, computedTypeSupplier)) + .map(name -> new ComputedTypeNative(name, computedTypeSupplier)) .toList(); } diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullable.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullable.java similarity index 87% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullable.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullable.java index f290190..d24d40a 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullable.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullable.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullableFixed.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullableFixed.java similarity index 97% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullableFixed.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullableFixed.java index 3597d6d..09d34ce 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullableFixed.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullableFixed.java @@ -1,9 +1,9 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.TypeName; -import it.cavallium.data.generator.nativedata.UpgradeUtil; +import it.cavallium.datagen.nativedata.UpgradeUtil; import java.util.Objects; import java.util.stream.Stream; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullableNative.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullableNative.java similarity index 74% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullableNative.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullableNative.java index 871ea0e..87a1cee 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullableNative.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullableNative.java @@ -1,28 +1,28 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.TypeName; -import it.cavallium.data.generator.nativedata.NullableInt52; -import it.cavallium.data.generator.nativedata.NullableInt52Serializer; -import it.cavallium.data.generator.nativedata.NullableString; -import it.cavallium.data.generator.nativedata.NullableStringSerializer; -import it.cavallium.data.generator.nativedata.Nullableboolean; -import it.cavallium.data.generator.nativedata.NullablebooleanSerializer; -import it.cavallium.data.generator.nativedata.Nullablebyte; -import it.cavallium.data.generator.nativedata.NullablebyteSerializer; -import it.cavallium.data.generator.nativedata.Nullablechar; -import it.cavallium.data.generator.nativedata.NullablecharSerializer; -import it.cavallium.data.generator.nativedata.Nullabledouble; -import it.cavallium.data.generator.nativedata.NullabledoubleSerializer; -import it.cavallium.data.generator.nativedata.Nullablefloat; -import it.cavallium.data.generator.nativedata.NullablefloatSerializer; -import it.cavallium.data.generator.nativedata.Nullableint; -import it.cavallium.data.generator.nativedata.NullableintSerializer; -import it.cavallium.data.generator.nativedata.Nullablelong; -import it.cavallium.data.generator.nativedata.NullablelongSerializer; -import it.cavallium.data.generator.nativedata.Nullableshort; -import it.cavallium.data.generator.nativedata.NullableshortSerializer; -import it.cavallium.data.generator.nativedata.Serializers; +import it.cavallium.datagen.nativedata.NullableInt52; +import it.cavallium.datagen.nativedata.NullableInt52Serializer; +import it.cavallium.datagen.nativedata.NullableString; +import it.cavallium.datagen.nativedata.NullableStringSerializer; +import it.cavallium.datagen.nativedata.Nullableboolean; +import it.cavallium.datagen.nativedata.NullablebooleanSerializer; +import it.cavallium.datagen.nativedata.Nullablebyte; +import it.cavallium.datagen.nativedata.NullablebyteSerializer; +import it.cavallium.datagen.nativedata.Nullablechar; +import it.cavallium.datagen.nativedata.NullablecharSerializer; +import it.cavallium.datagen.nativedata.Nullabledouble; +import it.cavallium.datagen.nativedata.NullabledoubleSerializer; +import it.cavallium.datagen.nativedata.Nullablefloat; +import it.cavallium.datagen.nativedata.NullablefloatSerializer; +import it.cavallium.datagen.nativedata.Nullableint; +import it.cavallium.datagen.nativedata.NullableintSerializer; +import it.cavallium.datagen.nativedata.Nullablelong; +import it.cavallium.datagen.nativedata.NullablelongSerializer; +import it.cavallium.datagen.nativedata.Nullableshort; +import it.cavallium.datagen.nativedata.NullableshortSerializer; +import it.cavallium.datagen.nativedata.Serializers; import java.util.Objects; import java.util.stream.Stream; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullableVersioned.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullableVersioned.java similarity index 95% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullableVersioned.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullableVersioned.java index 44657b2..f6b27ad 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeNullableVersioned.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeNullableVersioned.java @@ -1,10 +1,10 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.TypeName; -import it.cavallium.data.generator.nativedata.UpgradeUtil; -import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; +import it.cavallium.datagen.nativedata.UpgradeUtil; +import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType; import java.util.LinkedHashMap; import java.util.Objects; import java.util.stream.Stream; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeSuper.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeSuper.java similarity index 89% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeSuper.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeSuper.java index 0f64ab8..03c67bb 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeSuper.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeSuper.java @@ -1,8 +1,8 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; -import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; +import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -33,9 +33,9 @@ public final class ComputedTypeSuper implements VersionedComputedType { } @Override - public it.cavallium.data.generator.plugin.ComputedTypeSuper withChangeAtVersion(ComputedVersion version, + public ComputedTypeSuper withChangeAtVersion(ComputedVersion version, VersionChangeChecker versionChangeChecker, LinkedHashMap data) { - return new it.cavallium.data.generator.plugin.ComputedTypeSuper(type.withVersion(version), + return new ComputedTypeSuper(type.withVersion(version), subTypes.stream().map(subType -> subType.withVersionIfChanged(version, versionChangeChecker)).toList(), computedTypeSupplier ); @@ -62,7 +62,7 @@ public final class ComputedTypeSuper implements VersionedComputedType { return false; } - it.cavallium.data.generator.plugin.ComputedTypeSuper that = (it.cavallium.data.generator.plugin.ComputedTypeSuper) o; + ComputedTypeSuper that = (ComputedTypeSuper) o; if (!Objects.equals(type, that.type)) { return false; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeSupplier.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeSupplier.java similarity index 96% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeSupplier.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeSupplier.java index eda5c7f..8a7d699 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedTypeSupplier.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedTypeSupplier.java @@ -1,8 +1,7 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedVersion.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedVersion.java similarity index 93% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedVersion.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedVersion.java index a56a5ba..69f3050 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedVersion.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ComputedVersion.java @@ -1,11 +1,9 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; -import static it.cavallium.data.generator.plugin.DataModel.joinPackage; +import static it.cavallium.datagen.plugin.DataModel.joinPackage; import java.util.List; -import java.util.Map; import java.util.Objects; -import java.util.StringJoiner; import org.jetbrains.annotations.NotNull; public class ComputedVersion implements Comparable { diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ConfigUtils.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ConfigUtils.java similarity index 93% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ConfigUtils.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ConfigUtils.java index 1702dab..fbdd9ca 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ConfigUtils.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ConfigUtils.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Collection; import java.util.Map; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/CustomTypesConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/CustomTypesConfiguration.java similarity index 95% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/CustomTypesConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/CustomTypesConfiguration.java index fd8ed2e..b5f981e 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/CustomTypesConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/CustomTypesConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DataModel.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/DataModel.java similarity index 99% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DataModel.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/DataModel.java index 89d5b57..ebc6cbb 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DataModel.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/DataModel.java @@ -1,9 +1,9 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import static java.util.Objects.requireNonNull; import static java.util.function.Function.identity; -import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; +import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType; import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DetailsConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/DetailsConfiguration.java similarity index 91% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DetailsConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/DetailsConfiguration.java index 47e6e10..555d751 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DetailsConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/DetailsConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/FieldLocation.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/FieldLocation.java similarity index 71% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/FieldLocation.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/FieldLocation.java index e5b6ee8..c0722a4 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/FieldLocation.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/FieldLocation.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.TypeName; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/InterfaceDataConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/InterfaceDataConfiguration.java similarity index 95% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/InterfaceDataConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/InterfaceDataConfiguration.java index db22bc7..ba23a01 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/InterfaceDataConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/InterfaceDataConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.HashMap; import java.util.HashSet; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/MavenPlugin.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/MavenPlugin.java similarity index 97% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/MavenPlugin.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/MavenPlugin.java index 92cb562..0ea141e 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/MavenPlugin.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/MavenPlugin.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.io.File; import java.io.IOException; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/MoveDataConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/MoveDataConfiguration.java similarity index 96% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/MoveDataConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/MoveDataConfiguration.java index 603c52b..786e114 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/MoveDataConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/MoveDataConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/NewDataConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/NewDataConfiguration.java similarity index 97% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/NewDataConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/NewDataConfiguration.java index 03d1b8c..b9cef88 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/NewDataConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/NewDataConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Objects; import org.jetbrains.annotations.Nullable; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ParsedClass.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ParsedClass.java similarity index 94% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ParsedClass.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ParsedClass.java index 6658d29..fce005d 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ParsedClass.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ParsedClass.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; -import static it.cavallium.data.generator.plugin.DataModel.fixType; +import static it.cavallium.datagen.plugin.DataModel.fixType; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ParsedInterface.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ParsedInterface.java similarity index 92% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ParsedInterface.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ParsedInterface.java index 7e4afaf..9264bbb 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ParsedInterface.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ParsedInterface.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; -import static it.cavallium.data.generator.plugin.DataModel.fixType; +import static it.cavallium.datagen.plugin.DataModel.fixType; import java.util.HashMap; import java.util.HashSet; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ParsedVersion.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ParsedVersion.java similarity index 95% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ParsedVersion.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ParsedVersion.java index 786a9c3..11edd0b 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ParsedVersion.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/ParsedVersion.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.List; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/RemoveDataConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/RemoveDataConfiguration.java similarity index 95% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/RemoveDataConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/RemoveDataConfiguration.java index 4b6c789..4052f54 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/RemoveDataConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/RemoveDataConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/SerializeCodeBlockGenerator.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/SerializeCodeBlockGenerator.java similarity index 96% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/SerializeCodeBlockGenerator.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/SerializeCodeBlockGenerator.java index c7a1d79..a7038f8 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/SerializeCodeBlockGenerator.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/SerializeCodeBlockGenerator.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import com.squareup.javapoet.CodeBlock; import java.util.List; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/SourcesGenerator.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/SourcesGenerator.java similarity index 89% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/SourcesGenerator.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/SourcesGenerator.java index 9cfc4bd..d49f6ad 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/SourcesGenerator.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/SourcesGenerator.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import static java.nio.file.StandardOpenOption.CREATE; import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING; @@ -12,27 +12,28 @@ import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec.Builder; -import it.cavallium.data.generator.plugin.ClassGenerator.ClassGeneratorParams; -import it.cavallium.data.generator.plugin.classgen.GenBaseType; -import it.cavallium.data.generator.plugin.classgen.GenCurrentVersion; -import it.cavallium.data.generator.plugin.classgen.GenDataBaseX; -import it.cavallium.data.generator.plugin.classgen.GenDataSuperX; -import it.cavallium.data.generator.plugin.classgen.GenIBaseType; -import it.cavallium.data.generator.plugin.classgen.GenINullableBaseType; -import it.cavallium.data.generator.plugin.classgen.GenINullableIType; -import it.cavallium.data.generator.plugin.classgen.GenINullableSuperType; -import it.cavallium.data.generator.plugin.classgen.GenIType; -import it.cavallium.data.generator.plugin.classgen.GenIVersion; -import it.cavallium.data.generator.plugin.classgen.GenNullableX; -import it.cavallium.data.generator.plugin.classgen.GenSerializerArrayX; -import it.cavallium.data.generator.plugin.classgen.GenSerializerBaseX; -import it.cavallium.data.generator.plugin.classgen.GenSerializerNullableX; -import it.cavallium.data.generator.plugin.classgen.GenSerializerSuperX; -import it.cavallium.data.generator.plugin.classgen.GenSuperType; -import it.cavallium.data.generator.plugin.classgen.GenUpgraderBaseX; -import it.cavallium.data.generator.plugin.classgen.GenUpgraderSuperX; -import it.cavallium.data.generator.plugin.classgen.GenVersion; -import it.cavallium.data.generator.plugin.classgen.GenVersions; +import it.cavallium.datagen.nativedata.Int52; +import it.cavallium.datagen.plugin.ClassGenerator.ClassGeneratorParams; +import it.cavallium.datagen.plugin.classgen.GenBaseType; +import it.cavallium.datagen.plugin.classgen.GenCurrentVersion; +import it.cavallium.datagen.plugin.classgen.GenDataBaseX; +import it.cavallium.datagen.plugin.classgen.GenDataSuperX; +import it.cavallium.datagen.plugin.classgen.GenIBaseType; +import it.cavallium.datagen.plugin.classgen.GenINullableBaseType; +import it.cavallium.datagen.plugin.classgen.GenINullableIType; +import it.cavallium.datagen.plugin.classgen.GenINullableSuperType; +import it.cavallium.datagen.plugin.classgen.GenIType; +import it.cavallium.datagen.plugin.classgen.GenIVersion; +import it.cavallium.datagen.plugin.classgen.GenNullableX; +import it.cavallium.datagen.plugin.classgen.GenSerializerArrayX; +import it.cavallium.datagen.plugin.classgen.GenSerializerBaseX; +import it.cavallium.datagen.plugin.classgen.GenSerializerNullableX; +import it.cavallium.datagen.plugin.classgen.GenSerializerSuperX; +import it.cavallium.datagen.plugin.classgen.GenSuperType; +import it.cavallium.datagen.plugin.classgen.GenUpgraderBaseX; +import it.cavallium.datagen.plugin.classgen.GenUpgraderSuperX; +import it.cavallium.datagen.plugin.classgen.GenVersion; +import it.cavallium.datagen.plugin.classgen.GenVersions; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import it.unimi.dsi.fastutil.booleans.BooleanList; @@ -252,8 +253,8 @@ public class SourcesGenerator { private static String getSpecialNativePackage(String specialNativeType) { //noinspection SwitchStatementWithTooFewBranches return switch (specialNativeType) { - case "Int52" -> "it.cavallium.data.generator.nativedata"; - default -> "java.lang"; + case "Int52" -> Int52.class.getPackageName(); + default -> Integer.class.getPackageName(); }; } diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/SourcesGeneratorConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/SourcesGeneratorConfiguration.java similarity index 97% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/SourcesGeneratorConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/SourcesGeneratorConfiguration.java index 7452f5a..e735a77 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/SourcesGeneratorConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/SourcesGeneratorConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Map; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/Standalone.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/Standalone.java similarity index 93% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/Standalone.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/Standalone.java index 4a10c68..064d637 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/Standalone.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/Standalone.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import static java.lang.Boolean.parseBoolean; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/TransformationConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/TransformationConfiguration.java similarity index 71% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/TransformationConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/TransformationConfiguration.java index 4a5eb51..d2b18c5 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/TransformationConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/TransformationConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; public interface TransformationConfiguration { diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/UpgradeDataConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/UpgradeDataConfiguration.java similarity index 96% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/UpgradeDataConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/UpgradeDataConfiguration.java index 34ef3be..22eaaf6 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/UpgradeDataConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/UpgradeDataConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionChangeChecker.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionChangeChecker.java similarity index 92% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionChangeChecker.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionChangeChecker.java index d5ffda1..63ae533 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionChangeChecker.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionChangeChecker.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Set; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionConfiguration.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionConfiguration.java similarity index 96% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionConfiguration.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionConfiguration.java index 8cda67a..562be52 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionConfiguration.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionConfiguration.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionTransformation.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionTransformation.java similarity index 98% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionTransformation.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionTransformation.java index 1d8346b..57acd6e 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionTransformation.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionTransformation.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionedType.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionedType.java similarity index 91% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionedType.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionedType.java index 63b3310..d2fe873 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/VersionedType.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/VersionedType.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin; +package it.cavallium.datagen.plugin; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenBaseType.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenBaseType.java similarity index 84% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenBaseType.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenBaseType.java index f252cd0..33f99b0 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenBaseType.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenBaseType.java @@ -1,7 +1,7 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.TypeSpec; -import it.cavallium.data.generator.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ClassGenerator; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenCurrentVersion.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenCurrentVersion.java similarity index 97% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenCurrentVersion.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenCurrentVersion.java index 215de7f..768de79 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenCurrentVersion.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenCurrentVersion.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; @@ -11,11 +11,10 @@ import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeVariableName; import com.squareup.javapoet.WildcardTypeName; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedType; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedType; +import it.cavallium.datagen.plugin.ComputedVersion; import it.cavallium.stream.SafeDataInput; -import java.io.IOException; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Stream; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenDataBaseX.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenDataBaseX.java similarity index 95% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenDataBaseX.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenDataBaseX.java index 2299379..9a5db5c 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenDataBaseX.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenDataBaseX.java @@ -1,13 +1,13 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.TypeSpec; import io.soabase.recordbuilder.core.RecordBuilder; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedTypeBase; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedTypeBase; +import it.cavallium.datagen.plugin.ComputedVersion; import java.util.Objects; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenDataSuperX.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenDataSuperX.java similarity index 92% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenDataSuperX.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenDataSuperX.java index 20ba68b..2f7b304 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenDataSuperX.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenDataSuperX.java @@ -1,12 +1,12 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.TypeSpec; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedTypeSuper; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedTypeSuper; +import it.cavallium.datagen.plugin.ComputedVersion; import java.util.stream.Stream; import javax.lang.model.element.Modifier; import org.apache.commons.lang3.StringUtils; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenIBaseType.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenIBaseType.java similarity index 87% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenIBaseType.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenIBaseType.java index 638c6b3..073d019 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenIBaseType.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenIBaseType.java @@ -1,10 +1,10 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeSpec; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedVersion; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenINullableBaseType.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenINullableBaseType.java similarity index 87% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenINullableBaseType.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenINullableBaseType.java index f55b35e..5efd4d6 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenINullableBaseType.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenINullableBaseType.java @@ -1,10 +1,10 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeSpec; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedVersion; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenINullableIType.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenINullableIType.java similarity index 81% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenINullableIType.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenINullableIType.java index cf28031..36265ea 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenINullableIType.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenINullableIType.java @@ -1,10 +1,10 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.TypeSpec; -import it.cavallium.data.generator.nativedata.INullable; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.nativedata.INullable; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedVersion; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenINullableSuperType.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenINullableSuperType.java similarity index 87% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenINullableSuperType.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenINullableSuperType.java index 140082b..724d27f 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenINullableSuperType.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenINullableSuperType.java @@ -1,10 +1,10 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.TypeSpec; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedVersion; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenIType.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenIType.java similarity index 82% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenIType.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenIType.java index 46c56bd..61e77a9 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenIType.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenIType.java @@ -1,9 +1,9 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.TypeSpec; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedVersion; import java.io.Serializable; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenIVersion.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenIVersion.java similarity index 91% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenIVersion.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenIVersion.java index 5846737..57b64b4 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenIVersion.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenIVersion.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.MethodSpec; @@ -7,8 +7,8 @@ import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeVariableName; -import it.cavallium.data.generator.DataSerializer; -import it.cavallium.data.generator.plugin.ClassGenerator; +import it.cavallium.datagen.DataSerializer; +import it.cavallium.datagen.plugin.ClassGenerator; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenNullableX.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenNullableX.java similarity index 88% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenNullableX.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenNullableX.java index da48aba..2713ed7 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenNullableX.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenNullableX.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.FieldSpec; @@ -6,16 +6,16 @@ import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeSpec; -import it.cavallium.data.generator.TypedNullable; -import it.cavallium.data.generator.nativedata.INullable; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedTypeBase; -import it.cavallium.data.generator.plugin.ComputedTypeCustom; -import it.cavallium.data.generator.plugin.ComputedTypeNullable; -import it.cavallium.data.generator.plugin.ComputedTypeNullableFixed; -import it.cavallium.data.generator.plugin.ComputedTypeNullableVersioned; -import it.cavallium.data.generator.plugin.ComputedTypeSuper; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.TypedNullable; +import it.cavallium.datagen.nativedata.INullable; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedTypeBase; +import it.cavallium.datagen.plugin.ComputedTypeCustom; +import it.cavallium.datagen.plugin.ComputedTypeNullable; +import it.cavallium.datagen.plugin.ComputedTypeNullableFixed; +import it.cavallium.datagen.plugin.ComputedTypeNullableVersioned; +import it.cavallium.datagen.plugin.ComputedTypeSuper; +import it.cavallium.datagen.plugin.ComputedVersion; import java.util.List; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerArrayX.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerArrayX.java similarity index 88% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerArrayX.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerArrayX.java index 5abcf16..fe47c44 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerArrayX.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerArrayX.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ArrayTypeName; import com.squareup.javapoet.ClassName; @@ -7,14 +7,14 @@ import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec.Builder; -import it.cavallium.data.generator.DataSerializer; -import it.cavallium.data.generator.NotSerializableException; -import it.cavallium.data.generator.nativedata.ImmutableWrappedArrayList; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedTypeArray; -import it.cavallium.data.generator.plugin.ComputedTypeArrayFixed; -import it.cavallium.data.generator.plugin.ComputedTypeArrayVersioned; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.DataSerializer; +import it.cavallium.datagen.NotSerializableException; +import it.cavallium.datagen.nativedata.ImmutableWrappedArrayList; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedTypeArray; +import it.cavallium.datagen.plugin.ComputedTypeArrayFixed; +import it.cavallium.datagen.plugin.ComputedTypeArrayVersioned; +import it.cavallium.datagen.plugin.ComputedVersion; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerBaseX.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerBaseX.java similarity index 92% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerBaseX.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerBaseX.java index be8eb8b..59f7a8f 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerBaseX.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerBaseX.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; @@ -7,11 +7,11 @@ import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec.Builder; -import it.cavallium.data.generator.DataSerializer; -import it.cavallium.data.generator.NotSerializableException; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedTypeBase; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.DataSerializer; +import it.cavallium.datagen.NotSerializableException; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedTypeBase; +import it.cavallium.datagen.plugin.ComputedVersion; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerNullableX.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerNullableX.java similarity index 89% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerNullableX.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerNullableX.java index 057b824..c4886c6 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerNullableX.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerNullableX.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.MethodSpec; @@ -6,13 +6,13 @@ import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec.Builder; -import it.cavallium.data.generator.DataSerializer; -import it.cavallium.data.generator.NotSerializableException; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedTypeNullable; -import it.cavallium.data.generator.plugin.ComputedTypeNullableFixed; -import it.cavallium.data.generator.plugin.ComputedTypeNullableVersioned; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.DataSerializer; +import it.cavallium.datagen.NotSerializableException; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedTypeNullable; +import it.cavallium.datagen.plugin.ComputedTypeNullableFixed; +import it.cavallium.datagen.plugin.ComputedTypeNullableVersioned; +import it.cavallium.datagen.plugin.ComputedVersion; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerSuperX.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerSuperX.java similarity index 92% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerSuperX.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerSuperX.java index 5a098b6..e985a44 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSerializerSuperX.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerSuperX.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.MethodSpec; @@ -6,12 +6,12 @@ import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec.Builder; -import it.cavallium.data.generator.DataSerializer; -import it.cavallium.data.generator.NotSerializableException; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedType; -import it.cavallium.data.generator.plugin.ComputedTypeSuper; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.DataSerializer; +import it.cavallium.datagen.NotSerializableException; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedType; +import it.cavallium.datagen.plugin.ComputedTypeSuper; +import it.cavallium.datagen.plugin.ComputedVersion; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import java.util.Objects; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSuperType.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSuperType.java similarity index 84% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSuperType.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSuperType.java index 5b0457a..7f58ca6 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenSuperType.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSuperType.java @@ -1,7 +1,7 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.TypeSpec; -import it.cavallium.data.generator.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ClassGenerator; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenUpgraderBaseX.java similarity index 90% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenUpgraderBaseX.java index 0d85641..181baf2 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenUpgraderBaseX.java @@ -1,6 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; - -import static it.cavallium.data.generator.plugin.DataModel.fixType; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; @@ -11,19 +9,19 @@ import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec.Builder; -import it.cavallium.data.generator.DataInitializer; -import it.cavallium.data.generator.DataUpgrader; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedType; -import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; -import it.cavallium.data.generator.plugin.ComputedTypeBase; -import it.cavallium.data.generator.plugin.ComputedVersion; -import it.cavallium.data.generator.plugin.MoveDataConfiguration; -import it.cavallium.data.generator.plugin.NewDataConfiguration; -import it.cavallium.data.generator.plugin.RemoveDataConfiguration; -import it.cavallium.data.generator.plugin.TransformationConfiguration; -import it.cavallium.data.generator.plugin.UpgradeDataConfiguration; -import java.io.IOException; +import it.cavallium.datagen.DataInitializer; +import it.cavallium.datagen.DataUpgrader; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedType; +import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType; +import it.cavallium.datagen.plugin.ComputedTypeBase; +import it.cavallium.datagen.plugin.ComputedVersion; +import it.cavallium.datagen.plugin.MoveDataConfiguration; +import it.cavallium.datagen.plugin.NewDataConfiguration; +import it.cavallium.datagen.plugin.RemoveDataConfiguration; +import it.cavallium.datagen.plugin.TransformationConfiguration; +import it.cavallium.datagen.plugin.UpgradeDataConfiguration; +import it.cavallium.datagen.plugin.DataModel; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -117,7 +115,7 @@ public class GenUpgraderBaseX extends ClassGenerator { var i = e.getKey(); var newDataConfiguration = e.getValue(); var computedTypes = dataModel.getComputedTypes(nextTypeBase.getVersion()); - var newFieldType = Objects.requireNonNull(computedTypes.get(fixType(newDataConfiguration.type))); + var newFieldType = Objects.requireNonNull(computedTypes.get(DataModel.fixType(newDataConfiguration.type))); var initializerClass = ClassName.bestGuess(newDataConfiguration.initializer); var genericInitializerClass = ParameterizedTypeName.get(ClassName.get(DataInitializer.class), newFieldType.getJTypeName(basePackageName).box() @@ -147,7 +145,7 @@ public class GenUpgraderBaseX extends ClassGenerator { fieldName = moveDataConfiguration.to; } else if (transformation instanceof NewDataConfiguration newDataConfiguration) { if (newDataConfiguration.to.equals(fieldName)) { - var type = dataModel.getComputedTypes(version).get(fixType(newDataConfiguration.type)); + var type = dataModel.getComputedTypes(version).get(DataModel.fixType(newDataConfiguration.type)); throw new IllegalStateException( "New field " + typeBase.getName() + "." + fieldName + " of type \"" + type + "\" at version \"" + nextTypeBase.getVersion() + "\" conflicts with another field of type \"" + fieldType + "\" with the same name at version \"" @@ -168,7 +166,7 @@ public class GenUpgraderBaseX extends ClassGenerator { var upgraderClass = ClassName.bestGuess(upgradeDataConfiguration.upgrader); var cb = CodeBlock.builder(); var newFieldType = Objects - .requireNonNull(dataModel.getComputedTypes(nextTypeBase.getVersion()).get(fixType(upgradeDataConfiguration.type))); + .requireNonNull(dataModel.getComputedTypes(nextTypeBase.getVersion()).get(DataModel.fixType(upgradeDataConfiguration.type))); var genericUpgraderClass = ParameterizedTypeName.get(ClassName.get(DataUpgrader.class), fieldType.getJTypeName(basePackageName).box(), newFieldType.getJTypeName(basePackageName).box() diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderSuperX.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenUpgraderSuperX.java similarity index 89% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderSuperX.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenUpgraderSuperX.java index 0dd4225..6672a23 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderSuperX.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenUpgraderSuperX.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; @@ -7,12 +7,12 @@ import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec.Builder; -import it.cavallium.data.generator.DataUpgrader; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedType; -import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; -import it.cavallium.data.generator.plugin.ComputedTypeSuper; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.DataUpgrader; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedType; +import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType; +import it.cavallium.datagen.plugin.ComputedTypeSuper; +import it.cavallium.datagen.plugin.ComputedVersion; import java.util.stream.Stream; import javax.lang.model.element.Modifier; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenVersion.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenVersion.java similarity index 92% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenVersion.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenVersion.java index 1dc1dd3..53e9ba8 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenVersion.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenVersion.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; @@ -9,16 +9,16 @@ import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeVariableName; -import it.cavallium.data.generator.DataSerializer; -import it.cavallium.data.generator.DataUpgrader; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; -import it.cavallium.data.generator.plugin.ComputedTypeArrayFixed; -import it.cavallium.data.generator.plugin.ComputedTypeBase; -import it.cavallium.data.generator.plugin.ComputedTypeCustom; -import it.cavallium.data.generator.plugin.ComputedTypeNullableFixed; -import it.cavallium.data.generator.plugin.ComputedTypeSuper; -import it.cavallium.data.generator.plugin.ComputedVersion; +import it.cavallium.datagen.DataSerializer; +import it.cavallium.datagen.DataUpgrader; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType; +import it.cavallium.datagen.plugin.ComputedTypeArrayFixed; +import it.cavallium.datagen.plugin.ComputedTypeBase; +import it.cavallium.datagen.plugin.ComputedTypeCustom; +import it.cavallium.datagen.plugin.ComputedTypeNullableFixed; +import it.cavallium.datagen.plugin.ComputedTypeSuper; +import it.cavallium.datagen.plugin.ComputedVersion; import java.util.Objects; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenVersions.java b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenVersions.java similarity index 90% rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenVersions.java rename to datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenVersions.java index f00e7ca..139ec7c 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenVersions.java +++ b/datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenVersions.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.plugin.classgen; +package it.cavallium.datagen.plugin.classgen; import com.squareup.javapoet.ArrayTypeName; import com.squareup.javapoet.ClassName; @@ -6,11 +6,9 @@ import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.FieldSpec; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import it.cavallium.data.generator.plugin.ClassGenerator; -import it.cavallium.data.generator.plugin.ComputedVersion; -import java.nio.file.Path; +import it.cavallium.datagen.plugin.ClassGenerator; +import it.cavallium.datagen.plugin.ComputedVersion; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.stream.Stream; import javax.lang.model.element.Modifier; diff --git a/data-generator-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/datagen-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml similarity index 100% rename from data-generator-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml rename to datagen-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml diff --git a/data-generator-plugin/src/test/resources/test.yaml b/datagen-plugin/src/test/resources/test.yaml similarity index 100% rename from data-generator-plugin/src/test/resources/test.yaml rename to datagen-plugin/src/test/resources/test.yaml diff --git a/data-generator-runtime/.github/workflows/maven-publish.yml b/datagen/.github/workflows/maven-publish.yml similarity index 100% rename from data-generator-runtime/.github/workflows/maven-publish.yml rename to datagen/.github/workflows/maven-publish.yml diff --git a/data-generator-runtime/.gitignore b/datagen/.gitignore similarity index 100% rename from data-generator-runtime/.gitignore rename to datagen/.gitignore diff --git a/data-generator-runtime/README.md b/datagen/README.md similarity index 100% rename from data-generator-runtime/README.md rename to datagen/README.md diff --git a/data-generator-runtime/pom.xml b/datagen/pom.xml similarity index 98% rename from data-generator-runtime/pom.xml rename to datagen/pom.xml index edbbad7..bc053be 100644 --- a/data-generator-runtime/pom.xml +++ b/datagen/pom.xml @@ -5,13 +5,13 @@ 4.0.0 Data generator runtime - data-generator-runtime + datagen ${revision} jar it.cavallium ${revision} - data-generator + datagen-parent ../pom.xml diff --git a/data-generator-runtime/src/main/java/it/cavallium/buffer/Buf.java b/datagen/src/main/java/it/cavallium/buffer/Buf.java similarity index 99% rename from data-generator-runtime/src/main/java/it/cavallium/buffer/Buf.java rename to datagen/src/main/java/it/cavallium/buffer/Buf.java index 1077637..e0d03b5 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/buffer/Buf.java +++ b/datagen/src/main/java/it/cavallium/buffer/Buf.java @@ -1,6 +1,6 @@ package it.cavallium.buffer; -import it.cavallium.data.generator.nativedata.Int52; +import it.cavallium.datagen.nativedata.Int52; import it.cavallium.stream.SafeByteArrayInputStream; import it.cavallium.stream.SafeByteArrayOutputStream; import it.cavallium.stream.SafeDataOutput; diff --git a/data-generator-runtime/src/main/java/it/cavallium/buffer/BufDataInput.java b/datagen/src/main/java/it/cavallium/buffer/BufDataInput.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/buffer/BufDataInput.java rename to datagen/src/main/java/it/cavallium/buffer/BufDataInput.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/buffer/BufDataOutput.java b/datagen/src/main/java/it/cavallium/buffer/BufDataOutput.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/buffer/BufDataOutput.java rename to datagen/src/main/java/it/cavallium/buffer/BufDataOutput.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/buffer/ByteListBuf.java b/datagen/src/main/java/it/cavallium/buffer/ByteListBuf.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/buffer/ByteListBuf.java rename to datagen/src/main/java/it/cavallium/buffer/ByteListBuf.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/buffer/IgnoreCoverage.java b/datagen/src/main/java/it/cavallium/buffer/IgnoreCoverage.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/buffer/IgnoreCoverage.java rename to datagen/src/main/java/it/cavallium/buffer/IgnoreCoverage.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/CommonField.java b/datagen/src/main/java/it/cavallium/datagen/CommonField.java similarity index 88% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/CommonField.java rename to datagen/src/main/java/it/cavallium/datagen/CommonField.java index 9b6b1fa..c611d37 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/CommonField.java +++ b/datagen/src/main/java/it/cavallium/datagen/CommonField.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator; +package it.cavallium.datagen; public class CommonField { public final String fieldName; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/DataInitializer.java b/datagen/src/main/java/it/cavallium/datagen/DataInitializer.java similarity index 75% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/DataInitializer.java rename to datagen/src/main/java/it/cavallium/datagen/DataInitializer.java index 21526b8..7d422ba 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/DataInitializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/DataInitializer.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator; +package it.cavallium.datagen; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/DataSerializer.java b/datagen/src/main/java/it/cavallium/datagen/DataSerializer.java similarity index 88% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/DataSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/DataSerializer.java index b929dab..4fb3c3e 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/DataSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/DataSerializer.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator; +package it.cavallium.datagen; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/DataUpgrader.java b/datagen/src/main/java/it/cavallium/datagen/DataUpgrader.java similarity index 76% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/DataUpgrader.java rename to datagen/src/main/java/it/cavallium/datagen/DataUpgrader.java index 3355383..3179a32 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/DataUpgrader.java +++ b/datagen/src/main/java/it/cavallium/datagen/DataUpgrader.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator; +package it.cavallium.datagen; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/NativeNullable.java b/datagen/src/main/java/it/cavallium/datagen/NativeNullable.java similarity index 91% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/NativeNullable.java rename to datagen/src/main/java/it/cavallium/datagen/NativeNullable.java index e126b89..88ae94c 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/NativeNullable.java +++ b/datagen/src/main/java/it/cavallium/datagen/NativeNullable.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator; +package it.cavallium.datagen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/NotSerializableException.java b/datagen/src/main/java/it/cavallium/datagen/NotSerializableException.java similarity index 68% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/NotSerializableException.java rename to datagen/src/main/java/it/cavallium/datagen/NotSerializableException.java index 20114cf..5080856 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/NotSerializableException.java +++ b/datagen/src/main/java/it/cavallium/datagen/NotSerializableException.java @@ -1,3 +1,3 @@ -package it.cavallium.data.generator; +package it.cavallium.datagen; public class NotSerializableException extends UnsupportedOperationException {} diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/TypedNullable.java b/datagen/src/main/java/it/cavallium/datagen/TypedNullable.java similarity index 98% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/TypedNullable.java rename to datagen/src/main/java/it/cavallium/datagen/TypedNullable.java index 86d6417..c8e9928 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/TypedNullable.java +++ b/datagen/src/main/java/it/cavallium/datagen/TypedNullable.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator; +package it.cavallium.datagen; import java.util.Objects; import java.util.Optional; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayInt52Serializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayInt52Serializer.java similarity index 87% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayInt52Serializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayInt52Serializer.java index 4a60816..1100ce1 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayInt52Serializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayInt52Serializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import java.util.List; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayStringSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayStringSerializer.java similarity index 88% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayStringSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayStringSerializer.java index 7841f30..06f6564 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayStringSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayStringSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraybooleanSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArraybooleanSerializer.java similarity index 88% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraybooleanSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ArraybooleanSerializer.java index 4fe0dd6..e960ce0 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraybooleanSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArraybooleanSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import it.unimi.dsi.fastutil.booleans.BooleanList; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraybyteSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArraybyteSerializer.java similarity index 87% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraybyteSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ArraybyteSerializer.java index 00c0644..6c71e6e 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraybyteSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArraybyteSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import it.unimi.dsi.fastutil.bytes.ByteList; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraycharSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArraycharSerializer.java similarity index 87% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraycharSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ArraycharSerializer.java index dd1d527..e61a419 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraycharSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArraycharSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import it.unimi.dsi.fastutil.chars.CharList; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraydoubleSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArraydoubleSerializer.java similarity index 87% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraydoubleSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ArraydoubleSerializer.java index e5f1563..c82eb38 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraydoubleSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArraydoubleSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import it.unimi.dsi.fastutil.doubles.DoubleList; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayfloatSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayfloatSerializer.java similarity index 87% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayfloatSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayfloatSerializer.java index 72cb63c..bf9150c 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayfloatSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayfloatSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import it.unimi.dsi.fastutil.floats.FloatList; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayintSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayintSerializer.java similarity index 87% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayintSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayintSerializer.java index bac4bac..ce6669b 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayintSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayintSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import it.unimi.dsi.fastutil.ints.IntList; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraylongSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArraylongSerializer.java similarity index 87% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraylongSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ArraylongSerializer.java index f361aa6..3f1529c 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArraylongSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArraylongSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import it.unimi.dsi.fastutil.longs.LongList; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayshortSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayshortSerializer.java similarity index 87% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayshortSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayshortSerializer.java index abbf6ad..4ca5954 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ArrayshortSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ArrayshortSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import it.unimi.dsi.fastutil.shorts.ShortList; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/INullable.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/INullable.java similarity index 53% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/INullable.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/INullable.java index a4fb8c6..4cb02f1 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/INullable.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/INullable.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; public interface INullable { Object getNullable(); diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ImmutableWrappedArrayList.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/ImmutableWrappedArrayList.java similarity index 99% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ImmutableWrappedArrayList.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/ImmutableWrappedArrayList.java index ae81dba..fcfa364 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/ImmutableWrappedArrayList.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/ImmutableWrappedArrayList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; import it.unimi.dsi.fastutil.objects.AbstractObjectList; import it.unimi.dsi.fastutil.objects.ObjectArrays; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Int52.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Int52.java similarity index 98% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Int52.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Int52.java index 4951e0f..0b541cf 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Int52.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Int52.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; import java.lang.annotation.Native; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Int52Serializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Int52Serializer.java similarity index 94% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Int52Serializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Int52Serializer.java index 0d6da3d..25bf49c 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Int52Serializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Int52Serializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableInt52.java similarity index 94% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullableInt52.java index c5d60b4..e0cb547 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableInt52.java @@ -1,7 +1,7 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.NativeNullable; -import it.cavallium.data.generator.TypedNullable; +import it.cavallium.datagen.NativeNullable; +import it.cavallium.datagen.TypedNullable; import java.io.Serial; import java.io.Serializable; import java.util.Objects; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52Serializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableInt52Serializer.java similarity index 91% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52Serializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullableInt52Serializer.java index 7db6380..d0656b0 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableInt52Serializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableInt52Serializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableString.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableString.java similarity index 95% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableString.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullableString.java index 1d41aab..0404c25 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableString.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableString.java @@ -1,7 +1,7 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.NativeNullable; -import it.cavallium.data.generator.TypedNullable; +import it.cavallium.datagen.NativeNullable; +import it.cavallium.datagen.TypedNullable; import java.io.Serial; import java.io.Serializable; import java.util.Objects; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableStringSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableStringSerializer.java similarity index 90% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableStringSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullableStringSerializer.java index f690152..5c77522 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableStringSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableStringSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullableboolean.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullableboolean.java similarity index 96% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullableboolean.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Nullableboolean.java index 1f4ef1e..003c576 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullableboolean.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullableboolean.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.NativeNullable; +import it.cavallium.datagen.NativeNullable; import java.io.Serial; import java.io.Serializable; import java.util.Objects; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablebooleanSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullablebooleanSerializer.java similarity index 89% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablebooleanSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullablebooleanSerializer.java index 104444a..c2234e4 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablebooleanSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullablebooleanSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablebyte.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablebyte.java similarity index 96% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablebyte.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablebyte.java index ee3a84e..7a9cbb7 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablebyte.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablebyte.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.NativeNullable; +import it.cavallium.datagen.NativeNullable; import java.io.Serial; import java.io.Serializable; import java.util.Objects; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablebyteSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullablebyteSerializer.java similarity index 89% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablebyteSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullablebyteSerializer.java index 223f13e..bf26c51 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablebyteSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullablebyteSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablechar.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablechar.java similarity index 96% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablechar.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablechar.java index 94affde..123a96d 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablechar.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablechar.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.NativeNullable; +import it.cavallium.datagen.NativeNullable; import java.io.Serial; import java.io.Serializable; import java.util.Objects; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablecharSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullablecharSerializer.java similarity index 89% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablecharSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullablecharSerializer.java index 98e99e0..13e2d03 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablecharSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullablecharSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullabledouble.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullabledouble.java similarity index 96% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullabledouble.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Nullabledouble.java index d4942e7..8df1df0 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullabledouble.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullabledouble.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.NativeNullable; +import it.cavallium.datagen.NativeNullable; import java.io.Serial; import java.io.Serializable; import java.util.Objects; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullabledoubleSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullabledoubleSerializer.java similarity index 89% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullabledoubleSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullabledoubleSerializer.java index f409b2b..f9551c4 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullabledoubleSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullabledoubleSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablefloat.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablefloat.java similarity index 96% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablefloat.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablefloat.java index cf436b2..a7954a3 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablefloat.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablefloat.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.NativeNullable; +import it.cavallium.datagen.NativeNullable; import java.io.Serial; import java.io.Serializable; import java.util.Objects; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablefloatSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullablefloatSerializer.java similarity index 89% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablefloatSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullablefloatSerializer.java index aadf643..69d2f43 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablefloatSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullablefloatSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullableint.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullableint.java similarity index 96% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullableint.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Nullableint.java index b73079c..bcecb5f 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullableint.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullableint.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.NativeNullable; +import it.cavallium.datagen.NativeNullable; import java.io.Serial; import java.io.Serializable; import java.util.Objects; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableintSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableintSerializer.java similarity index 89% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableintSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullableintSerializer.java index 7074218..f5273c8 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableintSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableintSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablelong.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablelong.java similarity index 96% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablelong.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablelong.java index 2ed4d5f..4b35299 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullablelong.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullablelong.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.NativeNullable; +import it.cavallium.datagen.NativeNullable; import java.io.Serial; import java.io.Serializable; import java.util.Objects; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablelongSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullablelongSerializer.java similarity index 89% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablelongSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullablelongSerializer.java index 37281aa..f3ce793 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullablelongSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullablelongSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullableshort.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullableshort.java similarity index 96% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullableshort.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Nullableshort.java index 9d57b38..7f4eb18 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Nullableshort.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Nullableshort.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.NativeNullable; +import it.cavallium.datagen.NativeNullable; import java.io.Serial; import java.io.Serializable; import java.util.Objects; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableshortSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableshortSerializer.java similarity index 89% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableshortSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/NullableshortSerializer.java index 0603eaf..cce78f4 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/NullableshortSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/NullableshortSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import org.jetbrains.annotations.NotNull; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Serializers.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/Serializers.java similarity index 97% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Serializers.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/Serializers.java index 6065d5f..b28f281 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/Serializers.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/Serializers.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; public class Serializers { public static final StringSerializer StringSerializerInstance = new StringSerializer(); diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/StringSerializer.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/StringSerializer.java similarity index 85% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/StringSerializer.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/StringSerializer.java index 272b7f0..ac4f70c 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/StringSerializer.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/StringSerializer.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataSerializer; +import it.cavallium.datagen.DataSerializer; import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataOutput; import java.nio.charset.StandardCharsets; diff --git a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/UpgradeUtil.java b/datagen/src/main/java/it/cavallium/datagen/nativedata/UpgradeUtil.java similarity index 88% rename from data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/UpgradeUtil.java rename to datagen/src/main/java/it/cavallium/datagen/nativedata/UpgradeUtil.java index ee5b2f3..0fe73f0 100644 --- a/data-generator-runtime/src/main/java/it/cavallium/data/generator/nativedata/UpgradeUtil.java +++ b/datagen/src/main/java/it/cavallium/datagen/nativedata/UpgradeUtil.java @@ -1,6 +1,6 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; -import it.cavallium.data.generator.DataUpgrader; +import it.cavallium.datagen.DataUpgrader; import java.util.List; public class UpgradeUtil { diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/NullOutputStream.java b/datagen/src/main/java/it/cavallium/stream/NullOutputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/NullOutputStream.java rename to datagen/src/main/java/it/cavallium/stream/NullOutputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeByteArrayInputStream.java b/datagen/src/main/java/it/cavallium/stream/SafeByteArrayInputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeByteArrayInputStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeByteArrayInputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeByteArrayOutputStream.java b/datagen/src/main/java/it/cavallium/stream/SafeByteArrayOutputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeByteArrayOutputStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeByteArrayOutputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeDataInput.java b/datagen/src/main/java/it/cavallium/stream/SafeDataInput.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeDataInput.java rename to datagen/src/main/java/it/cavallium/stream/SafeDataInput.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeDataInputStream.java b/datagen/src/main/java/it/cavallium/stream/SafeDataInputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeDataInputStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeDataInputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeDataOutput.java b/datagen/src/main/java/it/cavallium/stream/SafeDataOutput.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeDataOutput.java rename to datagen/src/main/java/it/cavallium/stream/SafeDataOutput.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeDataOutputStream.java b/datagen/src/main/java/it/cavallium/stream/SafeDataOutputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeDataOutputStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeDataOutputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeFilterInputStream.java b/datagen/src/main/java/it/cavallium/stream/SafeFilterInputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeFilterInputStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeFilterInputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeFilterOutputStream.java b/datagen/src/main/java/it/cavallium/stream/SafeFilterOutputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeFilterOutputStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeFilterOutputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeInputStream.java b/datagen/src/main/java/it/cavallium/stream/SafeInputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeInputStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeInputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeMeasurableInputStream.java b/datagen/src/main/java/it/cavallium/stream/SafeMeasurableInputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeMeasurableInputStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeMeasurableInputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeMeasurableOutputStream.java b/datagen/src/main/java/it/cavallium/stream/SafeMeasurableOutputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeMeasurableOutputStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeMeasurableOutputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeMeasurableStream.java b/datagen/src/main/java/it/cavallium/stream/SafeMeasurableStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeMeasurableStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeMeasurableStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeOutputStream.java b/datagen/src/main/java/it/cavallium/stream/SafeOutputStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeOutputStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeOutputStream.java diff --git a/data-generator-runtime/src/main/java/it/cavallium/stream/SafeRepositionableStream.java b/datagen/src/main/java/it/cavallium/stream/SafeRepositionableStream.java similarity index 100% rename from data-generator-runtime/src/main/java/it/cavallium/stream/SafeRepositionableStream.java rename to datagen/src/main/java/it/cavallium/stream/SafeRepositionableStream.java diff --git a/data-generator-runtime/src/main/java/module-info.java b/datagen/src/main/java/module-info.java similarity index 52% rename from data-generator-runtime/src/main/java/module-info.java rename to datagen/src/main/java/module-info.java index e34c3e2..0cacbe9 100644 --- a/data-generator-runtime/src/main/java/module-info.java +++ b/datagen/src/main/java/module-info.java @@ -1,6 +1,6 @@ -module data.generator.runtime { - exports it.cavallium.data.generator.nativedata; - exports it.cavallium.data.generator; +module it.cavallium.datagen { + exports it.cavallium.datagen.nativedata; + exports it.cavallium.datagen; exports it.cavallium.stream; exports it.cavallium.buffer; diff --git a/data-generator-runtime/src/test/java/it/cavallium/buffer/TestBuffer.java b/datagen/src/test/java/it/cavallium/buffer/TestBuffer.java similarity index 99% rename from data-generator-runtime/src/test/java/it/cavallium/buffer/TestBuffer.java rename to datagen/src/test/java/it/cavallium/buffer/TestBuffer.java index bbc4867..d36ddc0 100644 --- a/data-generator-runtime/src/test/java/it/cavallium/buffer/TestBuffer.java +++ b/datagen/src/test/java/it/cavallium/buffer/TestBuffer.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.common.primitives.Chars; import com.google.common.primitives.Longs; import com.google.common.primitives.Shorts; -import it.cavallium.data.generator.nativedata.Int52; +import it.cavallium.datagen.nativedata.Int52; import it.cavallium.stream.SafeByteArrayInputStream; import it.cavallium.stream.SafeByteArrayOutputStream; import it.cavallium.stream.SafeDataOutputStream; diff --git a/data-generator-runtime/src/test/java/it/cavallium/data/generator/nativedata/TestInt52Serializer.java b/datagen/src/test/java/it/cavallium/datagen/nativedata/TestInt52Serializer.java similarity index 97% rename from data-generator-runtime/src/test/java/it/cavallium/data/generator/nativedata/TestInt52Serializer.java rename to datagen/src/test/java/it/cavallium/datagen/nativedata/TestInt52Serializer.java index ef0799b..fad831a 100644 --- a/data-generator-runtime/src/test/java/it/cavallium/data/generator/nativedata/TestInt52Serializer.java +++ b/datagen/src/test/java/it/cavallium/datagen/nativedata/TestInt52Serializer.java @@ -1,4 +1,4 @@ -package it.cavallium.data.generator.nativedata; +package it.cavallium.datagen.nativedata; import it.cavallium.stream.SafeByteArrayInputStream; import it.cavallium.stream.SafeByteArrayOutputStream; diff --git a/data-generator-runtime/src/test/java/it/cavallium/stream/TestInput.java b/datagen/src/test/java/it/cavallium/stream/TestInput.java similarity index 100% rename from data-generator-runtime/src/test/java/it/cavallium/stream/TestInput.java rename to datagen/src/test/java/it/cavallium/stream/TestInput.java diff --git a/data-generator-runtime/src/test/java/it/cavallium/stream/TestOutput.java b/datagen/src/test/java/it/cavallium/stream/TestOutput.java similarity index 99% rename from data-generator-runtime/src/test/java/it/cavallium/stream/TestOutput.java rename to datagen/src/test/java/it/cavallium/stream/TestOutput.java index 6676cd2..3248cf0 100644 --- a/data-generator-runtime/src/test/java/it/cavallium/stream/TestOutput.java +++ b/datagen/src/test/java/it/cavallium/stream/TestOutput.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import it.cavallium.buffer.Buf; import it.cavallium.buffer.BufDataOutput; -import it.cavallium.data.generator.nativedata.Int52; +import it.cavallium.datagen.nativedata.Int52; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/pom.xml b/pom.xml index f15e437..2cabe14 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - data-generator + datagen-parent it.cavallium ${revision} pom @@ -10,8 +10,8 @@ 1.0.0.0-SNAPSHOT - data-generator-plugin - data-generator-runtime + datagen-plugin + datagen