Add fix and tests

dondonz · dondonz · commit 07b00fa5ad42 · 2023-03-14T14:10:13.000+11:00
diff --git a/src/main/java/graphql/language/SDLExtensionDefinition.java b/src/main/java/graphql/language/SDLExtensionDefinition.java
@@ -4,7 +4,7 @@
 import graphql.PublicApi;
 
 /**
- * An marker interface for Schema Definition Language (SDL) extension definitions.
+ * A marker interface for Schema Definition Language (SDL) extension definitions.
  */
 @PublicApi
 public interface SDLExtensionDefinition {
diff --git a/src/main/java/graphql/schema/idl/SchemaGeneratorHelper.java b/src/main/java/graphql/schema/idl/SchemaGeneratorHelper.java
@@ -909,10 +909,13 @@ void buildOperations(BuildContext buildCtx, GraphQLSchema.Builder schemaBuilder)
 
         Optional<OperationTypeDefinition> mutationOperation = getOperationNamed("mutation", operationTypeDefs);
         if (!mutationOperation.isPresent()) {
-            Optional<TypeDefinition> mutationTypeDef = typeRegistry.getType("Mutation");
-            if (mutationTypeDef.isPresent()) {
-                mutation = buildOutputType(buildCtx, TypeName.newTypeName().name(mutationTypeDef.get().getName()).build());
-                schemaBuilder.mutation(mutation);
+            if (!typeRegistry.schemaDefinition().isPresent()) {
+                // If no schema definition, then there is no schema keyword. Default to using type called Mutation
+                Optional<TypeDefinition> mutationTypeDef = typeRegistry.getType("Mutation");
+                if (mutationTypeDef.isPresent()) {
+                    mutation = buildOutputType(buildCtx, TypeName.newTypeName().name(mutationTypeDef.get().getName()).build());
+                    schemaBuilder.mutation(mutation);
+                }
             }
         } else {
             mutation = buildOperation(buildCtx, mutationOperation.get());
@@ -921,10 +924,13 @@ void buildOperations(BuildContext buildCtx, GraphQLSchema.Builder schemaBuilder)
 
         Optional<OperationTypeDefinition> subscriptionOperation = getOperationNamed("subscription", operationTypeDefs);
         if (!subscriptionOperation.isPresent()) {
-            Optional<TypeDefinition> subscriptionTypeDef = typeRegistry.getType("Subscription");
-            if (subscriptionTypeDef.isPresent()) {
-                subscription = buildOutputType(buildCtx, TypeName.newTypeName().name(subscriptionTypeDef.get().getName()).build());
-                schemaBuilder.subscription(subscription);
+            if (!typeRegistry.schemaDefinition().isPresent()) {
+                // If no schema definition, then there is no schema keyword. Default to using type called Subscription
+                Optional<TypeDefinition> subscriptionTypeDef = typeRegistry.getType("Subscription");
+                if (subscriptionTypeDef.isPresent()) {
+                    subscription = buildOutputType(buildCtx, TypeName.newTypeName().name(subscriptionTypeDef.get().getName()).build());
+                    schemaBuilder.subscription(subscription);
+                }
             }
         } else {
             subscription = buildOperation(buildCtx, subscriptionOperation.get());
diff --git a/src/test/groovy/graphql/schema/idl/SchemaParserTest.groovy b/src/test/groovy/graphql/schema/idl/SchemaParserTest.groovy
@@ -363,7 +363,7 @@ class SchemaParserTest extends Specification {
 
     }
 
-    def "correctly parses schema keyword block"() {
+    def "correctly parses schema keyword block, include Query, does not include Mutation type"() {
         // From RFC to clarify spec https://github.com/graphql/graphql-spec/pull/987
         when:
         def graphQL = TestUtil.graphQL("""
@@ -389,4 +389,51 @@ class SchemaParserTest extends Specification {
         graphQL.graphQLSchema.queryType != null
         graphQL.graphQLSchema.mutationType == null
     }
+
+    def "correctly parses schema keyword block, include Query, does not include Subscription type"() {
+        // From RFC to clarify spec https://github.com/graphql/graphql-spec/pull/987
+        when:
+        def graphQL = TestUtil.graphQL("""
+            schema {
+              query: Query
+            }
+            type Query {
+              viruses: [Virus!]
+            }
+            type Virus {
+              name: String!
+            }
+            type Subscription {
+              newspaper: String!
+            }
+        """).build()
+
+        then:
+        graphQL.graphQLSchema.definition.operationTypeDefinitions.size() == 1
+        graphQL.graphQLSchema.definition.operationTypeDefinitions.first().name == "query"
+        graphQL.graphQLSchema.queryType != null
+        graphQL.graphQLSchema.subscriptionType == null
+    }
+
+    def "correctly parses schema that does not contain the schema keyword, includes Query and Mutation types"() {
+        when:
+        def schema = """
+            type Mutation {
+              name: String!
+              geneSequence: String!
+            }
+            type Query {
+              viruses: [Virus!]
+            }
+            type Virus {
+              name: String!
+            }
+        """
+        def graphQL = TestUtil.graphQL(schema).build()
+
+        then:
+        graphQL.graphQLSchema.definition == null // No SchemaDefinition
+        graphQL.graphQLSchema.queryType != null
+        graphQL.graphQLSchema.mutationType != null
+    }
 }
