preserve-whitespace-in-MigrateCollectionsUnmodifiableList (#806)

* Preserve original argument formatting in `MigrateCollectionsUnmodifiableList`

Fixes #805

* Remove unused imports

Author: timtebeek

src/main/java/org/openrewrite/java/migrate/util/MigrateCollectionsUnmodifiableList.java

@@ -24,12 +24,8 @@
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesJavaVersion;
 import org.openrewrite.java.search.UsesMethod;
-import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.J;
 
-import java.util.List;
-import java.util.StringJoiner;
-
 public class MigrateCollectionsUnmodifiableList extends Recipe {
     private static final MethodMatcher UNMODIFIABLE_LIST = new MethodMatcher("java.util.Collections unmodifiableList(java.util.List)", true);
     private static final MethodMatcher ARRAYS_AS_LIST = new MethodMatcher("java.util.Arrays asList(..)", true);
@@ -59,15 +55,16 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
                             maybeRemoveImport("java.util.Collections");
                             maybeRemoveImport("java.util.Arrays");
                             maybeAddImport("java.util.List");
-                            StringJoiner setOf = new StringJoiner(", ", "List.of(", ")");
-                            List<Expression> args = arraysInvocation.getArguments();
-                            args.forEach(o -> setOf.add("#{any()}"));
 
-                            return JavaTemplate.builder(setOf.toString())
-                                    .contextSensitive()
+                            // Build the List.of() invocation while preserving the original method's formatting
+                            J.MethodInvocation listOf = JavaTemplate.builder("List.of()")
                                     .imports("java.util.List")
                                     .build()
-                                    .apply(updateCursor(m), m.getCoordinates().replace(), args.toArray());
+                                    .apply(updateCursor(m), m.getCoordinates().replace());
+
+                            // Replace the arguments while preserving their original formatting, comments, and padding
+                            return listOf.withArguments(arraysInvocation.getArguments())
+                                    .getPadding().withArguments(arraysInvocation.getPadding().getArguments());
                         }
                     }
                 }

src/test/java/org/openrewrite/java/migrate/util/MigrateCollectionsUnmodifiableListTest.java

@@ -77,7 +77,40 @@ class Test {
                 import java.time.LocalDate;
 
                 class Test {
-                    List<LocalDate> s = List.of(LocalDate.of(2010, 1, 1), LocalDate.now());
+                    List<LocalDate> s = List.of(LocalDate.of(2010,1,1),LocalDate.now());
+                }
+                """
+            ),
+            9
+          )
+        );
+    }
+
+    @Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/805")
+    @Test
+    void preserveComments() {
+        //language=java
+        rewriteRun(
+          version(
+            java(
+              """
+                import java.util.*;
+
+                class Test {
+                    List<String> bar = Collections.unmodifiableList(Arrays.asList(
+                        "1", // this is one
+                        "2" // this is two
+                    ));
+                }
+                """,
+              """
+                import java.util.List;
+
+                class Test {
+                    List<String> bar = List.of(
+                        "1", // this is one
+                        "2" // this is two
+                    );
                 }
                 """
             ),