Skip to content

Inline WaitMatchers. This seemed a bit unnecessary, noticed in https://github.com/google/error-prone/commit/404b754a150413045eeba0ede07b3f20c6041457. #5477

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

Merged
copybara-service merged 1 commit into from
Jan 29, 2026
+39 −70
Merged

Inline WaitMatchers. This seemed a bit unnecessary, noticed in https://github.com/google/error-prone/commit/404b754a150413045eeba0ede07b3f20c6041457. #5477

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
68 changes: 0 additions & 68 deletions check_api/src/main/java/com/google/errorprone/matchers/WaitMatchers.java
View file
Open in desktop

This file was deleted.

41 changes: 39 additions & 2 deletions core/src/main/java/com/google/errorprone/bugpatterns/WaitNotInLoop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@

import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
import static com.google.errorprone.matchers.Matchers.allOf;
import static com.google.errorprone.matchers.Matchers.anyOf;
import static com.google.errorprone.matchers.Matchers.inLoop;
import static com.google.errorprone.matchers.Matchers.instanceMethod;
import static com.google.errorprone.matchers.Matchers.not;
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.matchers.Matchers.staticMethod;
import static com.google.errorprone.util.ASTHelpers.findEnclosingNode;
import static com.google.errorprone.util.ASTHelpers.getSymbol;

Expand All @@ -35,6 +36,7 @@
import com.sun.source.tree.MethodInvocationTree;
import com.sun.tools.javac.code.Symbol.MethodSymbol;
import com.sun.tools.javac.tree.JCTree.JCIf;
import java.util.regex.Pattern;

/**
* @author eaftan@google.com (Eddie Aftandilian)
Expand All @@ -47,6 +49,41 @@
severity = WARNING,
tags = StandardTags.FRAGILE_CODE)
public class WaitNotInLoop extends BugChecker implements MethodInvocationTreeMatcher {
private static final String OBJECT_FQN = "java.lang.Object";
private static final String CONDITION_FQN = "java.util.concurrent.locks.Condition";

private static final Matcher<MethodInvocationTree> UNINTERRUPTIBLES_AWAIT_CONDITION =
anyOf(
staticMethod()
.onClass("com.google.common.util.concurrent.Uninterruptibles")
.named("awaitUninterruptibly")
.withParameters(
"java.util.concurrent.locks.Condition", "long", "java.util.concurrent.TimeUnit"),
staticMethod()
.onClass("com.google.common.util.concurrent.Uninterruptibles")
.named("awaitUninterruptibly")
.withParameters("java.util.concurrent.locks.Condition", "java.time.Duration"));

private static final Matcher<MethodInvocationTree> WAIT_METHOD =
anyOf(
instanceMethod().onExactClass(OBJECT_FQN).named("wait"),
instanceMethod()
.onDescendantOf(CONDITION_FQN)
.withNameMatching(Pattern.compile("await.*")),
UNINTERRUPTIBLES_AWAIT_CONDITION);

private 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"),
instanceMethod()
.onDescendantOf(CONDITION_FQN)
.named("await")
.withParameters("long", "java.util.concurrent.TimeUnit"),
instanceMethod().onDescendantOf(CONDITION_FQN).named("awaitNanos"),
instanceMethod().onDescendantOf(CONDITION_FQN).named("awaitUntil"),
staticMethod().onClass("com.google.common.time.Durations").named("wait"),
UNINTERRUPTIBLES_AWAIT_CONDITION);

private static final Matcher<MethodInvocationTree> matcher = allOf(WAIT_METHOD, not(inLoop()));

Expand Down
Loading