Fix NPE when checking immutables builders from abstract methods (#1519)

Fix null pointer exception when checking immutables builders that are returned from abstract methods
palantir · Oct 21, 2020 · ee282be · ee282be
1 parent 735e592
commit ee282be
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/...rc/main/java/com/palantir/baseline/errorprone/ImmutablesBuilderMissingInitialization.java b/...rc/main/java/com/palantir/baseline/errorprone/ImmutablesBuilderMissingInitialization.java
@@ -238,7 +238,7 @@ private Set<String> removeFieldsPotentiallyInitializedBy(Set<String> uninitializ
     private boolean methodJustConstructsBuilder(
             MethodSymbol methodSymbol, VisitorState state, ClassSymbol immutableClass, ClassSymbol interfaceClass) {
         MethodTree methodTree = ASTHelpers.findMethod(methodSymbol, state);
-        if (methodTree != null) {
+        if (methodTree != null && methodTree.getBody() != null) {
             // Check that the method just contains one statement, which is of the form `return new Something();` or
             // `return ImmutableType.builder();`
             if (methodTree.getBody().getStatements().size() != 1) {

diff --git a/...est/java/com/palantir/baseline/errorprone/ImmutablesBuilderMissingInitializationTest.java b/...est/java/com/palantir/baseline/errorprone/ImmutablesBuilderMissingInitializationTest.java
@@ -202,6 +202,24 @@ public void testPassesWhenAllFieldsPopulated_withImmutableOnAbstractClass() {
                 .doTest();
     }
 
+    @Test
+    public void testPassesWhenBuilderFromInterfaceMethod() {
+        helper().addSourceLines(
+                        "Context.java",
+                        importInterface("Person"),
+                        "public interface Context {",
+                        "    Person.Builder personBuilder();",
+                        "}")
+                .addSourceLines(
+                        "MyTest.java",
+                        "public class MyTest {",
+                        "    public void makePerson(Context context) {",
+                        "        context.personBuilder().build();",
+                        "    }",
+                        "}")
+                .doTest();
+    }
+
     @Test
     public void testFailsWhenOneMandatoryFieldOmitted() {
         helper().addSourceLines(

diff --git a/changelog/@unreleased/pr-1519.v2.yml b/changelog/@unreleased/pr-1519.v2.yml
@@ -0,0 +1,6 @@
+type: fix
+fix:
+  description: Fix null pointer exception when checking immutables builders that are
+    returned from abstract methods
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/1519