Merge pull request #2138 from dugenkui03/patch-32

andimarek · web-flow · commit 79a57f67b5ad · 2021-02-02T14:43:31.000+11:00
Fix for IntrospectionResultToSchema
diff --git a/src/main/java/graphql/introspection/IntrospectionResultToSchema.java b/src/main/java/graphql/introspection/IntrospectionResultToSchema.java
@@ -34,6 +34,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import static graphql.Assert.assertNotEmpty;
 import static graphql.Assert.assertNotNull;
@@ -144,6 +145,7 @@ private DirectiveDefinition createDirective(Map<String, Object> input) {
         List<Map<String, Object>> args = (List<Map<String, Object>>) input.get("args");
         List<InputValueDefinition> inputValueDefinitions = createInputValueDefinitions(args);
         directiveDefBuilder.inputValueDefinitions(inputValueDefinitions);
+        Optional.ofNullable((Boolean) input.get("isRepeatable")).ifPresent(value -> directiveDefBuilder.repeatable(value));
 
         return directiveDefBuilder.build();
     }
diff --git a/src/test/groovy/graphql/introspection/IntrospectionResultToSchemaTest.groovy b/src/test/groovy/graphql/introspection/IntrospectionResultToSchemaTest.groovy
@@ -780,6 +780,15 @@ directiveArg: String = "default Value") on FIELD | FRAGMENT_SPREAD | INLINE_FRAG
                             "defaultValue": "\\"default Value\\""
                           }
                      ]
+                },
+                {
+                    "name": "repeatableDirective",
+                    "description": "repeatable directive",
+                    "locations": [
+                        "FIELD_DEFINITION"
+                    ],
+                    "args": [],
+                    "isRepeatable":true
                 }
             ]
          }"""
@@ -797,6 +806,9 @@ directiveArg: String = "default Value") on FIELD | FRAGMENT_SPREAD | INLINE_FRAG
 "customized directive"
 directive @customizedDirective("directive arg"
 directiveArg: String = "default Value") on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
+
+"repeatable directive"
+directive @repeatableDirective repeatable on FIELD_DEFINITION
 """
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -780,6 +780,15 @@ directiveArg: String = "default Value") on FIELD \| FRAGMENT_SPREAD \| INLINE_FRAG`
`780`	`780`	`"defaultValue": "\\"default Value\\""`
`781`	`781`	`}`
`782`	`782`	`]`
	`783`	`+ },`
	`784`	`+ {`
	`785`	`+ "name": "repeatableDirective",`
	`786`	`+ "description": "repeatable directive",`
	`787`	`+ "locations": [`
	`788`	`+ "FIELD_DEFINITION"`
	`789`	`+ ],`
	`790`	`+ "args": [],`
	`791`	`+ "isRepeatable":true`
`783`	`792`	`}`
`784`	`793`	`]`
`785`	`794`	`}"""`
`@@ -797,6 +806,9 @@ directiveArg: String = "default Value") on FIELD \| FRAGMENT_SPREAD \| INLINE_FRAG`
`797`	`806`	`"customized directive"`
`798`	`807`	`directive @customizedDirective("directive arg"`
`799`	`808`	`directiveArg: String = "default Value") on FIELD \| FRAGMENT_SPREAD \| INLINE_FRAGMENT`
	`809`	`+`
	`810`	`+"repeatable directive"`
	`811`	`+directive @repeatableDirective repeatable on FIELD_DEFINITION`
`800`	`812`	`"""`
`801`	`813`	`}`
`802`	`814`	`}`