Prevent NestedOptionals from throwing an NPE (#412)

Previously, a `NullPointerException` was thrown if during compilation the `java.util.Optional` class was not loaded at all.
PicnicSupermarket · Dec 16, 2022 · 870d16a · 870d16a
1 parent 9611423
commit 870d16a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NestedOptionals.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NestedOptionals.java
@@ -41,8 +41,11 @@ public NestedOptionals() {}
 
   @Override
   public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
-    return state.getTypes().isSubtype(ASTHelpers.getType(tree), OPTIONAL_OF_OPTIONAL.get(state))
-        ? describeMatch(tree)
-        : Description.NO_MATCH;
+    Type type = OPTIONAL_OF_OPTIONAL.get(state);
+    if (type == null || !state.getTypes().isSubtype(ASTHelpers.getType(tree), type)) {
+      return Description.NO_MATCH;
+    }
+
+    return describeMatch(tree);
   }
 }
diff --git a/...r-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/NestedOptionalsTest.java b/...r-prone-contrib/src/test/java/tech/picnic/errorprone/bugpatterns/NestedOptionalsTest.java
@@ -39,4 +39,19 @@ void identification() {
             "}")
         .doTest();
   }
+
+  @Test
+  void identificationOptionalTypeNotLoaded() {
+    compilationTestHelper
+        .addSourceLines(
+            "A.java",
+            "import java.time.Duration;",
+            "",
+            "class A {",
+            "  void m() {",
+            "    Duration.ofSeconds(1);",
+            "  }",
+            "}")
+        .doTest();
+  }
 }