Skip to content

Commit

Permalink
fix(bob-processor): remove warning when compiling with newer java-ver…
Browse files Browse the repository at this point in the history
…sions
  • Loading branch information
JoranVanBelle authored and jonas-grgt committed Apr 23, 2024
1 parent b96188c commit ddfbd3b
Show file tree
Hide file tree
Showing 23 changed files with 43 additions and 65 deletions.
8 changes: 3 additions & 5 deletions processor/src/main/java/io/jonasg/bob/BuilderGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@ public void generate(TypeDefinition typeDefinition, Buildable buildable, Types t
}

private String getPackageName(TypeDefinition typeDefinition, Buildable buildable) {
String packageName;

if (!buildable.packageName().isEmpty()) {
packageName = buildable.packageName();
} else {
packageName = String.format("%s.builder", typeDefinition.packageName());
return buildable.packageName();
}
return packageName;
return typeDefinition.packageName();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ protected TypeName builderType() {
if (!this.buildable.packageName().isEmpty()) {
result = this.buildable.packageName();
} else {
result = String.format("%s.builder", this.typeDefinition.packageName());
result = this.typeDefinition.packageName();
}
return ClassName.get(result, builderTypeName(this.typeDefinition));
}
Expand All @@ -303,7 +303,7 @@ protected TypeName builderType() {
if (!this.buildable.packageName().isEmpty()) {
result = this.buildable.packageName();
} else {
result = String.format("%s.builder", this.typeDefinition.packageName());
result = this.typeDefinition.packageName();
}
return ParameterizedTypeName.get(ClassName.get(result, builderTypeName(this.typeDefinition)),
typeVariableNames.toArray(new TypeName[0]));
Expand Down
38 changes: 19 additions & 19 deletions processor/src/test/java/io/jonasg/bob/BobFeaturesTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void allConstructorParamsAreBuildableAndByDefaultNotEnforced() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.AllConstructorParamsAreBuildableAndByDefaultNotEnforcedBuilder")
"io.jonasg.bob.test.AllConstructorParamsAreBuildableAndByDefaultNotEnforcedBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -60,7 +60,7 @@ void allConstructorParamsAreBuildableIfHavingMatchingField() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.AllConstructorParamsAreBuildableIfHavingMatchingFieldBuilder")
"io.jonasg.bob.test.AllConstructorParamsAreBuildableIfHavingMatchingFieldBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -80,7 +80,7 @@ void defaultValuesForParamsWithNoneMatchingField() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.AllConstructorParamsAreBuildableIfHavingMatchingFieldBuilder")
"io.jonasg.bob.test.AllConstructorParamsAreBuildableIfHavingMatchingFieldBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand Down Expand Up @@ -116,7 +116,7 @@ void setterWithCustomPrefix() {
.thenExpectThat()
.compilationSucceeds()
.andThat()
.generatedSourceFile("io.jonasg.bob.test.builder.SetterWithCustomPrefixBuilder")
.generatedSourceFile("io.jonasg.bob.test.SetterWithCustomPrefixBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -136,7 +136,7 @@ void useConstructorAnnotatedWithBuildableConstructor() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.UseConstructorAnnotatedWithBuildableConstructorBuilder")
"io.jonasg.bob.test.UseConstructorAnnotatedWithBuildableConstructorBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -156,7 +156,7 @@ void useConstructorWithTheMostNumberOfParameters() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.UseConstructorWithTheMostNumberOfParametersBuilder")
"io.jonasg.bob.test.UseConstructorWithTheMostNumberOfParametersBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -176,7 +176,7 @@ void useFirstConstructorWithTheMostNumberOfParameters() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.UseFirstConstructorWithTheMostNumberOfParametersBuilder")
"io.jonasg.bob.test.UseFirstConstructorWithTheMostNumberOfParametersBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -194,7 +194,7 @@ void genericsAreBuildable() {
.thenExpectThat()
.compilationSucceeds()
.andThat()
.generatedSourceFile("io.jonasg.bob.test.builder.GenericsAreBuildableBuilder")
.generatedSourceFile("io.jonasg.bob.test.GenericsAreBuildableBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -214,7 +214,7 @@ void allPublicSettersThatHaveCorrespondingFieldsAreBuildable() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.AllPublicSettersThatHaveCorrespondingFieldsAreBuildableBuilder")
"io.jonasg.bob.test.AllPublicSettersThatHaveCorrespondingFieldsAreBuildableBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -234,7 +234,7 @@ void constructorParametersAreEnforcedWhenConstructorPolicyIsEnforced() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedBuilder")
"io.jonasg.bob.test.ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -257,14 +257,14 @@ void generateStepBuilderWhenConstructorPolicyIsEnforcedStepWise() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.DefaultGenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder")
"io.jonasg.bob.test.DefaultGenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
"/tests/successful-compilation/StepWise/GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise/Expected_DefaultGenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.java"))
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder")
"io.jonasg.bob.test.GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -284,14 +284,14 @@ void generateStepBuilderWithSingleArgumentConstructor() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.DefaultGenerateStepBuilderWithSingleArgumentConstructorBuilder")
"io.jonasg.bob.test.DefaultGenerateStepBuilderWithSingleArgumentConstructorBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
"/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleArgumentConstructor/Expected_DefaultGenerateStepBuilderWithSingleArgumentConstructorBuilder.java"))
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.GenerateStepBuilderWithSingleArgumentConstructorBuilder")
"io.jonasg.bob.test.GenerateStepBuilderWithSingleArgumentConstructorBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -311,14 +311,14 @@ void generateStepBuilderWithSingleMandatoryAnnotatedField() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.DefaultGenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder")
"io.jonasg.bob.test.DefaultGenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
"/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleMandatoryAnnotatedField/Expected_DefaultGenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder.java"))
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.GenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder")
"io.jonasg.bob.test.GenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -339,7 +339,7 @@ void constructorParametersAreEnforcedAndNullableWhenConstructorPolicyIsEnforcedA
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNullsBuilder")
"io.jonasg.bob.test.ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNullsBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -359,7 +359,7 @@ void markThroughTopLevelAnnotationThatIndividualFieldsAsMandatoryWhenInPermissiv
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.MarkThroughTopLevelAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveModeBuilder")
"io.jonasg.bob.test.MarkThroughTopLevelAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveModeBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand All @@ -379,7 +379,7 @@ void markFieldAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode() {
.compilationSucceeds()
.andThat()
.generatedSourceFile(
"io.jonasg.bob.test.builder.MarkFieldAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveModeBuilder")
"io.jonasg.bob.test.MarkFieldAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveModeBuilder")
.matches(
CuteApi.ExpectedFileObjectMatcherKind.BINARY,
JavaFileObjectUtils.readFromResource(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.AllConstructorParamsAreBuildableAndByDefaultNotEnforced;
import java.lang.String;

public final class AllConstructorParamsAreBuildableAndByDefaultNotEnforcedBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.AllConstructorParamsAreBuildableIfHavingMatchingField;
import java.lang.String;

public final class AllConstructorParamsAreBuildableIfHavingMatchingFieldBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.AllPublicSettersThatHaveCorrespondingFieldsAreBuildable;
import java.lang.String;

public final class AllPublicSettersThatHaveCorrespondingFieldsAreBuildableBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.RequiredField;
import io.jonasg.bob.test.ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforced;
import java.lang.Integer;
import java.lang.String;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.RequiredField;
import io.jonasg.bob.test.ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNulls;
import java.lang.Integer;
import java.lang.String;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.DefaultValuesForParamsWithNoneMatchingField;
import java.lang.String;

public final class DefaultValuesForParamsWithNoneMatchingFieldBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.GenericsAreBuildable;
import java.lang.Class;
import java.lang.String;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.RequiredField;
import io.jonasg.bob.test.MarkFieldAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode;
import java.lang.Float;
import java.lang.Integer;
import java.lang.String;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.RequiredField;
import io.jonasg.bob.test.MarkThroughTopLevelAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode;
import java.lang.Float;
import java.lang.Integer;
import java.lang.String;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.SetterWithCustomPrefix;
import java.lang.String;

public final class SetterWithCustomPrefixBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise;
import java.lang.String;

public final class DefaultGenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder implements GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.YearStep, GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.BuildStep, GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise;
import java.lang.String;

public interface GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.GenerateStepBuilderWithSingleArgumentConstructor;
import java.lang.String;

public final class DefaultGenerateStepBuilderWithSingleArgumentConstructorBuilder implements GenerateStepBuilderWithSingleArgumentConstructorBuilder.BuildStep, GenerateStepBuilderWithSingleArgumentConstructorBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.GenerateStepBuilderWithSingleArgumentConstructor;
import java.lang.String;

public interface GenerateStepBuilderWithSingleArgumentConstructorBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.RequiredField;
import io.jonasg.bob.test.GenerateStepBuilderWithSingleMandatoryAnnotatedField;
import java.lang.String;

public final class DefaultGenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder implements GenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder.BuildStep, GenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.GenerateStepBuilderWithSingleMandatoryAnnotatedField;
import java.lang.String;

public interface GenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.UseConstructorAnnotatedWithBuildableConstructor;
import java.lang.String;

public final class UseConstructorAnnotatedWithBuildableConstructorBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.jonasg.bob.test.builder;
package io.jonasg.bob.test;

import io.jonasg.bob.test.UseConstructorWithTheMostNumberOfParameters;
import java.lang.String;

public final class UseConstructorWithTheMostNumberOfParametersBuilder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
package io.jonasg.bob.test.builder;

import io.jonasg.bob.test.UseFirstConstructorWithTheMostNumberOfParameters;
package io.jonasg.bob.test;

public final class UseFirstConstructorWithTheMostNumberOfParametersBuilder {
private double engineSize;
Expand Down

0 comments on commit ddfbd3b

Please sign in to comment.