Use Collectors.toList() while we support older Java versions still

Author: timtebeek

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

@@ -35,12 +35,12 @@ public class NoGuavaCollections2Transform extends Recipe {
 
     @Override
     public String getDisplayName() {
-        return "Prefer `Collection.stream().transform(Function)`";
+        return "Prefer `Collection.stream().map(Function)` over `Collections2.transform`";
     }
 
     @Override
     public String getDescription() {
-        return "Prefer `Collection.stream().transform(Function)` over `Collections2.transform(Collection, Function)`.";
+        return "Prefer `Collection.stream().map(Function)` over `Collections2.transform(Collection, Function)`.";
     }
 
     @Override
@@ -59,9 +59,11 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                             maybeRemoveImport("com.google.common.base.Function");
                             maybeRemoveImport("com.google.common.collect.Collections2");
                             maybeAddImport("java.util.function.Function");
+                            maybeAddImport("java.util.stream.Collectors");
 
                             if (TypeUtils.isAssignableTo("java.util.Collection", method.getArguments().get(0).getType())) {
-                                return JavaTemplate.builder("#{any(java.util.Collection)}.stream().map(#{any(java.util.function.Function)}).toList()")
+                                return JavaTemplate.builder("#{any(java.util.Collection)}.stream().map(#{any(java.util.function.Function)}).collect(Collectors.toList())")
+                                        .imports("java.util.stream.Collectors")
                                         .build()
                                         .apply(getCursor(),
                                                 method.getCoordinates().replace(),

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

@@ -35,12 +35,12 @@ public class NoGuavaIterablesTransform extends Recipe {
 
     @Override
     public String getDisplayName() {
-        return "Prefer `Collection.stream().transform(Function)`";
+        return "Prefer `Collection.stream().map(Function)` over `Iterables.transform`";
     }
 
     @Override
     public String getDescription() {
-        return "Prefer `Collection.stream().transform(Function)` over `Iterables.transform(Collection, Function)`.";
+        return "Prefer `Collection.stream().map(Function)` over `Iterables.transform(Collection, Function)`.";
     }
 
     @Override
@@ -59,9 +59,11 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                             maybeRemoveImport("com.google.common.base.Function");
                             maybeRemoveImport("com.google.common.collect.Iterables");
                             maybeAddImport("java.util.function.Function");
+                            maybeAddImport("java.util.stream.Collectors");
 
                             if (TypeUtils.isAssignableTo("java.util.Collection", method.getArguments().get(0).getType())) {
-                                return JavaTemplate.builder("#{any(java.util.Collection)}.stream().map(#{any(java.util.function.Function)}).toList()")
+                                return JavaTemplate.builder("#{any(java.util.Collection)}.stream().map(#{any(java.util.function.Function)}).collect(Collectors.toList())")
+                                        .imports("java.util.stream.Collectors")
                                         .build()
                                         .apply(getCursor(),
                                                 method.getCoordinates().replace(),

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

@@ -53,12 +53,13 @@ Iterable<Integer> test(Collection<String> collection, Function<String, Integer>
               """,
             """
               import java.util.Collection;
+              import java.util.stream.Collectors;
 
               import com.google.common.base.Function;
 
               class Test {
                   Iterable<Integer> test(Collection<String> collection, Function<String, Integer> toSize) {
-                      return collection.stream().map(toSize).toList();
+                      return collection.stream().map(toSize).collect(Collectors.toList());
                   }
               }
               """

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

@@ -53,12 +53,13 @@ Iterable<Integer> test(Collection<String> collection, Function<String, Integer>
               """,
             """
               import java.util.Collection;
+              import java.util.stream.Collectors;
 
               import com.google.common.base.Function;
 
               class Test {
                   Iterable<Integer> test(Collection<String> collection, Function<String, Integer> toSize) {
-                      return collection.stream().map(toSize).toList();
+                      return collection.stream().map(toSize).collect(Collectors.toList());
                   }
               }
               """