Johannes/java-commons
Johannes
/
java-commons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(serialize-generator): more checks to prevent double declarations
ci/woodpecker/push/woodpecker Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2024-04-24 10:35:03 +02:00
parent 5a9c3ee58f
commit 78ec439ccb
Signed by: Johannes
GPG Key ID: E76429612C2929F4
5 changed files with 126 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/ArrayAdapter.java
View File

@ -50,6 +50,8 @@ public class ArrayAdapter extends Adapter<ArrayAdapter.Hydrated> {
@Override
public void generateRead() {
String methodName = "deserialize$" + name;
if (klazz.methodSpecs.stream().noneMatch(s -> s.name.equals(methodName))) {
CodeBlock.Builder kode = CodeBlock.builder();
// Coerce
kode.beginControlFlow("if (reader.isLenient() && reader.peek() != $T.BEGIN_ARRAY)", Cl.GSON_TOKEN)
@ -72,7 +74,6 @@ public class ArrayAdapter extends Adapter<ArrayAdapter.Hydrated> {
.addStatement("reader.endArray()")
.addStatement("return list.toArray($T[]::new)", componentType);
String methodName = "deserialize$" + name;
klazz.addMethod(
MethodSpec.methodBuilder(methodName)
.addModifiers(Modifier.PRIVATE, Modifier.STATIC)
@ -85,6 +86,7 @@ public class ArrayAdapter extends Adapter<ArrayAdapter.Hydrated> {
.addCode(kode.build())
.build()
);
}
code.add("$N(reader)", methodName);
}
}

4
commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/CollectionAdapter.java
View File

@ -78,6 +78,8 @@ public class CollectionAdapter extends Adapter<CollectionAdapter.Hydrated> {
@Override
public void generateRead() {
String methodName = "read$" + name;
if (klazz.methodSpecs.stream().noneMatch(s -> s.name.equals(methodName))) {
CodeBlock.Builder kode = CodeBlock.builder();
kode.addStatement("$T list = new $T<>()", typeName, implType);
// Coerce
@ -100,7 +102,6 @@ public class CollectionAdapter extends Adapter<CollectionAdapter.Hydrated> {
.addStatement("reader.endArray()")
.addStatement("return list");
String methodName = "read$" + name;
klazz.addMethod(
MethodSpec.methodBuilder(methodName)
.addModifiers(Modifier.PRIVATE, Modifier.STATIC)
@ -113,6 +114,7 @@ public class CollectionAdapter extends Adapter<CollectionAdapter.Hydrated> {
.addCode(kode.build())
.build()
);
}
code.add("$N(reader)", methodName);
}
}

10
commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/DateAdapter.java
View File

@ -32,15 +32,7 @@ public class DateAdapter extends Adapter<DateAdapter.Hydrated> {
@Override
public void generateRead() {
boolean found = false;
for (MethodSpec spec : klazz.methodSpecs) {
if (spec.name.equals("parseDate")) {
found = true;
break;
}
}
if (!found) {
if (klazz.methodSpecs.stream().noneMatch(s -> s.name.equals("parseDate"))) {
klazz.addMethod(
MethodSpec.methodBuilder("parseDate")
.addModifiers(Modifier.PRIVATE, Modifier.STATIC)

2
commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/EnumAdapter.java
View File

@ -44,6 +44,7 @@ public class EnumAdapter extends Adapter<EnumAdapter.Hydrated> {
@Override
public void generateRead() {
String methodName = "read$" + name;
if (klazz.methodSpecs.stream().noneMatch(s -> s.name.equals(methodName))) {
klazz.addMethod(
MethodSpec.methodBuilder(methodName)
.addModifiers(Modifier.PRIVATE, Modifier.STATIC)
@ -59,6 +60,7 @@ public class EnumAdapter extends Adapter<EnumAdapter.Hydrated> {
)
.build()
);
}
code.add("$N(reader.nextString())", methodName);
}
}

4
commons-serialize-generator/src/main/java/io/gitlab/jfronny/commons/serialize/generator/adapter/impl/MapAdapter.java
View File

@ -156,6 +156,8 @@ public class MapAdapter extends Adapter<MapAdapter.Hydrated> {
@Override
public void generateRead() {
String methodName = "read$" + name;
if (klazz.methodSpecs.stream().noneMatch(s -> s.name.equals(methodName))) {
CodeBlock.Builder kode = CodeBlock.builder();
kode.addStatement("$T map = new $T<>()", typeName, implType);
@ -178,7 +180,6 @@ public class MapAdapter extends Adapter<MapAdapter.Hydrated> {
.addStatement("reader.endObject()")
.addStatement("return map");
String methodName = "read$" + name;
klazz.addMethod(
MethodSpec.methodBuilder(methodName)
.addModifiers(Modifier.PRIVATE, Modifier.STATIC)
@ -191,6 +192,7 @@ public class MapAdapter extends Adapter<MapAdapter.Hydrated> {
.addCode(kode.build())
.build()
);
}
code.add("$N(reader)", methodName);
}
}