diff --git a/data-generator-plugin/pom.xml b/data-generator-plugin/pom.xml
index 3eec0b1..aa516fe 100644
--- a/data-generator-plugin/pom.xml
+++ b/data-generator-plugin/pom.xml
@@ -16,6 +16,7 @@
1.0.0.0-SNAPSHOT
UTF-8
+ 8.5.11
@@ -193,7 +194,7 @@
it.unimi.dsi
fastutil
- 8.5.11
+ ${fastutil.version}
org.apache.maven
diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/ClassConfiguration.java b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ClassConfiguration.java
similarity index 95%
rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/ClassConfiguration.java
rename to data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ClassConfiguration.java
index 7926f3a..dfc2379 100644
--- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/ClassConfiguration.java
+++ b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ClassConfiguration.java
@@ -1,4 +1,4 @@
-package it.cavallium.data.generator;
+package it.cavallium.data.generator.plugin;
import java.util.LinkedHashMap;
import java.util.Objects;
diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/ComputedVersion.java b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedVersion.java
similarity index 97%
rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/ComputedVersion.java
rename to data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedVersion.java
index 716fd4e..92afec9 100644
--- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/ComputedVersion.java
+++ b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ComputedVersion.java
@@ -1,4 +1,4 @@
-package it.cavallium.data.generator;
+package it.cavallium.data.generator.plugin;
import java.util.List;
import java.util.Map;
diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/ConfigUtils.java b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ConfigUtils.java
similarity index 93%
rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/ConfigUtils.java
rename to data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ConfigUtils.java
index 5024484..1702dab 100644
--- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/ConfigUtils.java
+++ b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/ConfigUtils.java
@@ -1,4 +1,4 @@
-package it.cavallium.data.generator;
+package it.cavallium.data.generator.plugin;
import java.util.Collection;
import java.util.Map;
diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/CustomTypesConfiguration.java b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/CustomTypesConfiguration.java
similarity index 97%
rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/CustomTypesConfiguration.java
rename to data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/CustomTypesConfiguration.java
index 86155f8..7cd1812 100644
--- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/CustomTypesConfiguration.java
+++ b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/CustomTypesConfiguration.java
@@ -1,4 +1,4 @@
-package it.cavallium.data.generator;
+package it.cavallium.data.generator.plugin;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.ParameterizedTypeName;
diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/DataModel.java b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DataModel.java
similarity index 95%
rename from data-generator-plugin/src/main/java/it/cavallium/data/generator/DataModel.java
rename to data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DataModel.java
index 78dcd0a..e34a65e 100644
--- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/DataModel.java
+++ b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DataModel.java
@@ -1,12 +1,9 @@
-package it.cavallium.data.generator;
+package it.cavallium.data.generator.plugin;
import static java.util.Objects.requireNonNull;
-import com.google.common.collect.Lists;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectCollection;
@@ -20,7 +17,6 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collector;
import java.util.stream.Collectors;
-import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.jetbrains.annotations.Nullable;
@@ -98,7 +94,6 @@ public class DataModel {
// Build versions sequence
List rawVersionsSequence = new ArrayList<>();
int versionsCount = 0;
- IntList versionsSequence = IntStream.range(0, versionsCount).boxed().collect(Collectors.toCollection(IntArrayList::new));
Int2ObjectMap versionToName = new Int2ObjectOpenHashMap<>();
Object2IntMap nameToVersion = new Object2IntOpenHashMap<>();
{
@@ -149,12 +144,6 @@ public class DataModel {
Int2ObjectMap versions = new Int2ObjectOpenHashMap<>();
rawVersions.forEach((k, v) -> versions.put(nameToVersion.getInt(k), new ParsedVersion(v)));
- // Compute the cartesian product of version * base type
- record VersionAndType(int version, String type) {}
- List versionAndBaseType = Lists.