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

Code cleanup

Browse Source
This commit is contained in:
Andrea Cavalli 2021-05-09 01:24:58 +02:00
parent 43358ee299
commit ffc57e1308
1 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/it/cavallium/data/generator/SourcesGenerator.java
View File

@ -2124,8 +2124,6 @@ public class SourcesGenerator {
.build()); .build());
typeClass.addAnnotation(lombok.Builder.class); typeClass.addAnnotation(lombok.Builder.class);
typeClass.addAnnotation(ToString.class); typeClass.addAnnotation(ToString.class);
var constructor = MethodSpec.constructorBuilder();
constructor.addModifiers(Modifier.PUBLIC);
var getBasicTypeMethod = MethodSpec var getBasicTypeMethod = MethodSpec
.methodBuilder("getBasicType$") .methodBuilder("getBasicType$")
.addModifiers(Modifier.PUBLIC) .addModifiers(Modifier.PUBLIC)
@ -2186,7 +2184,7 @@ public class SourcesGenerator {
} }
} }
addField(typeClass, constructor, key, typeTypes.get(value), true, true, false, isGetterOverride); addField(typeClass, key, typeTypes.get(value), true, true, false, isGetterOverride);
addImmutableSetter(typeClass, addImmutableSetter(typeClass,
ClassName.get(joinPackage(versionPackage, "data"), type), ClassName.get(joinPackage(versionPackage, "data"), type),
classConfiguration.getData().keySet(), classConfiguration.getData().keySet(),
@ -2205,8 +2203,6 @@ public class SourcesGenerator {
.addStatement("return " + classConfiguration.getStringRepresenter() + "(this)") .addStatement("return " + classConfiguration.getStringRepresenter() + "(this)")
.build()); .build());
} }
//todo: now we use lombok to generate the constructor.
//typeClass.addMethod(constructor.build());
var mapConstructor = MethodSpec.constructorBuilder().addModifiers(Modifier.PUBLIC); var mapConstructor = MethodSpec.constructorBuilder().addModifiers(Modifier.PUBLIC);
mapConstructor.addException(IllegalStateException.class); mapConstructor.addException(IllegalStateException.class);
@ -2424,7 +2420,7 @@ public class SourcesGenerator {
var oldIType = ClassName.get(joinPackage(versionPackage, "data"), "IType"); var oldIType = ClassName.get(joinPackage(versionPackage, "data"), "IType");
var oldITypeArray = ArrayTypeName.of(oldIType); var oldITypeArray = ArrayTypeName.of(oldIType);
var newIType = ClassName.get(joinPackage(nextVersionPackage, "data"), "IType"); var newIType = ClassName.get(joinPackage(Objects.requireNonNull(nextVersionPackage), "data"), "IType");
var newITypeArray = ArrayTypeName.of(newIType); var newITypeArray = ArrayTypeName.of(newIType);
var oldVersionType = ClassName.get(joinPackage(versionPackage, ""), "Version"); var oldVersionType = ClassName.get(joinPackage(versionPackage, ""), "Version");
@ -2694,11 +2690,8 @@ public class SourcesGenerator {
classBuilder.addMethod(setterMethod.build()); classBuilder.addMethod(setterMethod.build());
} }
private void addField(Builder classBuilder, @Nullable MethodSpec.Builder constructorBuilder, String fieldName, private void addField(Builder classBuilder, String fieldName,
TypeName fieldType, boolean isFinal, boolean hasGetter, boolean hasSetter, boolean isOverride) { TypeName fieldType, boolean isFinal, boolean hasGetter, boolean hasSetter, boolean isOverride) {
if (isFinal && constructorBuilder == null) {
throw new IllegalStateException();
}
if (isFinal && hasSetter) { if (isFinal && hasSetter) {
throw new IllegalStateException(); throw new IllegalStateException();
} }
@ -2729,28 +2722,6 @@ public class SourcesGenerator {
getter.addStatement("return this." + fieldName); getter.addStatement("return this." + fieldName);
classBuilder.addMethod(getter.build()); classBuilder.addMethod(getter.build());
} }
if (constructorBuilder != null) {
var param = ParameterSpec.builder(fieldType, fieldName, Modifier.FINAL);
boolean requiresNotNull = !fieldType.isPrimitive();
if (requiresNotNull) {
param.addAnnotation(NotNull.class);
param.addAnnotation(NonNull.class);
}
constructorBuilder.addParameter(param.build());
var assignStatementBuilder = CodeBlock
.builder()
.add("this." + fieldName + " = ");
if (requiresNotNull) {
assignStatementBuilder.add("$T.requireNonNull(", Objects.class);
}
assignStatementBuilder.add(fieldName);
if (requiresNotNull) {
assignStatementBuilder.add(")");
}
constructorBuilder.addStatement(assignStatementBuilder.build());
}
} }
private int indexOf(Set<String> value, String type) { private int indexOf(Set<String> value, String type) {