Skip to content

Fix AutoValue/AutoBuilder to not copy @Nullable to Optional-returning getters. #2110

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −1
Open

Fix AutoValue/AutoBuilder to not copy @Nullable to Optional-returning getters. #2110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion value/src/main/java/com/google/auto/value/processor/builder.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ ${builderClassModifiers}class ${builderName}${builderFormalTypes} ##
#if ($builderGetter)

@`java.lang.Override`
${p.nullableAnnotation}${builderGetter.access}$builderGetter.type ${builderGetter.name}() {
#if (!$builderGetter.optional)${p.nullableAnnotation}#end${builderGetter.access}$builderGetter.type ${builderGetter.name}() {
#set ($noValueToGetCondition = $builderRequiredProperties.noValueToGet($p))

#if ($builderGetters[$p.name].optional)
Expand Down
45 changes: 45 additions & 0 deletions value/src/test/java/com/google/auto/value/processor/AutoBuilderCompilationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,51 @@ public void nullablePrimitiveTypeUseAnnotation() {
.onLineContaining("Baz(@Nullable int thing)");
}

@Test
public void conflictingAnnotationsOnOptionalGetter() {
JavaFileObject javaFileObject =
JavaFileObjects.forSourceLines(
"foo.bar.Baz",
"package foo.bar;",
"",
"import com.google.auto.value.AutoBuilder;",
"import java.lang.annotation.ElementType;",
"import java.lang.annotation.Target;",
"import java.util.Optional;",
"",
"public class Baz {",
" @Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})",
" public @interface Nullable {}",
"",
" @Target(ElementType.TYPE_USE)",
" public @interface NotNull {}",
"",
" private final String foo;",
"",
" public Baz(@Nullable String foo) {",
" this.foo = foo;",
" }",
"",
" @AutoBuilder",
" public interface Builder {",
" Builder foo(String foo);",
" @NotNull Optional<String> foo();",
" Baz build();",
" }",
"}");
Compilation compilation =
javac().withProcessors(new AutoBuilderProcessor()).compile(javaFileObject);
assertThat(compilation).succeeded();
assertThat(compilation)
.generatedSourceFile("foo.bar.AutoBuilder_Baz_Builder")
.contentsAsUtf8String()
.doesNotContain("@Baz.Nullable public @Baz.NotNull Optional<String> foo()");
assertThat(compilation)
.generatedSourceFile("foo.bar.AutoBuilder_Baz_Builder")
.contentsAsUtf8String()
.contains("public @Baz.NotNull Optional<String> foo()");
}

private static String sorted(String... imports) {
return stream(imports).sorted().collect(joining("\n"));
}
Expand Down
Loading