ignore fields with unknown type

andimarek · andimarek · commit 367e22480725 · 2015-08-16T23:34:36.000+02:00
diff --git a/src/main/java/graphql/validation/rules/OverlappingFieldsCanBeMerged.java b/src/main/java/graphql/validation/rules/OverlappingFieldsCanBeMerged.java
@@ -94,7 +94,9 @@ private Conflict findConflict(String responseName, FieldAndType fieldAndType1, F
         }
 
         if (!sameType(type1, type2)) {
-            String reason = String.format("%s: they return differing types %s and %s", responseName, type1.getName(), type2.getName());
+            String name1 = type1 != null ? type1.getName() : "null";
+            String name2 = type2 != null ? type2.getName() : "null";
+            String reason = String.format("%s: they return differing types %s and %s", responseName, name1, name2);
             return new Conflict(responseName, reason, field1, field2);
         }
 
@@ -150,9 +152,7 @@ private String joinReasons(List<Conflict> conflicts) {
     }
 
     private boolean sameType(GraphQLType type1, GraphQLType type2) {
-        if (type1 == null && type2 == null) return true;
-        if (type1 == null) return false;
-        if (type2 == null) return false;
+        if (type1 == null || type2 == null) return true;
         return type1.equals(type2);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,9 @@ private Conflict findConflict(String responseName, FieldAndType fieldAndType1, F`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`if (!sameType(type1, type2)) {`
`97`		`- String reason = String.format("%s: they return differing types %s and %s", responseName, type1.getName(), type2.getName());`
	`97`	`+ String name1 = type1 != null ? type1.getName() : "null";`
	`98`	`+ String name2 = type2 != null ? type2.getName() : "null";`
	`99`	`+ String reason = String.format("%s: they return differing types %s and %s", responseName, name1, name2);`
`98`	`100`	`return new Conflict(responseName, reason, field1, field2);`
`99`	`101`	`}`
`100`	`102`
`@@ -150,9 +152,7 @@ private String joinReasons(List<Conflict> conflicts) {`
`150`	`152`	`}`
`151`	`153`
`152`	`154`	`private boolean sameType(GraphQLType type1, GraphQLType type2) {`
`153`		`- if (type1 == null && type2 == null) return true;`
`154`		`- if (type1 == null) return false;`
`155`		`- if (type2 == null) return false;`
	`155`	`+ if (type1 == null \|\| type2 == null) return true;`
`156`	`156`	`return type1.equals(type2);`
`157`	`157`	`}`
`158`	`158`