toString improvement

openrewrite · Dec 16, 2024 · 6eccf0c · 6eccf0c
1 parent 9266f9e
commit 6eccf0c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/src/main/java/org/openrewrite/java/template/processor/PreCondition.java b/src/main/java/org/openrewrite/java/template/processor/PreCondition.java
@@ -110,10 +110,10 @@ private static String joinPreconditions(Collection<PreCondition> rules, String o
         } else if (rules.size() == 1) {
             return rules.iterator().next().toString();
         }
-        char[] indentChars = new char[indent];
-        Arrays.fill(indentChars, ' ');
-        String indentStr = new String(indentChars);
+        String whitespace = String.format("%" + indent + "s", " ");
         Set<String> preconditions = rules.stream().map(Object::toString).collect(toSet());
-        return "Preconditions." + op + "(\n" + indentStr + String.join(",\n" + indentStr, preconditions) + "\n" + indentStr.substring(0, indent - 4) + ')';
+        return "Preconditions." + op + "(\n"
+                + whitespace + String.join(",\n" + whitespace, preconditions) + "\n"
+                + whitespace.substring(0, indent - 4) + ')';
     }
 }
diff --git a/src/test/java/org/openrewrite/java/template/processor/PreConditionTest.java b/src/test/java/org/openrewrite/java/template/processor/PreConditionTest.java
@@ -9,6 +9,40 @@
 import static com.google.common.truth.Truth.assertThat;
 
 class PreConditionTest {
+    @Test
+    void toStringWithInden() {
+        String result = new PreCondition.Or(
+          setOf(
+            new PreCondition.And(
+              setOf(
+                new PreCondition.Rule("A"),
+                new PreCondition.Rule("B"),
+                new PreCondition.Rule("C")),
+              4
+            ),
+            new PreCondition.And(
+              setOf(
+                new PreCondition.Rule("X"),
+                new PreCondition.Rule("Y"),
+                new PreCondition.Rule("Z")),
+              4
+            )
+          ), 4).toString();
+
+        assertThat(result).isEqualTo("Preconditions.or(\n" +
+          "    Preconditions.and(\n" +
+          "    X,\n" +
+          "    Y,\n" +
+          "    Z\n" +
+          "),\n" +
+          "    Preconditions.and(\n" +
+          "    A,\n" +
+          "    B,\n" +
+          "    C\n" +
+          ")\n" +
+          ")");
+    }
+
     @Test
     void sameRulesArePrunedAutomatically() {
         Set<PreCondition> result = setOf(new PreCondition.Rule("A"), new PreCondition.Rule("A"));