Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix -Xlint warnings in the generated code #178

Merged
merged 3 commits into from
Apr 10, 2024
Merged

Fix -Xlint warnings in the generated code #178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a894f7
Fix -Xlint warnings in the generated code
mensinda Apr 10, 2024
8acf8b6
Only suppress warnings if needed
mensinda Apr 10, 2024
932249b
Fixup
mensinda Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@
<version>${maven-compiler-plugin-version}</version>
<configuration>
<release>${jdk-version}</release>
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
</configuration>
</plugin>

Expand Down
10 changes: 8 additions & 2 deletions ...er-processor/src/main/java/io/soabase/recordbuilder/processor/CollectionBuilderUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@
import io.soabase.recordbuilder.core.RecordBuilder;

import javax.lang.model.element.Modifier;
import java.io.Serial;
import java.util.*;
import java.util.regex.Pattern;

import static io.soabase.recordbuilder.processor.RecordBuilderProcessor.generatedRecordBuilderAnnotation;
import static io.soabase.recordbuilder.processor.RecordBuilderProcessor.recordBuilderGeneratedAnnotation;
import static io.soabase.recordbuilder.processor.RecordBuilderProcessor.suppressWarningsAnnotation;

class CollectionBuilderUtils {
private final boolean useImmutableCollections;
Expand Down Expand Up @@ -385,8 +387,9 @@ private MethodSpec buildShimMethod(String name, TypeName mainType, Class<?> abst
.toList().toArray(new TypeName[0]);
var extendedParameterizedType = ParameterizedTypeName.get(ClassName.get(abstractType), wildCardTypeArguments);
return MethodSpec.methodBuilder(name).addAnnotation(generatedRecordBuilderAnnotation)
mensinda marked this conversation as resolved.
Show resolved Hide resolved
.addModifiers(Modifier.PRIVATE, Modifier.STATIC).addTypeVariables(Arrays.asList(typeVariables))
.returns(parameterizedType).addParameter(extendedParameterizedType, "o").addStatement(code).build();
.addAnnotation(suppressWarningsAnnotation).addModifiers(Modifier.PRIVATE, Modifier.STATIC)
.addTypeVariables(Arrays.asList(typeVariables)).returns(parameterizedType)
.addParameter(extendedParameterizedType, "o").addStatement(code).build();
}

private CodeBlock buildShimMethodBody(TypeName mainType, ParameterizedTypeName parameterizedType) {
Expand Down Expand Up @@ -467,6 +470,9 @@ private TypeSpec buildMutableCollectionSubType(String className, ClassName mutab
.addModifiers(Modifier.PRIVATE, Modifier.STATIC)
.superclass(ParameterizedTypeName.get(mutableCollectionType, typeArguments))
.addTypeVariables(Arrays.asList(typeVariables))
.addField(FieldSpec
.builder(TypeName.LONG, "serialVersionUID", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
.addAnnotation(Serial.class).initializer("1L").build())
.addMethod(MethodSpec.constructorBuilder().addAnnotation(generatedRecordBuilderAnnotation)
.addStatement("super()").build())
.addMethod(MethodSpec.constructorBuilder().addAnnotation(generatedRecordBuilderAnnotation)
Expand Down
2 changes: 2 additions & 0 deletions ...er-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public class RecordBuilderProcessor extends AbstractProcessor {

static final AnnotationSpec generatedRecordBuilderAnnotation = AnnotationSpec.builder(Generated.class)
.addMember("value", "$S", RecordBuilder.class.getName()).build();
static final AnnotationSpec suppressWarningsAnnotation = AnnotationSpec.builder(SuppressWarnings.class)
.addMember("value", "$S", "unchecked").build();
static final AnnotationSpec generatedRecordInterfaceAnnotation = AnnotationSpec.builder(Generated.class)
.addMember("value", "$S", RecordInterface.class.getName()).build();
static final AnnotationSpec recordBuilderGeneratedAnnotation = AnnotationSpec.builder(RecordBuilderGenerated.class)
Expand Down
Loading