diff --git a/processor/src/main/java/io/jonasg/bob/BuilderGenerator.java b/processor/src/main/java/io/jonasg/bob/BuilderGenerator.java index a703ce6..4d7b0d0 100644 --- a/processor/src/main/java/io/jonasg/bob/BuilderGenerator.java +++ b/processor/src/main/java/io/jonasg/bob/BuilderGenerator.java @@ -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(); } } diff --git a/processor/src/main/java/io/jonasg/bob/BuilderTypeSpecFactory.java b/processor/src/main/java/io/jonasg/bob/BuilderTypeSpecFactory.java index c488484..8418ad2 100644 --- a/processor/src/main/java/io/jonasg/bob/BuilderTypeSpecFactory.java +++ b/processor/src/main/java/io/jonasg/bob/BuilderTypeSpecFactory.java @@ -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)); } @@ -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])); diff --git a/processor/src/test/java/io/jonasg/bob/BobFeaturesTests.java b/processor/src/test/java/io/jonasg/bob/BobFeaturesTests.java index d37b09e..b8943e2 100644 --- a/processor/src/test/java/io/jonasg/bob/BobFeaturesTests.java +++ b/processor/src/test/java/io/jonasg/bob/BobFeaturesTests.java @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( diff --git a/processor/src/test/resources/tests/successful-compilation/AllConstructorParamsAreBuildableAndByDefaultNotEnforced/Expected_AllConstructorParamsAreBuildableAndByDefaultNotEnforced.java b/processor/src/test/resources/tests/successful-compilation/AllConstructorParamsAreBuildableAndByDefaultNotEnforced/Expected_AllConstructorParamsAreBuildableAndByDefaultNotEnforced.java index da71ef3..54156eb 100644 --- a/processor/src/test/resources/tests/successful-compilation/AllConstructorParamsAreBuildableAndByDefaultNotEnforced/Expected_AllConstructorParamsAreBuildableAndByDefaultNotEnforced.java +++ b/processor/src/test/resources/tests/successful-compilation/AllConstructorParamsAreBuildableAndByDefaultNotEnforced/Expected_AllConstructorParamsAreBuildableAndByDefaultNotEnforced.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/AllConstructorParamsAreBuildableIfHavingMatchingField/Expected_AllConstructorParamsAreBuildableIfHavingMatchingField.java b/processor/src/test/resources/tests/successful-compilation/AllConstructorParamsAreBuildableIfHavingMatchingField/Expected_AllConstructorParamsAreBuildableIfHavingMatchingField.java index 828d93d..2c5301c 100644 --- a/processor/src/test/resources/tests/successful-compilation/AllConstructorParamsAreBuildableIfHavingMatchingField/Expected_AllConstructorParamsAreBuildableIfHavingMatchingField.java +++ b/processor/src/test/resources/tests/successful-compilation/AllConstructorParamsAreBuildableIfHavingMatchingField/Expected_AllConstructorParamsAreBuildableIfHavingMatchingField.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/AllPublicSettersThatHaveCorrespondingFieldsAreBuildable/Expected_AllPublicSettersThatHaveCorrespondingFieldsAreBuildable.java b/processor/src/test/resources/tests/successful-compilation/AllPublicSettersThatHaveCorrespondingFieldsAreBuildable/Expected_AllPublicSettersThatHaveCorrespondingFieldsAreBuildable.java index c9be676..c3ad3a8 100644 --- a/processor/src/test/resources/tests/successful-compilation/AllPublicSettersThatHaveCorrespondingFieldsAreBuildable/Expected_AllPublicSettersThatHaveCorrespondingFieldsAreBuildable.java +++ b/processor/src/test/resources/tests/successful-compilation/AllPublicSettersThatHaveCorrespondingFieldsAreBuildable/Expected_AllPublicSettersThatHaveCorrespondingFieldsAreBuildable.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforced/Expected_ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforced.java b/processor/src/test/resources/tests/successful-compilation/ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforced/Expected_ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforced.java index 20df0ca..61fd73c 100644 --- a/processor/src/test/resources/tests/successful-compilation/ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforced/Expected_ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforced.java +++ b/processor/src/test/resources/tests/successful-compilation/ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforced/Expected_ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforced.java @@ -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; diff --git a/processor/src/test/resources/tests/successful-compilation/ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNulls/Expected_ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNulls.java b/processor/src/test/resources/tests/successful-compilation/ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNulls/Expected_ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNulls.java index ae7a4b1..f4e2ec6 100644 --- a/processor/src/test/resources/tests/successful-compilation/ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNulls/Expected_ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNulls.java +++ b/processor/src/test/resources/tests/successful-compilation/ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNulls/Expected_ConstructorParametersAreEnforcedWhenConstructorPolicyIsEnforcedAllowNulls.java @@ -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; diff --git a/processor/src/test/resources/tests/successful-compilation/DefaultValuesForParamsWithNoneMatchingField/Expected_DefaultValuesForParamsWithNoneMatchingField.java b/processor/src/test/resources/tests/successful-compilation/DefaultValuesForParamsWithNoneMatchingField/Expected_DefaultValuesForParamsWithNoneMatchingField.java index 64f9c9a..e7ae308 100644 --- a/processor/src/test/resources/tests/successful-compilation/DefaultValuesForParamsWithNoneMatchingField/Expected_DefaultValuesForParamsWithNoneMatchingField.java +++ b/processor/src/test/resources/tests/successful-compilation/DefaultValuesForParamsWithNoneMatchingField/Expected_DefaultValuesForParamsWithNoneMatchingField.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/GenericsAreBuildable/Expected_GenericsAreBuildable.java b/processor/src/test/resources/tests/successful-compilation/GenericsAreBuildable/Expected_GenericsAreBuildable.java index 475b0f8..cdf565e 100644 --- a/processor/src/test/resources/tests/successful-compilation/GenericsAreBuildable/Expected_GenericsAreBuildable.java +++ b/processor/src/test/resources/tests/successful-compilation/GenericsAreBuildable/Expected_GenericsAreBuildable.java @@ -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; diff --git a/processor/src/test/resources/tests/successful-compilation/MarkIndividualFieldsAsMandatory/Expected_MarkFieldAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode.java b/processor/src/test/resources/tests/successful-compilation/MarkIndividualFieldsAsMandatory/Expected_MarkFieldAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode.java index 8adbb58..7178df1 100644 --- a/processor/src/test/resources/tests/successful-compilation/MarkIndividualFieldsAsMandatory/Expected_MarkFieldAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode.java +++ b/processor/src/test/resources/tests/successful-compilation/MarkIndividualFieldsAsMandatory/Expected_MarkFieldAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode.java @@ -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; diff --git a/processor/src/test/resources/tests/successful-compilation/MarkIndividualFieldsAsMandatory/Expected_MarkThroughTopLevelAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode.java b/processor/src/test/resources/tests/successful-compilation/MarkIndividualFieldsAsMandatory/Expected_MarkThroughTopLevelAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode.java index c417003..b9701f2 100644 --- a/processor/src/test/resources/tests/successful-compilation/MarkIndividualFieldsAsMandatory/Expected_MarkThroughTopLevelAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode.java +++ b/processor/src/test/resources/tests/successful-compilation/MarkIndividualFieldsAsMandatory/Expected_MarkThroughTopLevelAnnotationThatIndividualFieldsAreMandatoryWhenInPermissiveMode.java @@ -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; diff --git a/processor/src/test/resources/tests/successful-compilation/RecordsAreBuildable/Expected_RecordsAreBuildable.java b/processor/src/test/resources/tests/successful-compilation/RecordsAreBuildable/Expected_RecordsAreBuildable.java new file mode 100644 index 0000000..e69de29 diff --git a/processor/src/test/resources/tests/successful-compilation/SetterWithCustomPrefix/Expected_SetterWithCustomPrefix.java b/processor/src/test/resources/tests/successful-compilation/SetterWithCustomPrefix/Expected_SetterWithCustomPrefix.java index 1cc1d4a..8b906c4 100644 --- a/processor/src/test/resources/tests/successful-compilation/SetterWithCustomPrefix/Expected_SetterWithCustomPrefix.java +++ b/processor/src/test/resources/tests/successful-compilation/SetterWithCustomPrefix/Expected_SetterWithCustomPrefix.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise/Expected_DefaultGenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.java b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise/Expected_DefaultGenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.java index c88810e..d4f46ea 100644 --- a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise/Expected_DefaultGenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.java +++ b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise/Expected_DefaultGenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise/Expected_GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.java b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise/Expected_GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.java index 795d622..fbae0d2 100644 --- a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise/Expected_GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.java +++ b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWise/Expected_GenerateStepBuilderWhenConstructorPolicyIsEnforcedStepWiseBuilder.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleArgumentConstructor/Expected_DefaultGenerateStepBuilderWithSingleArgumentConstructorBuilder.java b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleArgumentConstructor/Expected_DefaultGenerateStepBuilderWithSingleArgumentConstructorBuilder.java index 4341fe2..c13670e 100644 --- a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleArgumentConstructor/Expected_DefaultGenerateStepBuilderWithSingleArgumentConstructorBuilder.java +++ b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleArgumentConstructor/Expected_DefaultGenerateStepBuilderWithSingleArgumentConstructorBuilder.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleArgumentConstructor/Expected_GenerateStepBuilderWithSingleArgumentConstructorBuilder.java b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleArgumentConstructor/Expected_GenerateStepBuilderWithSingleArgumentConstructorBuilder.java index 117dfcf..224942f 100644 --- a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleArgumentConstructor/Expected_GenerateStepBuilderWithSingleArgumentConstructorBuilder.java +++ b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleArgumentConstructor/Expected_GenerateStepBuilderWithSingleArgumentConstructorBuilder.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleMandatoryAnnotatedField/Expected_DefaultGenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder.java b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleMandatoryAnnotatedField/Expected_DefaultGenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder.java index 8ac83e9..623b7cf 100644 --- a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleMandatoryAnnotatedField/Expected_DefaultGenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder.java +++ b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleMandatoryAnnotatedField/Expected_DefaultGenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleMandatoryAnnotatedField/Expected_GenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder.java b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleMandatoryAnnotatedField/Expected_GenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder.java index 14b200f..b661b8b 100644 --- a/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleMandatoryAnnotatedField/Expected_GenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder.java +++ b/processor/src/test/resources/tests/successful-compilation/StepWise/GenerateStepBuilderWithSingleMandatoryAnnotatedField/Expected_GenerateStepBuilderWithSingleMandatoryAnnotatedFieldBuilder.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/UseConstructorAnnotatedWithBuildableConstructor/Expected_UseConstructorAnnotatedWithBuildableConstructor.java b/processor/src/test/resources/tests/successful-compilation/UseConstructorAnnotatedWithBuildableConstructor/Expected_UseConstructorAnnotatedWithBuildableConstructor.java index c395ac8..9255d55 100644 --- a/processor/src/test/resources/tests/successful-compilation/UseConstructorAnnotatedWithBuildableConstructor/Expected_UseConstructorAnnotatedWithBuildableConstructor.java +++ b/processor/src/test/resources/tests/successful-compilation/UseConstructorAnnotatedWithBuildableConstructor/Expected_UseConstructorAnnotatedWithBuildableConstructor.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/UseConstructorWithTheMostNumberOfParameters/Expected_UseConstructorWithTheMostNumberOfParameters.java b/processor/src/test/resources/tests/successful-compilation/UseConstructorWithTheMostNumberOfParameters/Expected_UseConstructorWithTheMostNumberOfParameters.java index b59ca25..3611616 100644 --- a/processor/src/test/resources/tests/successful-compilation/UseConstructorWithTheMostNumberOfParameters/Expected_UseConstructorWithTheMostNumberOfParameters.java +++ b/processor/src/test/resources/tests/successful-compilation/UseConstructorWithTheMostNumberOfParameters/Expected_UseConstructorWithTheMostNumberOfParameters.java @@ -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 { diff --git a/processor/src/test/resources/tests/successful-compilation/UseFirstConstructorWithTheMostNumberOfParameters/Expected_UseFirstConstructorWithTheMostNumberOfParameters.java b/processor/src/test/resources/tests/successful-compilation/UseFirstConstructorWithTheMostNumberOfParameters/Expected_UseFirstConstructorWithTheMostNumberOfParameters.java index 78f927d..3d504cf 100644 --- a/processor/src/test/resources/tests/successful-compilation/UseFirstConstructorWithTheMostNumberOfParameters/Expected_UseFirstConstructorWithTheMostNumberOfParameters.java +++ b/processor/src/test/resources/tests/successful-compilation/UseFirstConstructorWithTheMostNumberOfParameters/Expected_UseFirstConstructorWithTheMostNumberOfParameters.java @@ -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;