Only change Guava Predicate.apply to test when not using filter or similar methods (#909)

* Add tests for inconsistency around Predicate and its method

This commit adds a test, in PreferJavaUtilPredicateTest, to reveal the
inconsistency between the conversion of
`com.google.common.base.Predicate` and its `apply` method.
The test is similar to
`NoGuavaPredicateTest.doNotChangeWhenUsingCollectionsFilter()`, and as a
consequence, the method must remain unchanged.

Bug: #908

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

* Fix faulty conflict resolve

---------

Co-authored-by: Tim te Beek <[email protected]>

Author: lredor

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

@@ -184,11 +184,6 @@ recipeList:
   - org.openrewrite.java.ChangeMethodTargetToStatic:
       methodPattern: com.google.common.base.Predicates not(com.google.common.base.Predicate)
       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
 
 ---

src/test/java/org/openrewrite/java/migrate/guava/NoGuavaPredicateTest.java

@@ -183,7 +183,11 @@ void doNotChangeWhenUsingCollectionsFilter() {
               import java.util.Collection;
 
               class Test {
-                  Predicate<String> notEmpty = s -> !s.isEmpty();
+                  Predicate<String> notEmpty = new Predicate<String>() {
+                      @Override public boolean apply(String s) {
+                          return !s.isEmpty();
+                      }
+                  };
 
                   public Collection<String> filterCollection(Collection<String> input) {
                       return Collections2.filter(input, notEmpty);

src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilPredicateTest.java

@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.Test;
 import org.openrewrite.DocumentExample;
 import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.Issue;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
@@ -100,4 +101,32 @@ public static Predicate<String> notEmptyPredicate() {
           )
         );
     }
+
+    @Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/899")
+    @Test
+    void doNotChangeWhenUsingCollectionsFilter() {
+        // Collections2.filter requires Guava Predicate as last parameter
+        rewriteRun(
+          //language=java
+          java(
+            """
+              import com.google.common.base.Predicate;
+              import com.google.common.collect.Collections2;
+              import java.util.Collection;
+
+              class Test {
+                  Predicate<String> notEmpty = new Predicate<String>() {
+                      @Override public boolean apply(String s) {
+                          return !s.isEmpty();
+                      }
+                  };
+
+                  public Collection<String> filterCollection(Collection<String> input) {
+                      return Collections2.filter(input, notEmpty);
+                  }
+              }
+              """
+          )
+        );
+    }
 }