Merge branch 'main' into lredor/bug/908

Author: timtebeek

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

@@ -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);
                 }

src/test/java/org/openrewrite/java/migrate/UpdateSdkManTest.java

@@ -157,10 +157,11 @@ void zuluNonCrac() {
             """
               java=11.0.28-zulu
               """,
-            """
-              java=17.0.16-zulu
-              """,
             spec -> spec.path(".sdkmanrc")
+              .after(str -> assertThat(str)
+                .startsWith("java=17.0.")
+                .endsWith("-zulu")
+                .actual())
           )
         );
     }
@@ -173,10 +174,12 @@ void upgradeIfNewVersionIsStillSameVersionBasisAndSameDistribution() {
             """
               java=21.0.6-zulu
               """,
-            """
-              java=21.0.8-zulu
-              """,
             spec -> spec.path(".sdkmanrc")
+              .after(str -> assertThat(str)
+                .startsWith("java=21.0.")
+                .doesNotContain("21.0.6")
+                .endsWith("-zulu")
+                .actual())
           )
         );
     }

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

@@ -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);
               }
               """
           )