Merge pull request graphql-java#1133 from graphql-java/restrict-to-sdl-definitions

andimarek · web-flow · commit ad87047bcebf · 2018-07-27T20:53:24.000+10:00
restrict add to SDLDefinitions
diff --git a/src/main/java/graphql/schema/idl/SchemaParser.java b/src/main/java/graphql/schema/idl/SchemaParser.java
@@ -5,6 +5,7 @@
 import graphql.PublicApi;
 import graphql.language.Definition;
 import graphql.language.Document;
+import graphql.language.SDLDefinition;
 import graphql.parser.Parser;
 import graphql.schema.idl.errors.SchemaProblem;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
@@ -101,7 +102,9 @@ public TypeDefinitionRegistry buildRegistry(Document document) {
         TypeDefinitionRegistry typeRegistry = new TypeDefinitionRegistry();
         List<Definition> definitions = document.getDefinitions();
         for (Definition definition : definitions) {
-            typeRegistry.add(definition).ifPresent(errors::add);
+            if (definition instanceof SDLDefinition) {
+                typeRegistry.add((SDLDefinition) definition).ifPresent(errors::add);
+            }
         }
         if (errors.size() > 0) {
             throw new SchemaProblem(errors);
diff --git a/src/main/java/graphql/schema/idl/TypeDefinitionRegistry.java b/src/main/java/graphql/schema/idl/TypeDefinitionRegistry.java
@@ -3,7 +3,6 @@
 import graphql.Assert;
 import graphql.GraphQLError;
 import graphql.PublicApi;
-import graphql.language.Definition;
 import graphql.language.DirectiveDefinition;
 import graphql.language.EnumTypeExtensionDefinition;
 import graphql.language.InputObjectTypeExtensionDefinition;
@@ -143,7 +142,7 @@ public TypeDefinitionRegistry merge(TypeDefinitionRegistry typeRegistry) throws
      *
      * @return an optional error
      */
-    public Optional<GraphQLError> add(Definition definition) {
+    public Optional<GraphQLError> add(SDLDefinition definition) {
         // extensions
         if (definition instanceof ObjectTypeExtensionDefinition) {
             ObjectTypeExtensionDefinition newEntry = (ObjectTypeExtensionDefinition) definition;
@@ -181,6 +180,8 @@ public Optional<GraphQLError> add(Definition definition) {
             } else {
                 schema = newSchema;
             }
+        } else {
+            return Assert.assertShouldNeverHappen();
         }
         return Optional.empty();
     }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`import graphql.Assert;`
`4`	`4`	`import graphql.GraphQLError;`
`5`	`5`	`import graphql.PublicApi;`
`6`		`-import graphql.language.Definition;`
`7`	`6`	`import graphql.language.DirectiveDefinition;`
`8`	`7`	`import graphql.language.EnumTypeExtensionDefinition;`
`9`	`8`	`import graphql.language.InputObjectTypeExtensionDefinition;`
`@@ -143,7 +142,7 @@ public TypeDefinitionRegistry merge(TypeDefinitionRegistry typeRegistry) throws`
`143`	`142`	`*`
`144`	`143`	`* @return an optional error`
`145`	`144`	`*/`
`146`		`- public Optional<GraphQLError> add(Definition definition) {`
	`145`	`+ public Optional<GraphQLError> add(SDLDefinition definition) {`
`147`	`146`	`// extensions`
`148`	`147`	`if (definition instanceof ObjectTypeExtensionDefinition) {`
`149`	`148`	`ObjectTypeExtensionDefinition newEntry = (ObjectTypeExtensionDefinition) definition;`
`@@ -181,6 +180,8 @@ public Optional<GraphQLError> add(Definition definition) {`
`181`	`180`	`} else {`
`182`	`181`	`schema = newSchema;`
`183`	`182`	`}`
	`183`	`+ } else {`
	`184`	`+ return Assert.assertShouldNeverHappen();`
`184`	`185`	`}`
`185`	`186`	`return Optional.empty();`
`186`	`187`	`}`