Add Durations.wait() to WaitMatchers.waitMethodWithTimeout (and make them CONSTANT_CASE).

PiperOrigin-RevId: 805324565

Author: kluever

check_api/src/main/java/com/google/errorprone/matchers/WaitMatchers.java

@@ -17,6 +17,7 @@
 package com.google.errorprone.matchers;
 
 import static com.google.errorprone.matchers.Matchers.anyOf;
+import static com.google.errorprone.matchers.Matchers.staticMethod;
 import static com.google.errorprone.matchers.method.MethodMatchers.instanceMethod;
 
 import com.sun.source.tree.MethodInvocationTree;
@@ -29,15 +30,15 @@ public final class WaitMatchers {
   private static final String CONDITION_FQN = "java.util.concurrent.locks.Condition";
 
   /** Matches any wait/await method. */
-  public static final Matcher<MethodInvocationTree> waitMethod =
+  public static final Matcher<MethodInvocationTree> WAIT_METHOD =
       anyOf(
           instanceMethod().onExactClass(OBJECT_FQN).named("wait"),
           instanceMethod()
               .onDescendantOf(CONDITION_FQN)
               .withNameMatching(Pattern.compile("await.*")));
 
   /** Matches wait/await methods that have a timeout. */
-  public static final Matcher<MethodInvocationTree> waitMethodWithTimeout =
+  public static final Matcher<MethodInvocationTree> WAIT_METHOD_WITH_TIMEOUT =
       anyOf(
           instanceMethod().onExactClass(OBJECT_FQN).named("wait").withParameters("long"),
           instanceMethod().onExactClass(OBJECT_FQN).named("wait").withParameters("long", "int"),
@@ -46,7 +47,8 @@ public final class WaitMatchers {
               .named("await")
               .withParameters("long", "java.util.concurrent.TimeUnit"),
           instanceMethod().onDescendantOf(CONDITION_FQN).named("awaitNanos"),
-          instanceMethod().onDescendantOf(CONDITION_FQN).named("awaitUntil"));
+          instanceMethod().onDescendantOf(CONDITION_FQN).named("awaitUntil"),
+          staticMethod().onClass("com.google.common.time.Durations").named("wait"));
 
   private WaitMatchers() {}
 }

core/src/main/java/com/google/errorprone/bugpatterns/WaitNotInLoop.java

@@ -20,8 +20,10 @@
 import static com.google.errorprone.matchers.Matchers.allOf;
 import static com.google.errorprone.matchers.Matchers.inLoop;
 import static com.google.errorprone.matchers.Matchers.not;
-import static com.google.errorprone.matchers.WaitMatchers.waitMethod;
-import static com.google.errorprone.matchers.WaitMatchers.waitMethodWithTimeout;
+import static com.google.errorprone.matchers.WaitMatchers.WAIT_METHOD;
+import static com.google.errorprone.matchers.WaitMatchers.WAIT_METHOD_WITH_TIMEOUT;
+import static com.google.errorprone.util.ASTHelpers.findEnclosingNode;
+import static com.google.errorprone.util.ASTHelpers.getSymbol;
 
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.BugPattern.StandardTags;
@@ -30,7 +32,6 @@
 import com.google.errorprone.fixes.SuggestedFix;
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Matcher;
-import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.tools.javac.code.Symbol.MethodSymbol;
 import com.sun.tools.javac.tree.JCTree.JCIf;
@@ -47,7 +48,7 @@
     tags = StandardTags.FRAGILE_CODE)
 public class WaitNotInLoop extends BugChecker implements MethodInvocationTreeMatcher {
 
-  private static final Matcher<MethodInvocationTree> matcher = allOf(waitMethod, not(inLoop()));
+  private static final Matcher<MethodInvocationTree> matcher = allOf(WAIT_METHOD, not(inLoop()));
 
   @Override
   public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
@@ -56,17 +57,17 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
     }
 
     Description.Builder description = buildDescription(tree);
-    MethodSymbol sym = ASTHelpers.getSymbol(tree);
+    MethodSymbol sym = getSymbol(tree);
     description.setMessage(
         String.format("Because of spurious wakeups, %s must always be called in a loop", sym));
 
     // If this looks like the "Wait until a condition becomes true" case from the wiki content,
     // rewrite the enclosing if to a while.  Other fixes are too complicated to construct
     // mechanically, so we provide detailed instructions in the wiki content.
-    if (!waitMethodWithTimeout.matches(tree, state)) {
-      JCIf enclosingIf = ASTHelpers.findEnclosingNode(state.getPath().getParentPath(), JCIf.class);
+    if (!WAIT_METHOD_WITH_TIMEOUT.matches(tree, state)) {
+      JCIf enclosingIf = findEnclosingNode(state.getPath().getParentPath(), JCIf.class);
       if (enclosingIf != null && enclosingIf.getElseStatement() == null) {
-        CharSequence ifSource = state.getSourceForNode(enclosingIf);
+        String ifSource = state.getSourceForNode(enclosingIf);
         if (ifSource == null) {
           // Source isn't available, so we can't construct a fix
           return description.build();