Add support list of objects in json transformer

datafaker-net · Feb 11, 2023 · e38f556 · e38f556
1 parent acd7d0b
commit e38f556
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/src/main/java/net/datafaker/transformations/JsonTransformer.java b/src/main/java/net/datafaker/transformations/JsonTransformer.java
@@ -39,7 +39,7 @@ public String apply(IN input, Schema<IN, ?> schema) {
             if (fields[i] instanceof CompositeField) {
                 sb.append(apply(input, (CompositeField) fields[i], i));
             } else {
-                applyValue(input, sb, fields[i]);
+                applyValue(input, sb, ((SimpleField) fields[i]).transform(input));
             }
             if (i < fields.length - 1) {
                 sb.append(", ");
@@ -77,8 +77,7 @@ public String generate(Schema<IN, ?> schema, int limit) {
         return limit > 1 ? wrappers[0] + LINE_SEPARATOR + sb + LINE_SEPARATOR + wrappers[1] : sb.toString();
     }
 
-    private void applyValue(IN input, StringBuilder sb, Field<?, ?> fields) {
-        Object value = ((SimpleField) fields).transform(input);
+    private void applyValue(IN input, StringBuilder sb, Object value) {
         if (value instanceof Collection<?>) {
             sb.append(generate(input,(Collection) value));
         } else if (value != null && value.getClass().isArray()) {
@@ -100,7 +99,7 @@ private String generate(IN input, Collection<Object> collection) {
             if (value instanceof CompositeField<?,?>) {
                 sb.append(apply(input,((CompositeField) value)));
             } else {
-                value2String(value, sb);
+                applyValue(input, sb, value);
             }
         }
         sb.append("]");

diff --git a/src/test/java/net/datafaker/formats/JsonTest.java b/src/test/java/net/datafaker/formats/JsonTest.java
@@ -311,6 +311,35 @@ void jsonObjectCollectionTest() {
             "\"objectCollection\": [{\"country\": \"Denmark\", \"city\": \"Port Angel\"}, {\"two\": \"Denmark\", \"one\": \"Port Angel\"}]}");
     }
 
+    @Test
+    void jsonCollectionOfCollectionsTest() {
+        JsonTransformer<Name> transformer = JsonTransformer.<Name>builder().build();
+
+        String json = transformer.generate(
+            Schema.of(
+                field("text", () -> "Mrs. Brian Braun"),
+                field("objectCollection", () -> List.of(
+                        List.of(
+                            List.of(
+                                compositeField(null, new Field[]{
+                                        field("country", () -> "Denmark"),
+                                        field("city", () -> "Port Angel")
+                                    }
+                                ),
+                                compositeField(null, new Field[]{
+                                        field("two", () -> "Denmark"),
+                                        field("one", () -> "Port Angel")
+                                    }
+                                )
+                            )
+                        )
+                    )
+                )
+            ), 1);
+        assertThat(json).isEqualTo("{\"text\": \"Mrs. Brian Braun\", " +
+            "\"objectCollection\": [[[{\"country\": \"Denmark\", \"city\": \"Port Angel\"}, {\"two\": \"Denmark\", \"one\": \"Port Angel\"}]]]}");
+    }
+
     private static Map.Entry<Supplier<String>, Supplier<Object>> entry(
         Supplier<String> key, Supplier<Object> value) {
         return new AbstractMap.SimpleEntry<>(key, value);