Rename package

This commit is contained in:
Andrea Cavalli 2023-04-20 10:11:12 +02:00
parent f9e5657a83
commit 938b404ec7
140 changed files with 329 additions and 335 deletions

View File

@ -5,13 +5,13 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>Data generator</name> <name>Data generator</name>
<artifactId>data-generator-plugin</artifactId> <artifactId>datagen-plugin</artifactId>
<version>${revision}</version> <version>${revision}</version>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<parent> <parent>
<groupId>it.cavallium</groupId> <groupId>it.cavallium</groupId>
<version>${revision}</version> <version>${revision}</version>
<artifactId>data-generator</artifactId> <artifactId>datagen-parent</artifactId>
</parent> </parent>
<properties> <properties>
<revision>1.0.0.0-SNAPSHOT</revision> <revision>1.0.0.0-SNAPSHOT</revision>
@ -269,7 +269,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>it.cavallium</groupId> <groupId>it.cavallium</groupId>
<artifactId>data-generator-runtime</artifactId> <artifactId>datagen</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Objects; import java.util.Objects;

View File

@ -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.CREATE;
import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING; import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;

View File

@ -1,8 +1,8 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.TypeName; 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.LinkedHashMap;
import java.util.stream.Stream; import java.util.stream.Stream;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;

View File

@ -1,10 +1,10 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeName; 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.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Stream; import java.util.stream.Stream;

View File

@ -1,19 +1,19 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeName;
import it.cavallium.data.generator.nativedata.ArrayInt52Serializer; import it.cavallium.datagen.nativedata.ArrayInt52Serializer;
import it.cavallium.data.generator.nativedata.ArrayStringSerializer; import it.cavallium.datagen.nativedata.ArrayStringSerializer;
import it.cavallium.data.generator.nativedata.ArraybooleanSerializer; import it.cavallium.datagen.nativedata.ArraybooleanSerializer;
import it.cavallium.data.generator.nativedata.ArraybyteSerializer; import it.cavallium.datagen.nativedata.ArraybyteSerializer;
import it.cavallium.data.generator.nativedata.ArraycharSerializer; import it.cavallium.datagen.nativedata.ArraycharSerializer;
import it.cavallium.data.generator.nativedata.ArraydoubleSerializer; import it.cavallium.datagen.nativedata.ArraydoubleSerializer;
import it.cavallium.data.generator.nativedata.ArrayfloatSerializer; import it.cavallium.datagen.nativedata.ArrayfloatSerializer;
import it.cavallium.data.generator.nativedata.ArrayintSerializer; import it.cavallium.datagen.nativedata.ArrayintSerializer;
import it.cavallium.data.generator.nativedata.ArraylongSerializer; import it.cavallium.datagen.nativedata.ArraylongSerializer;
import it.cavallium.data.generator.nativedata.ArrayshortSerializer; import it.cavallium.datagen.nativedata.ArrayshortSerializer;
import it.cavallium.data.generator.nativedata.Serializers; import it.cavallium.datagen.nativedata.Serializers;
import it.unimi.dsi.fastutil.booleans.BooleanList; import it.unimi.dsi.fastutil.booleans.BooleanList;
import it.unimi.dsi.fastutil.bytes.ByteList; import it.unimi.dsi.fastutil.bytes.ByteList;
import it.unimi.dsi.fastutil.chars.CharList; import it.unimi.dsi.fastutil.chars.CharList;

View File

@ -1,11 +1,11 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeName;
import it.cavallium.data.generator.nativedata.UpgradeUtil; import it.cavallium.datagen.nativedata.UpgradeUtil;
import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;

View File

@ -1,8 +1,8 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock; 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.LinkedHashMap;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Stream; import java.util.stream.Stream;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.ParameterizedTypeName;
@ -64,7 +64,7 @@ public final class ComputedTypeCustom implements ComputedType {
return false; 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)) { if (!Objects.equals(type, that.type)) {
return false; return false;

View File

@ -1,10 +1,11 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeName;
import it.cavallium.data.generator.nativedata.Int52Serializer; import it.cavallium.datagen.nativedata.Int52Serializer;
import it.cavallium.data.generator.nativedata.Serializers; import it.cavallium.datagen.nativedata.Serializers;
import it.cavallium.data.generator.nativedata.StringSerializer; import it.cavallium.datagen.nativedata.StringSerializer;
import it.cavallium.datagen.nativedata.Int52;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
@ -40,7 +41,7 @@ public final class ComputedTypeNative implements ComputedType {
case "float" -> TypeName.FLOAT; case "float" -> TypeName.FLOAT;
case "double" -> TypeName.DOUBLE; case "double" -> TypeName.DOUBLE;
case "byte" -> TypeName.BYTE; 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"); default -> throw new UnsupportedOperationException(type + " is not a known native type");
}; };
} }
@ -81,7 +82,7 @@ public final class ComputedTypeNative implements ComputedType {
return false; 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); return Objects.equals(type, that.type);
} }
@ -101,10 +102,10 @@ public final class ComputedTypeNative implements ComputedType {
return computedTypeSupplier.getDependents(getName()); return computedTypeSupplier.getDependents(getName());
} }
public static List<it.cavallium.data.generator.plugin.ComputedTypeNative> get(ComputedTypeSupplier computedTypeSupplier) { public static List<ComputedTypeNative> get(ComputedTypeSupplier computedTypeSupplier) {
return Stream return Stream
.of("String", "boolean", "short", "char", "int", "long", "float", "double", "byte", "Int52") .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(); .toList();
} }

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;

View File

@ -1,9 +1,9 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.TypeName; 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.Objects;
import java.util.stream.Stream; import java.util.stream.Stream;

View File

@ -1,28 +1,28 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeName;
import it.cavallium.data.generator.nativedata.NullableInt52; import it.cavallium.datagen.nativedata.NullableInt52;
import it.cavallium.data.generator.nativedata.NullableInt52Serializer; import it.cavallium.datagen.nativedata.NullableInt52Serializer;
import it.cavallium.data.generator.nativedata.NullableString; import it.cavallium.datagen.nativedata.NullableString;
import it.cavallium.data.generator.nativedata.NullableStringSerializer; import it.cavallium.datagen.nativedata.NullableStringSerializer;
import it.cavallium.data.generator.nativedata.Nullableboolean; import it.cavallium.datagen.nativedata.Nullableboolean;
import it.cavallium.data.generator.nativedata.NullablebooleanSerializer; import it.cavallium.datagen.nativedata.NullablebooleanSerializer;
import it.cavallium.data.generator.nativedata.Nullablebyte; import it.cavallium.datagen.nativedata.Nullablebyte;
import it.cavallium.data.generator.nativedata.NullablebyteSerializer; import it.cavallium.datagen.nativedata.NullablebyteSerializer;
import it.cavallium.data.generator.nativedata.Nullablechar; import it.cavallium.datagen.nativedata.Nullablechar;
import it.cavallium.data.generator.nativedata.NullablecharSerializer; import it.cavallium.datagen.nativedata.NullablecharSerializer;
import it.cavallium.data.generator.nativedata.Nullabledouble; import it.cavallium.datagen.nativedata.Nullabledouble;
import it.cavallium.data.generator.nativedata.NullabledoubleSerializer; import it.cavallium.datagen.nativedata.NullabledoubleSerializer;
import it.cavallium.data.generator.nativedata.Nullablefloat; import it.cavallium.datagen.nativedata.Nullablefloat;
import it.cavallium.data.generator.nativedata.NullablefloatSerializer; import it.cavallium.datagen.nativedata.NullablefloatSerializer;
import it.cavallium.data.generator.nativedata.Nullableint; import it.cavallium.datagen.nativedata.Nullableint;
import it.cavallium.data.generator.nativedata.NullableintSerializer; import it.cavallium.datagen.nativedata.NullableintSerializer;
import it.cavallium.data.generator.nativedata.Nullablelong; import it.cavallium.datagen.nativedata.Nullablelong;
import it.cavallium.data.generator.nativedata.NullablelongSerializer; import it.cavallium.datagen.nativedata.NullablelongSerializer;
import it.cavallium.data.generator.nativedata.Nullableshort; import it.cavallium.datagen.nativedata.Nullableshort;
import it.cavallium.data.generator.nativedata.NullableshortSerializer; import it.cavallium.datagen.nativedata.NullableshortSerializer;
import it.cavallium.data.generator.nativedata.Serializers; import it.cavallium.datagen.nativedata.Serializers;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Stream; import java.util.stream.Stream;

View File

@ -1,10 +1,10 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeName;
import it.cavallium.data.generator.nativedata.UpgradeUtil; import it.cavallium.datagen.nativedata.UpgradeUtil;
import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Stream; import java.util.stream.Stream;

View File

@ -1,8 +1,8 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock; 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.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
@ -33,9 +33,9 @@ public final class ComputedTypeSuper implements VersionedComputedType {
} }
@Override @Override
public it.cavallium.data.generator.plugin.ComputedTypeSuper withChangeAtVersion(ComputedVersion version, public ComputedTypeSuper withChangeAtVersion(ComputedVersion version,
VersionChangeChecker versionChangeChecker, LinkedHashMap<String, VersionedType> data) { VersionChangeChecker versionChangeChecker, LinkedHashMap<String, VersionedType> 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(), subTypes.stream().map(subType -> subType.withVersionIfChanged(version, versionChangeChecker)).toList(),
computedTypeSupplier computedTypeSupplier
); );
@ -62,7 +62,7 @@ public final class ComputedTypeSuper implements VersionedComputedType {
return false; 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)) { if (!Objects.equals(type, that.type)) {
return false; return false;

View File

@ -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.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

View File

@ -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.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.StringJoiner;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class ComputedVersion implements Comparable<ComputedVersion> { public class ComputedVersion implements Comparable<ComputedVersion> {

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Objects; import java.util.Objects;

View File

@ -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.Objects.requireNonNull;
import static java.util.function.Function.identity; 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.Int2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Objects; import java.util.Objects;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeName;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Objects; import java.util.Objects;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Objects; import java.util.Objects;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

View File

@ -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.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;

View File

@ -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.HashMap;
import java.util.HashSet; import java.util.HashSet;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Objects; import java.util.Objects;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
import java.util.List; import java.util.List;

View File

@ -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.CREATE;
import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING; 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.ParameterizedTypeName;
import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeName;
import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeSpec.Builder;
import it.cavallium.data.generator.plugin.ClassGenerator.ClassGeneratorParams; import it.cavallium.datagen.nativedata.Int52;
import it.cavallium.data.generator.plugin.classgen.GenBaseType; import it.cavallium.datagen.plugin.ClassGenerator.ClassGeneratorParams;
import it.cavallium.data.generator.plugin.classgen.GenCurrentVersion; import it.cavallium.datagen.plugin.classgen.GenBaseType;
import it.cavallium.data.generator.plugin.classgen.GenDataBaseX; import it.cavallium.datagen.plugin.classgen.GenCurrentVersion;
import it.cavallium.data.generator.plugin.classgen.GenDataSuperX; import it.cavallium.datagen.plugin.classgen.GenDataBaseX;
import it.cavallium.data.generator.plugin.classgen.GenIBaseType; import it.cavallium.datagen.plugin.classgen.GenDataSuperX;
import it.cavallium.data.generator.plugin.classgen.GenINullableBaseType; import it.cavallium.datagen.plugin.classgen.GenIBaseType;
import it.cavallium.data.generator.plugin.classgen.GenINullableIType; import it.cavallium.datagen.plugin.classgen.GenINullableBaseType;
import it.cavallium.data.generator.plugin.classgen.GenINullableSuperType; import it.cavallium.datagen.plugin.classgen.GenINullableIType;
import it.cavallium.data.generator.plugin.classgen.GenIType; import it.cavallium.datagen.plugin.classgen.GenINullableSuperType;
import it.cavallium.data.generator.plugin.classgen.GenIVersion; import it.cavallium.datagen.plugin.classgen.GenIType;
import it.cavallium.data.generator.plugin.classgen.GenNullableX; import it.cavallium.datagen.plugin.classgen.GenIVersion;
import it.cavallium.data.generator.plugin.classgen.GenSerializerArrayX; import it.cavallium.datagen.plugin.classgen.GenNullableX;
import it.cavallium.data.generator.plugin.classgen.GenSerializerBaseX; import it.cavallium.datagen.plugin.classgen.GenSerializerArrayX;
import it.cavallium.data.generator.plugin.classgen.GenSerializerNullableX; import it.cavallium.datagen.plugin.classgen.GenSerializerBaseX;
import it.cavallium.data.generator.plugin.classgen.GenSerializerSuperX; import it.cavallium.datagen.plugin.classgen.GenSerializerNullableX;
import it.cavallium.data.generator.plugin.classgen.GenSuperType; import it.cavallium.datagen.plugin.classgen.GenSerializerSuperX;
import it.cavallium.data.generator.plugin.classgen.GenUpgraderBaseX; import it.cavallium.datagen.plugin.classgen.GenSuperType;
import it.cavallium.data.generator.plugin.classgen.GenUpgraderSuperX; import it.cavallium.datagen.plugin.classgen.GenUpgraderBaseX;
import it.cavallium.data.generator.plugin.classgen.GenVersion; import it.cavallium.datagen.plugin.classgen.GenUpgraderSuperX;
import it.cavallium.data.generator.plugin.classgen.GenVersions; import it.cavallium.datagen.plugin.classgen.GenVersion;
import it.cavallium.datagen.plugin.classgen.GenVersions;
import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import it.unimi.dsi.fastutil.booleans.BooleanList; import it.unimi.dsi.fastutil.booleans.BooleanList;
@ -252,8 +253,8 @@ public class SourcesGenerator {
private static String getSpecialNativePackage(String specialNativeType) { private static String getSpecialNativePackage(String specialNativeType) {
//noinspection SwitchStatementWithTooFewBranches //noinspection SwitchStatementWithTooFewBranches
return switch (specialNativeType) { return switch (specialNativeType) {
case "Int52" -> "it.cavallium.data.generator.nativedata"; case "Int52" -> Int52.class.getPackageName();
default -> "java.lang"; default -> Integer.class.getPackageName();
}; };
} }

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import static java.lang.Boolean.parseBoolean; import static java.lang.Boolean.parseBoolean;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
public interface TransformationConfiguration { public interface TransformationConfiguration {

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Objects; import java.util.Objects;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Set; import java.util.Set;

View File

@ -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.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectMap;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Objects; import java.util.Objects;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.plugin; package it.cavallium.datagen.plugin;
import java.util.Objects; import java.util.Objects;

View File

@ -1,7 +1,7 @@
package it.cavallium.data.generator.plugin.classgen; package it.cavallium.datagen.plugin.classgen;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -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.ClassName;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
@ -11,11 +11,10 @@ import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeSpec.Builder;
import com.squareup.javapoet.TypeVariableName; import com.squareup.javapoet.TypeVariableName;
import com.squareup.javapoet.WildcardTypeName; import com.squareup.javapoet.WildcardTypeName;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedType; import it.cavallium.datagen.plugin.ComputedType;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataInput;
import java.io.IOException;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Stream; import java.util.stream.Stream;

View File

@ -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.ClassName;
import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import io.soabase.recordbuilder.core.RecordBuilder; import io.soabase.recordbuilder.core.RecordBuilder;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedTypeBase; import it.cavallium.datagen.plugin.ComputedTypeBase;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -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.ClassName;
import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedTypeSuper; import it.cavallium.datagen.plugin.ComputedTypeSuper;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

View File

@ -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.ClassName;
import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -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.ClassName;
import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -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.ClassName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import it.cavallium.data.generator.nativedata.INullable; import it.cavallium.datagen.nativedata.INullable;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -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.ClassName;
import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -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.ClassName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.io.Serializable; import java.io.Serializable;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -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.ClassName;
import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.MethodSpec;
@ -7,8 +7,8 @@ import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeVariableName; import com.squareup.javapoet.TypeVariableName;
import it.cavallium.data.generator.DataSerializer; import it.cavallium.datagen.DataSerializer;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -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.ClassName;
import com.squareup.javapoet.FieldSpec; import com.squareup.javapoet.FieldSpec;
@ -6,16 +6,16 @@ import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import it.cavallium.data.generator.TypedNullable; import it.cavallium.datagen.TypedNullable;
import it.cavallium.data.generator.nativedata.INullable; import it.cavallium.datagen.nativedata.INullable;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedTypeBase; import it.cavallium.datagen.plugin.ComputedTypeBase;
import it.cavallium.data.generator.plugin.ComputedTypeCustom; import it.cavallium.datagen.plugin.ComputedTypeCustom;
import it.cavallium.data.generator.plugin.ComputedTypeNullable; import it.cavallium.datagen.plugin.ComputedTypeNullable;
import it.cavallium.data.generator.plugin.ComputedTypeNullableFixed; import it.cavallium.datagen.plugin.ComputedTypeNullableFixed;
import it.cavallium.data.generator.plugin.ComputedTypeNullableVersioned; import it.cavallium.datagen.plugin.ComputedTypeNullableVersioned;
import it.cavallium.data.generator.plugin.ComputedTypeSuper; import it.cavallium.datagen.plugin.ComputedTypeSuper;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -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.ArrayTypeName;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
@ -7,14 +7,14 @@ import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeSpec.Builder;
import it.cavallium.data.generator.DataSerializer; import it.cavallium.datagen.DataSerializer;
import it.cavallium.data.generator.NotSerializableException; import it.cavallium.datagen.NotSerializableException;
import it.cavallium.data.generator.nativedata.ImmutableWrappedArrayList; import it.cavallium.datagen.nativedata.ImmutableWrappedArrayList;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedTypeArray; import it.cavallium.datagen.plugin.ComputedTypeArray;
import it.cavallium.data.generator.plugin.ComputedTypeArrayFixed; import it.cavallium.datagen.plugin.ComputedTypeArrayFixed;
import it.cavallium.data.generator.plugin.ComputedTypeArrayVersioned; import it.cavallium.datagen.plugin.ComputedTypeArrayVersioned;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import java.util.Objects; import java.util.Objects;

View File

@ -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.ClassName;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
@ -7,11 +7,11 @@ import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeSpec.Builder;
import it.cavallium.data.generator.DataSerializer; import it.cavallium.datagen.DataSerializer;
import it.cavallium.data.generator.NotSerializableException; import it.cavallium.datagen.NotSerializableException;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedTypeBase; import it.cavallium.datagen.plugin.ComputedTypeBase;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import java.util.Objects; import java.util.Objects;

View File

@ -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.ClassName;
import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.MethodSpec;
@ -6,13 +6,13 @@ import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeSpec.Builder;
import it.cavallium.data.generator.DataSerializer; import it.cavallium.datagen.DataSerializer;
import it.cavallium.data.generator.NotSerializableException; import it.cavallium.datagen.NotSerializableException;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedTypeNullable; import it.cavallium.datagen.plugin.ComputedTypeNullable;
import it.cavallium.data.generator.plugin.ComputedTypeNullableFixed; import it.cavallium.datagen.plugin.ComputedTypeNullableFixed;
import it.cavallium.data.generator.plugin.ComputedTypeNullableVersioned; import it.cavallium.datagen.plugin.ComputedTypeNullableVersioned;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import java.util.Objects; import java.util.Objects;

View File

@ -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.ClassName;
import com.squareup.javapoet.MethodSpec; import com.squareup.javapoet.MethodSpec;
@ -6,12 +6,12 @@ import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeSpec.Builder;
import it.cavallium.data.generator.DataSerializer; import it.cavallium.datagen.DataSerializer;
import it.cavallium.data.generator.NotSerializableException; import it.cavallium.datagen.NotSerializableException;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedType; import it.cavallium.datagen.plugin.ComputedType;
import it.cavallium.data.generator.plugin.ComputedTypeSuper; import it.cavallium.datagen.plugin.ComputedTypeSuper;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import java.util.Objects; import java.util.Objects;

View File

@ -1,7 +1,7 @@
package it.cavallium.data.generator.plugin.classgen; package it.cavallium.datagen.plugin.classgen;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -1,6 +1,4 @@
package it.cavallium.data.generator.plugin.classgen; package it.cavallium.datagen.plugin.classgen;
import static it.cavallium.data.generator.plugin.DataModel.fixType;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
@ -11,19 +9,19 @@ import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeSpec.Builder;
import it.cavallium.data.generator.DataInitializer; import it.cavallium.datagen.DataInitializer;
import it.cavallium.data.generator.DataUpgrader; import it.cavallium.datagen.DataUpgrader;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedType; import it.cavallium.datagen.plugin.ComputedType;
import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType;
import it.cavallium.data.generator.plugin.ComputedTypeBase; import it.cavallium.datagen.plugin.ComputedTypeBase;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import it.cavallium.data.generator.plugin.MoveDataConfiguration; import it.cavallium.datagen.plugin.MoveDataConfiguration;
import it.cavallium.data.generator.plugin.NewDataConfiguration; import it.cavallium.datagen.plugin.NewDataConfiguration;
import it.cavallium.data.generator.plugin.RemoveDataConfiguration; import it.cavallium.datagen.plugin.RemoveDataConfiguration;
import it.cavallium.data.generator.plugin.TransformationConfiguration; import it.cavallium.datagen.plugin.TransformationConfiguration;
import it.cavallium.data.generator.plugin.UpgradeDataConfiguration; import it.cavallium.datagen.plugin.UpgradeDataConfiguration;
import java.io.IOException; import it.cavallium.datagen.plugin.DataModel;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -117,7 +115,7 @@ public class GenUpgraderBaseX extends ClassGenerator {
var i = e.getKey(); var i = e.getKey();
var newDataConfiguration = e.getValue(); var newDataConfiguration = e.getValue();
var computedTypes = dataModel.getComputedTypes(nextTypeBase.getVersion()); 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 initializerClass = ClassName.bestGuess(newDataConfiguration.initializer);
var genericInitializerClass = ParameterizedTypeName.get(ClassName.get(DataInitializer.class), var genericInitializerClass = ParameterizedTypeName.get(ClassName.get(DataInitializer.class),
newFieldType.getJTypeName(basePackageName).box() newFieldType.getJTypeName(basePackageName).box()
@ -147,7 +145,7 @@ public class GenUpgraderBaseX extends ClassGenerator {
fieldName = moveDataConfiguration.to; fieldName = moveDataConfiguration.to;
} else if (transformation instanceof NewDataConfiguration newDataConfiguration) { } else if (transformation instanceof NewDataConfiguration newDataConfiguration) {
if (newDataConfiguration.to.equals(fieldName)) { 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( throw new IllegalStateException(
"New field " + typeBase.getName() + "." + fieldName + " of type \"" + type + "\" at version \"" + nextTypeBase.getVersion() "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 \"" + "\" 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 upgraderClass = ClassName.bestGuess(upgradeDataConfiguration.upgrader);
var cb = CodeBlock.builder(); var cb = CodeBlock.builder();
var newFieldType = Objects 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), var genericUpgraderClass = ParameterizedTypeName.get(ClassName.get(DataUpgrader.class),
fieldType.getJTypeName(basePackageName).box(), fieldType.getJTypeName(basePackageName).box(),
newFieldType.getJTypeName(basePackageName).box() newFieldType.getJTypeName(basePackageName).box()

View File

@ -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.ClassName;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
@ -7,12 +7,12 @@ import com.squareup.javapoet.ParameterSpec;
import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeSpec.Builder;
import it.cavallium.data.generator.DataUpgrader; import it.cavallium.datagen.DataUpgrader;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedType; import it.cavallium.datagen.plugin.ComputedType;
import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType;
import it.cavallium.data.generator.plugin.ComputedTypeSuper; import it.cavallium.datagen.plugin.ComputedTypeSuper;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -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.ClassName;
import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.CodeBlock;
@ -9,16 +9,16 @@ import com.squareup.javapoet.TypeName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeSpec.Builder; import com.squareup.javapoet.TypeSpec.Builder;
import com.squareup.javapoet.TypeVariableName; import com.squareup.javapoet.TypeVariableName;
import it.cavallium.data.generator.DataSerializer; import it.cavallium.datagen.DataSerializer;
import it.cavallium.data.generator.DataUpgrader; import it.cavallium.datagen.DataUpgrader;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedType.VersionedComputedType; import it.cavallium.datagen.plugin.ComputedType.VersionedComputedType;
import it.cavallium.data.generator.plugin.ComputedTypeArrayFixed; import it.cavallium.datagen.plugin.ComputedTypeArrayFixed;
import it.cavallium.data.generator.plugin.ComputedTypeBase; import it.cavallium.datagen.plugin.ComputedTypeBase;
import it.cavallium.data.generator.plugin.ComputedTypeCustom; import it.cavallium.datagen.plugin.ComputedTypeCustom;
import it.cavallium.data.generator.plugin.ComputedTypeNullableFixed; import it.cavallium.datagen.plugin.ComputedTypeNullableFixed;
import it.cavallium.data.generator.plugin.ComputedTypeSuper; import it.cavallium.datagen.plugin.ComputedTypeSuper;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -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.ArrayTypeName;
import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ClassName;
@ -6,11 +6,9 @@ import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.FieldSpec; import com.squareup.javapoet.FieldSpec;
import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeName;
import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeSpec;
import it.cavallium.data.generator.plugin.ClassGenerator; import it.cavallium.datagen.plugin.ClassGenerator;
import it.cavallium.data.generator.plugin.ComputedVersion; import it.cavallium.datagen.plugin.ComputedVersion;
import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;

View File

@ -5,13 +5,13 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>Data generator runtime</name> <name>Data generator runtime</name>
<artifactId>data-generator-runtime</artifactId> <artifactId>datagen</artifactId>
<version>${revision}</version> <version>${revision}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
<groupId>it.cavallium</groupId> <groupId>it.cavallium</groupId>
<version>${revision}</version> <version>${revision}</version>
<artifactId>data-generator</artifactId> <artifactId>datagen-parent</artifactId>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<properties> <properties>

View File

@ -1,6 +1,6 @@
package it.cavallium.buffer; 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.SafeByteArrayInputStream;
import it.cavallium.stream.SafeByteArrayOutputStream; import it.cavallium.stream.SafeByteArrayOutputStream;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator; package it.cavallium.datagen;
public class CommonField { public class CommonField {
public final String fieldName; public final String fieldName;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator; package it.cavallium.datagen;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator; package it.cavallium.datagen;
import it.cavallium.stream.SafeDataInput; import it.cavallium.stream.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator; package it.cavallium.datagen;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator; package it.cavallium.datagen;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

View File

@ -1,3 +1,3 @@
package it.cavallium.data.generator; package it.cavallium.datagen;
public class NotSerializableException extends UnsupportedOperationException {} public class NotSerializableException extends UnsupportedOperationException {}

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator; package it.cavallium.datagen;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import java.util.List; import java.util.List;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import it.unimi.dsi.fastutil.booleans.BooleanList; import it.unimi.dsi.fastutil.booleans.BooleanList;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import it.unimi.dsi.fastutil.bytes.ByteList; import it.unimi.dsi.fastutil.bytes.ByteList;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import it.unimi.dsi.fastutil.chars.CharList; import it.unimi.dsi.fastutil.chars.CharList;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import it.unimi.dsi.fastutil.doubles.DoubleList; import it.unimi.dsi.fastutil.doubles.DoubleList;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import it.unimi.dsi.fastutil.floats.FloatList; import it.unimi.dsi.fastutil.floats.FloatList;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntList;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import it.unimi.dsi.fastutil.longs.LongList; import it.unimi.dsi.fastutil.longs.LongList;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import it.unimi.dsi.fastutil.shorts.ShortList; import it.unimi.dsi.fastutil.shorts.ShortList;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.nativedata; package it.cavallium.datagen.nativedata;
public interface INullable { public interface INullable {
Object getNullable(); Object getNullable();

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.AbstractObjectList;
import it.unimi.dsi.fastutil.objects.ObjectArrays; import it.unimi.dsi.fastutil.objects.ObjectArrays;

View File

@ -1,4 +1,4 @@
package it.cavallium.data.generator.nativedata; package it.cavallium.datagen.nativedata;
import java.lang.annotation.Native; import java.lang.annotation.Native;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -1,7 +1,7 @@
package it.cavallium.data.generator.nativedata; package it.cavallium.datagen.nativedata;
import it.cavallium.data.generator.NativeNullable; import it.cavallium.datagen.NativeNullable;
import it.cavallium.data.generator.TypedNullable; import it.cavallium.datagen.TypedNullable;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects; import java.util.Objects;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

View File

@ -1,7 +1,7 @@
package it.cavallium.data.generator.nativedata; package it.cavallium.datagen.nativedata;
import it.cavallium.data.generator.NativeNullable; import it.cavallium.datagen.NativeNullable;
import it.cavallium.data.generator.TypedNullable; import it.cavallium.datagen.TypedNullable;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects; import java.util.Objects;

View File

@ -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.SafeDataInput;
import it.cavallium.stream.SafeDataOutput; import it.cavallium.stream.SafeDataOutput;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

Some files were not shown because too many files have changed in this diff Show More