Merge branch 'main' into lredor/bug/908-PredicatesEqualTo

Author: timtebeek

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

@@ -84,8 +84,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/main/resources/sdkman-java.csv

@@ -12,6 +12,11 @@
 11.0.28-zulu
 11.0.28.fx-librca
 11.0.28.fx-zulu
+11.0.29-amzn
+11.0.29-librca
+11.0.29-sapmchn
+11.0.29-zulu
+11.0.29.fx-librca
 17.0.12-graal
 17.0.12-oracle
 17.0.14-jbr
@@ -29,6 +34,12 @@
 17.0.16.crac-zulu
 17.0.16.fx-librca
 17.0.16.fx-zulu
+17.0.17-amzn
+17.0.17-librca
+17.0.17-sapmchn
+17.0.17-tem
+17.0.17-zulu
+17.0.17.fx-librca
 17.0.9-graalce
 21.0.2-graalce
 21.0.2-open
@@ -49,6 +60,13 @@
 21.0.8.crac-zulu
 21.0.8.fx-librca
 21.0.8.fx-zulu
+21.0.9-amzn
+21.0.9-graal
+21.0.9-librca
+21.0.9-oracle
+21.0.9-sapmchn
+21.0.9-zulu
+21.0.9.fx-librca
 22.0.2-oracle
 22.0.2-sem
 22.1.0.1.r11-gln
@@ -99,6 +117,16 @@
 25-tem
 25-zulu
 25.0.0.1.r25-mandrel
+25.0.1-amzn
+25.0.1-graal
+25.0.1-graalce
+25.0.1-librca
+25.0.1-open
+25.0.1-oracle
+25.0.1-sapmchn
+25.0.1-zulu
+25.0.1.fx-librca
+25.0.1.fx-zulu
 25.crac-zulu
 25.fx-librca
 25.fx-nik
@@ -109,6 +137,7 @@
 26.ea.17-open
 26.ea.18-open
 26.ea.19-open
+26.ea.20-open
 6.0.119-zulu
 7.0.352-zulu
 8.0.282-trava
@@ -121,4 +150,9 @@
 8.0.462-tem
 8.0.462-zulu
 8.0.462.fx-librca
-8.0.462.fx-zulu
+8.0.462.fx-zulu
+8.0.472-amzn
+8.0.472-librca
+8.0.472-zulu
+8.0.472.fx-librca
+8u342b07-tem

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