Skip to content

Support Lambda for Predicates.and() and Predicates.or() #910

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
timtebeek merged 1 commit into from
Oct 27, 2025
Merged

Support Lambda for Predicates.and() and Predicates.or() #910

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
4 changes: 2 additions & 2 deletions src/main/java/org/openrewrite/java/migrate/guava/NoGuavaPredicatesAndOr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ private J handlePredicatesMethod(J.MethodInvocation method, String operation) {
return method;
}

// If the first argument is a method reference, wrap it with a cast
if (result instanceof J.MemberReference && result.getType() != null) {
// If the first argument is a method reference or a lambda, wrap it with a cast
if ((result instanceof J.MemberReference || result instanceof J.Lambda) && result.getType() != null) {
String typeString = result.getType().toString().replace("com.google.common.base.", "");
result = JavaTemplate.apply("((" + typeString + ") #{any()})", getCursor(), method.getCoordinates().replace(), result);
}
Expand Down
32 changes: 26 additions & 6 deletions src/test/java/org/openrewrite/java/migrate/guava/NoGuavaPredicatesAndOrTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,38 @@ void replacePredicatesAndWithLambdas() {
import com.google.common.base.Predicates;

class Test {
Predicate<String> isNotNull = s -> s != null;
Predicate<String> isLong = s -> s.length() > 5;
Predicate<String> combined = Predicates.and(isNotNull, isLong);
Predicate<String> combined = Predicates.and(s -> s != null, s -> s.length() > 5);
}
""",
"""
import com.google.common.base.Predicate;

class Test {
Predicate<String> isNotNull = s -> s != null;
Predicate<String> isLong = s -> s.length() > 5;
Predicate<String> combined = isNotNull.and(isLong);
Predicate<String> combined = ((Predicate<String>) s -> s != null).and(s -> s.length() > 5);
}
"""
)
);
}

@Test
void replacePredicatesOrWithLambdas() {
//language=java
rewriteRun(
java(
"""
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;

class Test {
Predicate<String> combined = Predicates.or(s -> s != null, s -> s.length() > 5);
}
""",
"""
import com.google.common.base.Predicate;

class Test {
Predicate<String> combined = ((Predicate<String>) s -> s != null).or(s -> s.length() > 5);
}
"""
)
Expand Down
Loading