Merge branch 'main' into stats-issue-4876

Author: arodionov

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

@@ -350,7 +350,7 @@ public static <T> List<T> insert(@Nullable List<T> ls, @Nullable T t, int index)
      * @return A new list with expanded or modified elements, or the original list if unchanged.
      */
     @Contract("null, _ -> null; !null, _ -> !null")
-    public static <T> @Nullable List<T> flatMap(@Nullable List<T> ls, Function<T, Object> flatMap) {
+    public static <T> @Nullable List<T> flatMap(@Nullable List<T> ls, Function<T, @Nullable Object> flatMap) {
         return flatMap(ls, (i, t) -> flatMap.apply(t));
     }
 

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

@@ -121,7 +121,7 @@ protected String parseStringValue(String value, Function<String, @Nullable Strin
                 }
 
                 // Proceed with unprocessed value.
-                startIndex = result.indexOf(placeholderPrefix, endIndex + placeholderSuffix.length());
+                startIndex = result.indexOf(placeholderPrefix, endIndex);
                 visitedPlaceholders.remove(originalPlaceholder);
             } else {
                 startIndex = -1;

rewrite-core/src/main/java/org/openrewrite/text/PlainText.java

@@ -43,10 +43,12 @@
 @Value
 @Builder
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class PlainText implements SourceFileWithReferences, Tree, RpcCodec<PlainText> {
 
     @Builder.Default
     @With
+    @EqualsAndHashCode.Include
     UUID id = Tree.randomId();
 
     @With

rewrite-core/src/test/java/org/openrewrite/config/DeclarativeRecipeTest.java

@@ -372,7 +372,7 @@ void maxCyclesNested() {
           )
         );
         rewriteRun(
-          spec -> spec.recipe(root).cycles(10).cycles(3).expectedCyclesThatMakeChanges(3),
+          spec -> spec.recipe(root).cycles(10).cycles(3).expectedCyclesThatMakeChanges(2),
           text("1", "1+1+1")
         );
         assertThat(cycleCount).hasValue(3);

rewrite-core/src/test/java/org/openrewrite/internal/PropertyPlaceholderHelperTest.java

@@ -22,7 +22,40 @@
 class PropertyPlaceholderHelperTest {
 
     @Test
-    void dashed() {
+    void nested() {
+        var helper = new PropertyPlaceholderHelper("%%{", "}", null);
+        var s = helper.replacePlaceholders("%%{%%{k1}}", k -> switch (k) {
+            case "k1" -> "k2";
+            case "k2" -> "jon";
+            default -> throw new UnsupportedOperationException();
+        });
+        assertThat(s).isEqualTo("jon");
+    }
+
+    @Test
+    void notOnlyPlaceholders() {
+        var helper = new PropertyPlaceholderHelper("%%{", "}", null);
+        var s = helper.replacePlaceholders("Oh, %%{k1} there %%{k2}!", k -> switch (k) {
+            case "k1" -> "hi";
+            case "k2" -> "jon";
+            default -> throw new UnsupportedOperationException();
+        });
+        assertThat(s).isEqualTo("Oh, hi there jon!");
+    }
+
+    @Test
+    void dashedSeparation() {
+        var helper = new PropertyPlaceholderHelper("%%{", "}", null);
+        var s = helper.replacePlaceholders("%%{k1}-%%{k2}", k -> switch (k) {
+            case "k1" -> "hi";
+            case "k2" -> "jon";
+            default -> throw new UnsupportedOperationException();
+        });
+        assertThat(s).isEqualTo("hi-jon");
+    }
+
+    @Test
+    void spaceSeparation() {
         var helper = new PropertyPlaceholderHelper("%%{", "}", null);
         var s = helper.replacePlaceholders("%%{k1} %%{k2}", k -> switch (k) {
             case "k1" -> "hi";
@@ -31,4 +64,39 @@ void dashed() {
         });
         assertThat(s).isEqualTo("hi jon");
     }
+
+    @Test
+    void noSeparation() {
+        var helper = new PropertyPlaceholderHelper("%%{", "}", null);
+        var s = helper.replacePlaceholders("%%{k1}%%{k2}", k -> switch (k) {
+            case "k1" -> "hi";
+            case "k2" -> "jon";
+            default -> throw new UnsupportedOperationException();
+        });
+        assertThat(s).isEqualTo("hijon");
+    }
+
+    @Test
+    void withValueSeparatorAndValueReplacement() {
+        var helper = new PropertyPlaceholderHelper("%%{", "}", ",");
+        var s = helper.replacePlaceholders("%%{k1,oh} %%{k2}", k -> switch (k) {
+            case "k1" -> "hi";
+            case "k2" -> "jon";
+            // Note: this needs to not throw an exception because there won't be a match for "k1,oh" as a placeholder
+            default -> null;
+        });
+        assertThat(s).isEqualTo("hi jon");
+    }
+
+    @Test
+    void withValueSeparatorAndNullReplacement() {
+        var helper = new PropertyPlaceholderHelper("%%{", "}", ",");
+        var s = helper.replacePlaceholders("%%{k1,oh}%%{k2}", k -> switch (k) {
+            case "k1" -> null;
+            case "k2" -> "jon";
+            // Note: this needs to not throw an exception because there won't be a match for "k1,oh" as a placeholder
+            default -> null;
+        });
+        assertThat(s).isEqualTo("ohjon");
+    }
 }

rewrite-gradle/src/main/java/org/openrewrite/gradle/Assertions.java

@@ -26,6 +26,8 @@
 import org.openrewrite.test.SourceSpec;
 import org.openrewrite.test.SourceSpecs;
 import org.openrewrite.test.UncheckedConsumer;
+import org.openrewrite.text.PlainText;
+import org.openrewrite.text.PlainTextParser;
 
 import java.nio.file.Paths;
 import java.util.List;
@@ -178,4 +180,29 @@ public static SourceSpecs settingsGradleKts(@Language("kotlin") @Nullable String
         spec.accept(gradle);
         return gradle;
     }
+
+    static SourceSpecs lockFile(@Nullable String before) {
+        return lockFile(before, s -> {
+        });
+    }
+
+    static SourceSpecs lockFile(@Nullable String before, Consumer<SourceSpec<PlainText>> spec) {
+        SourceSpec<PlainText> lockFile = new SourceSpec<>(PlainText.class, null, PlainTextParser.builder(), before, null);
+        lockFile.path("gradle.lockfile");
+        spec.accept(lockFile);
+        return lockFile;
+    }
+
+    static SourceSpecs lockFile(@Nullable String before, @Nullable String after) {
+        return lockFile(before, after, s -> {
+        });
+    }
+
+    static SourceSpecs lockFile(@Nullable String before, @Nullable String after,
+                            Consumer<SourceSpec<PlainText>> spec) {
+        SourceSpec<PlainText> lockFile = new SourceSpec<>(PlainText.class, null, PlainTextParser.builder(), before, s-> after);
+        lockFile.path("gradle.lockfile");
+        spec.accept(lockFile);
+        return lockFile;
+    }
 }