shortened toDescription and added safety to hasDescription

gursajan · gursajan · commit ac2ca0c0978b · 2020-02-05T11:31:01.000+11:00
diff --git a/src/main/java/graphql/introspection/IntrospectionResultToSchema.java b/src/main/java/graphql/introspection/IntrospectionResultToSchema.java
@@ -145,7 +145,7 @@ UnionTypeDefinition createUnion(Map<String, Object> input) {
 
         UnionTypeDefinition.Builder unionTypeDefinition = UnionTypeDefinition.newUnionTypeDefinition();
         unionTypeDefinition.name((String) input.get("name"));
-        unionTypeDefinition.description(toDescription((String) input.get("description")));
+        unionTypeDefinition.description(toDescription(input));
 
         List<Map<String, Object>> possibleTypes = (List<Map<String, Object>>) input.get("possibleTypes");
 
@@ -162,14 +162,14 @@ EnumTypeDefinition createEnum(Map<String, Object> input) {
         assertTrue(input.get("kind").equals("ENUM"), "wrong input");
 
         EnumTypeDefinition.Builder enumTypeDefinition = EnumTypeDefinition.newEnumTypeDefinition().name((String) input.get("name"));
-        enumTypeDefinition.description(toDescription((String) input.get("description")));
+        enumTypeDefinition.description(toDescription(input));
 
         List<Map<String, Object>> enumValues = (List<Map<String, Object>>) input.get("enumValues");
 
         for (Map<String, Object> enumValue : enumValues) {
 
             EnumValueDefinition.Builder enumValueDefinition = EnumValueDefinition.newEnumValueDefinition().name((String) enumValue.get("name"));
-            enumTypeDefinition.description(toDescription((String) input.get("description")));
+            enumTypeDefinition.description(toDescription(input));
 
             createDeprecatedDirective(enumValue, enumValueDefinition);
 
@@ -184,7 +184,7 @@ InterfaceTypeDefinition createInterface(Map<String, Object> input) {
         assertTrue(input.get("kind").equals("INTERFACE"), "wrong input");
 
         InterfaceTypeDefinition.Builder interfaceTypeDefinition = InterfaceTypeDefinition.newInterfaceTypeDefinition().name((String) input.get("name"));
-        interfaceTypeDefinition.description(toDescription((String) input.get("description")));
+        interfaceTypeDefinition.description(toDescription(input));
         List<Map<String, Object>> fields = (List<Map<String, Object>>) input.get("fields");
         interfaceTypeDefinition.definitions(createFields(fields));
 
@@ -198,7 +198,7 @@ InputObjectTypeDefinition createInputObject(Map<String, Object> input) {
 
         InputObjectTypeDefinition.Builder inputObjectTypeDefinition = InputObjectTypeDefinition.newInputObjectDefinition()
                 .name((String) input.get("name"))
-                .description(toDescription((String) input.get("description")));
+                .description(toDescription(input));
 
         List<Map<String, Object>> fields = (List<Map<String, Object>>) input.get("inputFields");
         List<InputValueDefinition> inputValueDefinitions = createInputValueDefinitions(fields);
@@ -212,7 +212,7 @@ ObjectTypeDefinition createObject(Map<String, Object> input) {
         assertTrue(input.get("kind").equals("OBJECT"), "wrong input");
 
         ObjectTypeDefinition.Builder objectTypeDefinition = ObjectTypeDefinition.newObjectTypeDefinition().name((String) input.get("name"));
-        objectTypeDefinition.description(toDescription((String) input.get("description")));
+        objectTypeDefinition.description(toDescription(input));
         if (input.containsKey("interfaces")) {
             objectTypeDefinition.implementz(
                     ((List<Map<String, Object>>) input.get("interfaces")).stream()
@@ -231,7 +231,7 @@ private List<FieldDefinition> createFields(List<Map<String, Object>> fields) {
         List<FieldDefinition> result = new ArrayList<>();
         for (Map<String, Object> field : fields) {
             FieldDefinition.Builder fieldDefinition = FieldDefinition.newFieldDefinition().name((String) field.get("name"));
-            fieldDefinition.description(toDescription((String) field.get("description")));
+            fieldDefinition.description(toDescription(field));
             fieldDefinition.type(createTypeIndirection((Map<String, Object>) field.get("type")));
 
             createDeprecatedDirective(field, fieldDefinition);
@@ -264,7 +264,7 @@ private List<InputValueDefinition> createInputValueDefinitions(List<Map<String,
         for (Map<String, Object> arg : args) {
             Type argType = createTypeIndirection((Map<String, Object>) arg.get("type"));
             InputValueDefinition.Builder inputValueDefinition = InputValueDefinition.newInputValueDefinition().name((String) arg.get("name")).type(argType);
-            inputValueDefinition.description(toDescription((String) arg.get("description")));
+            inputValueDefinition.description(toDescription(arg));
 
             String valueLiteral = (String) arg.get("defaultValue");
             if (valueLiteral != null) {
@@ -296,7 +296,8 @@ private Type createTypeIndirection(Map<String, Object> type) {
         }
     }
 
-    private Description toDescription(String description) {
+    private Description toDescription(Map<String, Object> input) {
+        String description = (String) input.get("description");
         if (description == null) {
             return null;
         }
diff --git a/src/main/java/graphql/language/AstPrinter.java b/src/main/java/graphql/language/AstPrinter.java
@@ -185,7 +185,7 @@ private NodePrinter<FieldDefinition> fieldDefinition() {
     }
 
     private boolean hasDescription(List<? extends Node> nodes) {
-        return nodes.stream().anyMatch(it -> ((AbstractDescribedNode) it).getDescription() != null);
+        return nodes.stream().filter(it -> it instanceof AbstractDescribedNode).anyMatch(it -> ((AbstractDescribedNode) it).getDescription() != null);
     }
 
     private NodePrinter<FragmentDefinition> fragmentDefinition() {

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ private NodePrinter<FieldDefinition> fieldDefinition() {`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`private boolean hasDescription(List<? extends Node> nodes) {`
`188`		`- return nodes.stream().anyMatch(it -> ((AbstractDescribedNode) it).getDescription() != null);`
	`188`	`+ return nodes.stream().filter(it -> it instanceof AbstractDescribedNode).anyMatch(it -> ((AbstractDescribedNode) it).getDescription() != null);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`private NodePrinter<FragmentDefinition> fragmentDefinition() {`