Only change from apply to test when not using any filter methods

Author: timtebeek

src/main/java/org/openrewrite/java/migrate/guava/NoGuavaPredicate.java

@@ -15,10 +15,8 @@
  */
 package org.openrewrite.java.migrate.guava;
 
-import org.openrewrite.ExecutionContext;
-import org.openrewrite.Preconditions;
-import org.openrewrite.Recipe;
-import org.openrewrite.TreeVisitor;
+import org.openrewrite.*;
+import org.openrewrite.java.ChangeMethodName;
 import org.openrewrite.java.ChangeType;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.MethodMatcher;
@@ -42,11 +40,23 @@ public String getDescription() {
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return Preconditions.check(
                 Preconditions.not(new UsesPredicateMethod<>()),
-                new ChangeType(
-                        "com.google.common.base.Predicate",
-                        "java.util.function.Predicate",
-                        false)
-                        .getVisitor()
+                new TreeVisitor<Tree, ExecutionContext>() {
+                    @Override
+                    public Tree preVisit(Tree tree, ExecutionContext ctx) {
+                        Tree t = tree;
+                        t = new ChangeMethodName(
+                                "com.google.common.base.Predicate apply(..)",
+                                "test",
+                                true,
+                                false
+                        ).getVisitor().visitNonNull(t, ctx, getCursor().getParentOrThrow());
+                        return new ChangeType(
+                                "com.google.common.base.Predicate",
+                                "java.util.function.Predicate",
+                                false
+                        ).getVisitor().visitNonNull(t, ctx, getCursor().getParentOrThrow());
+                    }
+                }
         );
     }
 

src/main/resources/META-INF/rewrite/no-guava.yml

@@ -191,10 +191,6 @@ recipeList:
       methodPattern: com.google.common.base.Predicates isEqual(..)
       fullyQualifiedTargetTypeName: java.util.function.Predicate
 
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: com.google.common.base.Predicate apply(..)
-      newMethodName: test
-      matchOverrides: true
   - org.openrewrite.java.migrate.guava.NoGuavaPredicate
 
 ---