From 5ccacd1bb4763088d73fa4a928055de493bc74ac Mon Sep 17 00:00:00 2001
From: Andreas Marek <andimarek@fastmail.fm>
Date: Sat, 16 Jan 2021 20:10:47 +1100
Subject: [PATCH] use the more idiomatic Query type instead QueryType

---
 README.md                                                 | 8 ++------
 .../spring/sample/graphql/project/ProjectDataWiring.java  | 3 +--
 .../graphql/repository/ArtifactRepositoryDataWiring.java  | 3 +--
 samples/webmvc-http/src/main/resources/schema.graphqls    | 6 +-----
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index c7b776a0..7a007c87 100644
--- a/README.md
+++ b/README.md
@@ -75,11 +75,7 @@ repositories {
 You can now add a GraphQL schema in `src/main/resources/schema.graphqls` such as:
 
 ```
-schema {
-    query: QueryType
-}
-
-type QueryType {
+type Query {
     people: [Person]!
 }
 
@@ -104,7 +100,7 @@ public class PersonDataWiring implements RuntimeWiringCustomizer {
 
 	@Override
 	public void customize(RuntimeWiring.Builder builder) {
-		builder.type("QueryType", typeWiring -> typeWiring
+		builder.type("Query", typeWiring -> typeWiring
 				.dataFetcher("people", env -> this.personService.findAll()));
 	}
 }
diff --git a/samples/webmvc-http/src/main/java/io/spring/sample/graphql/project/ProjectDataWiring.java b/samples/webmvc-http/src/main/java/io/spring/sample/graphql/project/ProjectDataWiring.java
index 653a10c4..edb97adc 100644
--- a/samples/webmvc-http/src/main/java/io/spring/sample/graphql/project/ProjectDataWiring.java
+++ b/samples/webmvc-http/src/main/java/io/spring/sample/graphql/project/ProjectDataWiring.java
@@ -1,7 +1,6 @@
 package io.spring.sample.graphql.project;
 
 import graphql.schema.idl.RuntimeWiring;
-
 import org.springframework.graphql.boot.RuntimeWiringCustomizer;
 import org.springframework.stereotype.Component;
 
@@ -17,7 +16,7 @@ public class ProjectDataWiring implements RuntimeWiringCustomizer {
 	@Override
 	public void customize(RuntimeWiring.Builder builder) {
 		builder
-				.type("QueryType", typeWiring ->
+				.type("Query", typeWiring ->
 						typeWiring.dataFetcher("project", env -> {
 							String slug = env.getArgument("slug");
 							return client.fetchProject(slug);
diff --git a/samples/webmvc-http/src/main/java/io/spring/sample/graphql/repository/ArtifactRepositoryDataWiring.java b/samples/webmvc-http/src/main/java/io/spring/sample/graphql/repository/ArtifactRepositoryDataWiring.java
index 9cf287fe..f77c698c 100644
--- a/samples/webmvc-http/src/main/java/io/spring/sample/graphql/repository/ArtifactRepositoryDataWiring.java
+++ b/samples/webmvc-http/src/main/java/io/spring/sample/graphql/repository/ArtifactRepositoryDataWiring.java
@@ -1,7 +1,6 @@
 package io.spring.sample.graphql.repository;
 
 import graphql.schema.idl.RuntimeWiring;
-
 import org.springframework.graphql.boot.RuntimeWiringCustomizer;
 import org.springframework.stereotype.Component;
 
@@ -16,7 +15,7 @@ public class ArtifactRepositoryDataWiring implements RuntimeWiringCustomizer {
 
 	@Override
 	public void customize(RuntimeWiring.Builder builder) {
-		builder.type("QueryType", typeWiring -> typeWiring
+		builder.type("Query", typeWiring -> typeWiring
 				.dataFetcher("artifactRepositories", env -> this.repositories.findAll())
 				.dataFetcher("artifactRepository", env -> this.repositories.findById(env.getArgument("id"))));
 	}
diff --git a/samples/webmvc-http/src/main/resources/schema.graphqls b/samples/webmvc-http/src/main/resources/schema.graphqls
index c46733ce..871ea03f 100644
--- a/samples/webmvc-http/src/main/resources/schema.graphqls
+++ b/samples/webmvc-http/src/main/resources/schema.graphqls
@@ -1,8 +1,4 @@
-schema {
-    query: QueryType
-}
-
-type QueryType {
+type Query {
     artifactRepositories : [ArtifactRepository]
     artifactRepository(id : ID!) : ArtifactRepository
     project(slug: ID!): Project