Merge branch 'openrewrite:main' into main

Author: barbulescu

.claude/settings.json

@@ -38,8 +38,12 @@
       "mcp__idea__replace_specific_text",
       "mcp__idea__replace_text_in_file",
       "mcp__idea__search_in_files_by_text",
-      "mcp__idea__search_in_files_content"
+      "mcp__idea__search_in_files_content",
+      "Bash(../../gradlew dependencies --configuration runtimeClasspath)",
+      "Bash(../../gradlew dependencies --configuration implementation)",
+      "Bash(../../gradlew dependencies)",
+      "Bash(../../gradlew dependencies --configuration compileClasspath)"
     ],
     "deny": []
   }
-}
+}

rewrite-core/src/main/java/org/openrewrite/internal/ListUtils.java

@@ -265,7 +265,7 @@ public static <T> List<T> insert(@Nullable List<T> ls, @Nullable T t, int index)
      * For backwards compatibility; prefer {@link #map(List, Function)}.
      */
     @Contract("null, _ -> null; !null, _ -> !null")
-    public static <T> @Nullable List<T> map(@Nullable List<T> ls, UnaryOperator<@Nullable T> map) {
+    public static <T> @Nullable List<T> map(@Nullable List<T> ls, UnaryOperator<T> map) {
         return map(ls, (Function<T, T>) map);
     }
 

rewrite-core/src/test/java/org/openrewrite/CursorTest.java

@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.Test;
 import org.openrewrite.text.PlainText;
 
-import java.nio.file.Paths;
+import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -40,7 +40,7 @@ void peekMessages() {
     @Test
     void pollMessages() {
         var t = PlainText.builder()
-          .sourcePath(Paths.get("test.txt"))
+          .sourcePath(Path.of("test.txt"))
           .text("test")
           .build();
         var cursor = new Cursor(null, t);
@@ -57,7 +57,7 @@ void pollMessages() {
     @Test
     void pathPredicates() {
         var t = PlainText.builder()
-          .sourcePath(Paths.get("test.txt"))
+          .sourcePath(Path.of("test.txt"))
           .text("test")
           .build();
         var cursor = new Cursor(new Cursor(new Cursor(null, 1), t), 2);
@@ -67,7 +67,7 @@ void pathPredicates() {
     @Test
     void pathAsStreamPredicates() {
         var t = PlainText.builder()
-          .sourcePath(Paths.get("test.txt"))
+          .sourcePath(Path.of("test.txt"))
           .text("test")
           .build();
         var cursor = new Cursor(new Cursor(new Cursor(null, 1), t), 2);

rewrite-core/src/test/java/org/openrewrite/MoveFileTest.java

@@ -22,7 +22,6 @@
 import org.openrewrite.tree.ParsingExecutionContextView;
 
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -69,7 +68,7 @@ void printIdempotentDiffPrint() {
           DIFF HERE
           line 2
           """;
-        Path path = Paths.get("1.txt");
+        Path path = Path.of("1.txt");
         String expectedDiff = """
           --- a/1.txt
           +++ b/1.txt

rewrite-core/src/test/java/org/openrewrite/ParserTest.java

@@ -18,7 +18,6 @@
 import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.openrewrite.PathUtils.matchesGlob;
@@ -140,6 +139,6 @@ void combinedTest() {
     }
 
     private static Path path(String path) {
-        return Paths.get(path);
+        return Path.of(path);
     }
 }

rewrite-core/src/test/java/org/openrewrite/PathUtilsTest.java

@@ -28,7 +28,6 @@
 import org.openrewrite.text.*;
 
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
@@ -224,29 +223,29 @@ public AtomicBoolean getInitialValue(ExecutionContext ctx) {
 
         @Override
         public TreeVisitor<?, ExecutionContext> getScanner(AtomicBoolean shouldCreate) {
-            return new CreateFileVisitor(Paths.get(relativeFileName), shouldCreate);
+            return new CreateFileVisitor(Path.of(relativeFileName), shouldCreate);
         }
 
         @Override
         public Collection<SourceFile> generate(AtomicBoolean shouldCreate, ExecutionContext ctx) {
             if (shouldCreate.get()) {
                 return PlainTextParser.builder().build().parse(fileContents)
-                  .map(brandNewFile -> (SourceFile) brandNewFile.withSourcePath(Paths.get(relativeFileName)))
+                  .map(brandNewFile -> (SourceFile) brandNewFile.withSourcePath(Path.of(relativeFileName)))
                   .collect(toList());
             }
             return emptyList();
         }
 
         @Override
         public TreeVisitor<?, ExecutionContext> getVisitor(AtomicBoolean created) {
-            Path path = Paths.get(relativeFileName);
+            Path path = Path.of(relativeFileName);
             return new TreeVisitor<SourceFile, ExecutionContext>() {
                 @Override
                 public SourceFile visit(@Nullable Tree tree, ExecutionContext ctx) {
                     SourceFile sourceFile = (SourceFile) requireNonNull(tree);
                     if (Boolean.TRUE.equals(overwriteExisting) && path.equals(sourceFile.getSourcePath())) {
-                        if (sourceFile instanceof PlainText) {
-                            return ((PlainText) sourceFile).withText(fileContents);
+                        if (sourceFile instanceof PlainText text) {
+                            return text.withText(fileContents);
                         }
                         PlainText plainText = PlainText.builder()
                           .id(sourceFile.getId())

rewrite-core/src/test/java/org/openrewrite/RecipeEstimatedEffortTest.java

@@ -35,7 +35,6 @@
 import java.net.URI;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
@@ -55,7 +54,7 @@ void generateFile() {
         rewriteRun(
           spec -> spec
             .recipe(toRecipe()
-              .withGenerator(() -> List.of(PlainText.builder().sourcePath(Paths.get("test.txt")).text("test").build()))
+              .withGenerator(() -> List.of(PlainText.builder().sourcePath(Path.of("test.txt")).text("test").build()))
               .withName("test.GeneratingRecipe")
               .withMaxCycles(1)
             )
@@ -323,7 +322,7 @@ void accurateReportingOfRecipesMakingChanges() {
     @Issue("https://github.com/openrewrite/rewrite/issues/389")
     @Test
     void sourceFilesAcceptOnlyApplicableVisitors() {
-        var sources = List.of(new FooSource(), PlainText.builder().sourcePath(Paths.get("test.txt")).text("test").build());
+        var sources = List.of(new FooSource(), PlainText.builder().sourcePath(Path.of("test.txt")).text("test").build());
         var fooVisitor = new FooVisitor<ExecutionContext>();
         var textVisitor = new PlainTextVisitor<ExecutionContext>();
         var ctx = new InMemoryExecutionContext();

rewrite-core/src/test/java/org/openrewrite/RecipeLifecycleTest.java

@@ -20,7 +20,7 @@
 import org.openrewrite.marker.Markers;
 import org.openrewrite.quark.Quark;
 
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -30,7 +30,7 @@ class TreeVisitorTest {
 
     @Test
     void scheduleAfterOnVisitWithCursor() {
-        Quark quark = new Quark(Tree.randomId(), Paths.get("quark"), Markers.EMPTY, null, null);
+        Quark quark = new Quark(Tree.randomId(), Path.of("quark"), Markers.EMPTY, null, null);
         AtomicInteger visited = new AtomicInteger(0);
         TreeVisitor<Tree, Integer> scheduled = new TreeVisitor<>() {
             @Override

rewrite-core/src/test/java/org/openrewrite/TreeVisitorTest.java

@@ -28,7 +28,7 @@
 import org.openrewrite.text.PlainTextVisitor;
 
 import java.net.URI;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -256,7 +256,7 @@ void yamlPreconditionWithScanningRecipe() {
               s -> {
                   //noinspection DataFlowIssue
                   assertThat(s.getAfter()).isNotNull();
-                  assertThat(s.getAfter().getSourcePath()).isEqualTo(Paths.get("test.txt"));
+                  assertThat(s.getAfter().getSourcePath()).isEqualTo(Path.of("test.txt"));
               }
             ))
             .expectedCyclesThatMakeChanges(1),