Match all Optional methods

google · Apr 20, 2021 · 6fec586 · 6fec586
1 parent 1cbf057
commit 6fec586
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ReturnValueIgnored.java b/core/src/main/java/com/google/errorprone/bugpatterns/ReturnValueIgnored.java
@@ -211,21 +211,11 @@ private static boolean functionalMethod(ExpressionTree tree, VisitorState state)
                   "isPresent"));
 
   /**
-   * The return values of {@link java.util.Optional} static methods and some instance methods should
-   * always be checked.
+   * The return values of {@link java.util.Optional} methods should always be checked (except for
+   * void-returning ones, which won't be checked by AbstractReturnValueIgnored).
    */
   private static final Matcher<ExpressionTree> MORE_OPTIONAL_METHODS =
-          anyOf(
-                  instanceMethod().onExactClass("java.util.Optional")
-                          .namedAnyOf(
-                                  "filter",
-                                  "flatMap",
-                                  "get",
-                                  "map",
-                                  "or",
-                                  "orElse",
-                                  "orElseGet",
-                                  "orElseThrow"));
+          anyMethod().onClass("java.util.Optional");
 
   /**
    * The return values of {@link java.util.concurrent.TimeUnit} methods should always be checked.

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ReturnValueIgnoredTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ReturnValueIgnoredTest.java
@@ -177,6 +177,7 @@ public void optionalInstanceMethods() {
             "    optional.flatMap(v -> Optional.of(v + 1));",
             "    // BUG: Diagnostic contains: ReturnValueIgnored",
             "    optional.get();",
+            "    optional.ifPresent(v -> {});",
             "    // BUG: Diagnostic contains: ReturnValueIgnored",
             "    optional.isPresent();",
             "    // BUG: Diagnostic contains: ReturnValueIgnored",