andreacavalli/data-generator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Andrea Cavalli 2023-04-20 20:22:07 +02:00
parent 938b404ec7
commit 16b22d2e49
8 changed files with 85 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
datagen-plugin/src/main/java/it/cavallium/datagen/plugin/DataModel.java
View File

@ -213,11 +213,20 @@ public class DataModel {
if (definition.isEmpty()) {
throw new IllegalArgumentException(transformCoordinate + " refers to an unknown field: " + t.from);
}
var prevDef = tryInsertAtIndex(transformClass.data,
String prevDef;
if (t.index != null) {
prevDef = tryInsertAtIndex(transformClass.data,
t.to,
definition.get().getValue(),
t.index
);
} else {
prevDef = tryInsertAtIndex(transformClass.data,
t.to,
definition.get().getValue(),
definition.get().getKey()
);
}
if (prevDef != null) {
throw new IllegalArgumentException(
transformCoordinate + " tries to overwrite the existing field \"" + t.to + "\" of value \""

6
datagen-plugin/src/main/java/it/cavallium/datagen/plugin/MavenPlugin.java
View File

@ -29,6 +29,9 @@ public class MavenPlugin extends AbstractMojo {
@Parameter( required = true, defaultValue = "false")
private String useRecordBuilder;
@Parameter(defaultValue = "false")
private String generateTestResources;
/**
* @parameter default-value="${project}"
* @required
@ -41,7 +44,8 @@ public class MavenPlugin extends AbstractMojo {
public void execute() throws MojoExecutionException, MojoFailureException {
try {
SourcesGenerator sourcesGenerator = SourcesGenerator.load(configPath.toPath());
Path genRecordsPath = project.getBasedir().getAbsoluteFile().toPath().resolve("target").resolve("generated-sources").resolve("database-classes");
project.hasLifecyclePhase("generate-test-sources");
Path genRecordsPath = project.getBasedir().getAbsoluteFile().toPath().resolve("target").resolve(Boolean.parseBoolean(generateTestResources) ? "generated-test-sources" : "generated-sources").resolve("database-classes");
Path outPath = genRecordsPath.resolve("java");
this.project.addCompileSourceRoot(outPath.toString());

10
datagen-plugin/src/main/java/it/cavallium/datagen/plugin/MoveDataConfiguration.java
View File

@ -1,12 +1,15 @@
package it.cavallium.datagen.plugin;
import java.util.Objects;
import org.jetbrains.annotations.Nullable;
public final class MoveDataConfiguration implements TransformationConfiguration {
public String transformClass;
public String from;
public String to;
@Nullable
public Integer index;
@Override
public String getTransformClass() {
@ -27,9 +30,8 @@ public final class MoveDataConfiguration implements TransformationConfiguration
return false;
}
MoveDataConfiguration that = (MoveDataConfiguration) o;
return Objects.equals(transformClass, that.transformClass) && Objects.equals(from, that.from) && Objects.equals(to,
that.to
);
return Objects.equals(transformClass, that.transformClass) && Objects.equals(from, that.from)
&& Objects.equals(to, that.to) && Objects.equals(index, that.index);
}
@Override
@ -38,6 +40,7 @@ public final class MoveDataConfiguration implements TransformationConfiguration
hash += ConfigUtils.hashCode(transformClass);
hash += ConfigUtils.hashCode(from);
hash += ConfigUtils.hashCode(to);
hash += ConfigUtils.hashCode(index);
return hash;
}
@ -46,6 +49,7 @@ public final class MoveDataConfiguration implements TransformationConfiguration
if (this.transformClass != null) c.transformClass = this.transformClass;
if (this.from != null) c.from = this.from;
if (this.to != null) c.to = this.to;
if (this.index != null) c.index = this.index;
return c;
}
}

27
datagen-plugin/src/main/java/it/cavallium/datagen/plugin/classgen/GenSerializerArrayX.java
View File

@ -24,6 +24,11 @@ import org.jetbrains.annotations.NotNull;
public class GenSerializerArrayX extends ClassGenerator {
/**
* Enabling this option can slow down deserialization updates
*/
private static final boolean USE_NATIVE_TYPED_ARRAYS = false;
public GenSerializerArrayX(ClassGeneratorParams params) {
super(params);
}
@ -96,23 +101,37 @@ public class GenSerializerArrayX extends ClassGenerator {
method.addModifiers(Modifier.PUBLIC, Modifier.FINAL);
var typeArrayClassName = typeArray.getJTypeName(basePackageName);
var arrayComponentTypeName = typeArray.getBase().getJTypeName(basePackageName);
var typedArrayTypeName = ArrayTypeName.of(arrayComponentTypeName);
method.returns(typeArrayClassName);
method.addAnnotation(NotNull.class);
method.addParameter(ParameterSpec.builder(SafeDataInput.class, "in").build());
method.addStatement("int sz = in.readInt()");
var arrayTypeName = ArrayTypeName.of(typeArray.getBase().getJTypeName(basePackageName));
method.addStatement("$T a = new $T[sz]", arrayTypeName, arrayTypeName.componentType);
if (USE_NATIVE_TYPED_ARRAYS) {
method.addStatement("$T a = new $T[sz]", typedArrayTypeName, arrayComponentTypeName);
} else {
method.addStatement("$T a = new $T[sz]", Object[].class, Object.class);
}
method.addCode("\n");
method.beginControlFlow("for (int i = 0; i < sz; ++i)");
var baseSerializerInstance = typeArray.getBase().getJSerializerInstance(basePackageName);
method.addStatement("a[i] = $T.$N.deserialize(in)", baseSerializerInstance.className(), baseSerializerInstance.fieldName());
method.endControlFlow();
method.addCode("\n");
method.addStatement("return new $T(a)", ParameterizedTypeName.get(ClassName.get(ImmutableWrappedArrayList.class),
typeArray.getBase().getJTypeName(basePackageName)));
if (USE_NATIVE_TYPED_ARRAYS) {
method.addStatement("return new $T(a)", ParameterizedTypeName.get(ClassName.get(ImmutableWrappedArrayList.class), arrayComponentTypeName));
} else {
method.addStatement("return ($T) new $T(a)",
ParameterizedTypeName.get(ClassName.get(ImmutableWrappedArrayList.class), arrayComponentTypeName),
ClassName.get(ImmutableWrappedArrayList.class)
);
}
classBuilder.addMethod(method.build());
}

31
datagen/pom.xml
View File

@ -101,6 +101,37 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>attach-javadoc</id>
<phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<doclint>all,-missing</doclint>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>

15
datagen/src/main/java/it/cavallium/buffer/BufDataInput.java
View File

@ -25,19 +25,4 @@ public class BufDataInput extends SafeDataInputStream {
public void close() {
super.close();
}
@Override
public void mark(int readlimit) {
throw new UnsupportedOperationException();
}
@Override
public void reset() {
throw new UnsupportedOperationException();
}
@Override
public boolean markSupported() {
return false;
}
}

4
datagen/src/main/java/it/cavallium/datagen/nativedata/ImmutableWrappedArrayList.java
View File

@ -624,7 +624,7 @@ public class ImmutableWrappedArrayList<K> extends AbstractObjectList<K> implemen
/**
* Compares this type-specific array list to another one.
*
* @apiNote This method exists only for sake of efficiency. The implementation inherited from the
* This method exists only for sake of efficiency. The implementation inherited from the
* abstract implementation would already work.
*
* @param l a type-specific array list.
@ -655,7 +655,7 @@ public class ImmutableWrappedArrayList<K> extends AbstractObjectList<K> implemen
/**
* Compares this array list to another array list.
*
* @apiNote This method exists only for sake of efficiency. The implementation inherited from the
* This method exists only for sake of efficiency. The implementation inherited from the
* abstract implementation would already work.
*
* @param l an array list.

5
datagen/src/main/java/it/cavallium/datagen/nativedata/UpgradeUtil.java
View File

@ -7,8 +7,9 @@ public class UpgradeUtil {
@SuppressWarnings("unchecked")
public static <A, B> List<B> upgradeArray(List<A> from, DataUpgrader<A, B> upgrader) {
Object[] array;
if (from instanceof ImmutableWrappedArrayList<A> immutableWrappedArrayList) {
array = immutableWrappedArrayList.a;
if (from.getClass() == ImmutableWrappedArrayList.class
&& ((ImmutableWrappedArrayList<?>) from).a.getClass() == Object[].class) {
array = ((ImmutableWrappedArrayList<?>) from).a;
} else {
array = from.toArray();
}