Merge pull request #1385 from robp94/main-issue-1384

#1384 fix arrays
smallrye · May 8, 2022 · ee2089c · ee2089c
2 parents 3f7a7ab + 9c2eb79
commit ee2089c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/...tation/src/main/java/io/smallrye/graphql/execution/datafetcher/helper/ArgumentHelper.java b/...tation/src/main/java/io/smallrye/graphql/execution/datafetcher/helper/ArgumentHelper.java
@@ -423,7 +423,7 @@ private List handleList(List list, Field field) {
             if (item instanceof Map) {
                 result.add(includeNullCreatorParameters((Map) item, field));
             } else {
-                // can this ever happen?
+                result.add(item);
             }
         });
         return result;

diff --git a/...r/integration-tests-jdk16/src/test/java/io/smallrye/graphql/tests/records/RecordTest.java b/...r/integration-tests-jdk16/src/test/java/io/smallrye/graphql/tests/records/RecordTest.java
@@ -18,6 +18,7 @@
 
 import jakarta.json.bind.annotation.JsonbCreator;
 import java.net.URL;
+import java.util.Set;
 
 import static io.smallrye.graphql.client.core.Argument.arg;
 import static io.smallrye.graphql.client.core.Argument.args;
@@ -68,14 +69,23 @@ public void testSimpleRecordWithFactory() throws Exception {
             Document query = document(operation(
                     field("simpleWithFactory",
                             args(arg("input",
-                                    inputObject(prop("a", "a"), prop("b", "b")))),
+                                    inputObject(prop("a", "a"),
+                                            prop("b", "b"),
+                                            prop("c", new String[] { "c", "cc" }),
+                                            prop("d", new String[] { "d", "dd" })))),
                             field("a"),
-                            field("b"))));
+                            field("b"),
+                            field("c"),
+                            field("d"))));
             Response response = client.executeSync(query);
             System.out.println(response);
             System.out.println("query.build() = " + query.build());
             assertEquals("a", response.getData().getJsonObject("simpleWithFactory").getString("a"));
             assertEquals("b", response.getData().getJsonObject("simpleWithFactory").getString("b"));
+            assertEquals("c", response.getData().getJsonObject("simpleWithFactory").getJsonArray("c").getString(0));
+            assertEquals("cc", response.getData().getJsonObject("simpleWithFactory").getJsonArray("c").getString(1));
+            assertEquals("dd", response.getData().getJsonObject("simpleWithFactory").getJsonArray("d").getString(0));
+            assertEquals("d", response.getData().getJsonObject("simpleWithFactory").getJsonArray("d").getString(1));
         }
     }
 
@@ -106,11 +116,11 @@ public record SimpleRecord(String a, String b) {
 
     }
 
-    public record SimpleRecordWithFactory(String a, String b) {
+    public record SimpleRecordWithFactory(String a, String b, String[] c, Set<String> d) {
 
         @JsonbCreator
-        public static SimpleRecordWithFactory build(String a, String b) {
-            return new SimpleRecordWithFactory(a, b);
+        public static SimpleRecordWithFactory build(String a, String b, String[] c, Set<String> d) {
+            return new SimpleRecordWithFactory(a, b, c, d);
         }
 
     }