Merge branch 'master' into master

Author: oliemansm

README.md

@@ -80,19 +80,19 @@ repositories {
 }
 
 dependencies {
-  compile 'com.graphql-java-kickstart:graphql-spring-boot-starter:6.0.0'
+  compile 'com.graphql-java-kickstart:graphql-spring-boot-starter:6.0.1'
   
   // to embed Altair tool
-  runtime 'com.graphql-java-kickstart:altair-spring-boot-starter:6.0.0'
+  runtime 'com.graphql-java-kickstart:altair-spring-boot-starter:6.0.1'
 
   // to embed GraphiQL tool
-  runtime 'com.graphql-java-kickstart:graphiql-spring-boot-starter:6.0.0'
+  runtime 'com.graphql-java-kickstart:graphiql-spring-boot-starter:6.0.1'
 
   // to embed Voyager tool
-  runtime 'com.graphql-java-kickstart:voyager-spring-boot-starter:6.0.0'
+  runtime 'com.graphql-java-kickstart:voyager-spring-boot-starter:6.0.1'
   
   // testing facilities
-  testCompile 'com.graphql-java-kickstart:graphql-spring-boot-starter-test:6.0.0'
+  testCompile 'com.graphql-java-kickstart:graphql-spring-boot-starter-test:6.0.1'
 }
 ```
 
@@ -101,38 +101,38 @@ Maven:
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
 </dependency>
 
 <!-- to embed Altair tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>altair-spring-boot-starter</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- to embed GraphiQL tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphiql-spring-boot-starter</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- to embed Voyager tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>voyager-spring-boot-starter</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- testing facilities -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter-test</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <scope>test</scope>
 </dependency>
 

example-graphql-subscription/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Query.java

@@ -1,6 +1,6 @@
 package com.oembedler.moon.graphql.boot.resolvers;
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver;
+import graphql.kickstart.tools.GraphQLQueryResolver;
 import org.springframework.stereotype.Component;
 
 @Component

example-graphql-subscription/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Subscription.java

@@ -1,7 +1,7 @@
 package com.oembedler.moon.graphql.boot.resolvers;
 
-import com.coxautodev.graphql.tools.GraphQLSubscriptionResolver;
-import com.oembedler.moon.graphql.boot.publishers.StockTickerRxPublisher;
+import graphql.kickstart.tools.GraphQLSubscriptionResolver;
+import com.oembedler.moon.graphql.boot.publishers.StockTickerPublisher;
 import org.reactivestreams.Publisher;
 import org.springframework.stereotype.Component;
 

example-graphql-tools/src/main/java/com/graphql/sample/boot/Mutation.java

@@ -1,6 +1,6 @@
 package com.graphql.sample.boot;
 
-import com.coxautodev.graphql.tools.GraphQLMutationResolver;
+import graphql.kickstart.tools.GraphQLMutationResolver;
 import java.util.Random;
 import org.springframework.stereotype.Component;
 

example-graphql-tools/src/main/java/com/graphql/sample/boot/PostResolver.java

@@ -1,6 +1,6 @@
 package com.graphql.sample.boot;
 
-import com.coxautodev.graphql.tools.GraphQLResolver;
+import graphql.kickstart.tools.GraphQLResolver;
 import org.springframework.stereotype.Component;
 
 import java.util.Collections;

example-graphql-tools/src/main/java/com/graphql/sample/boot/Query.java

@@ -1,6 +1,6 @@
 package com.graphql.sample.boot;
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver;
+import graphql.kickstart.tools.GraphQLQueryResolver;
 import org.springframework.stereotype.Component;
 
 @Component

example-graphql-tools/src/test/java/com/graphql/sample/boot/GraphQLToolsSampleApplicationTest.java

@@ -17,6 +17,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(SpringRunner.class)
 @GraphQLTest
 public class GraphQLToolsSampleApplicationTest {
@@ -33,6 +36,16 @@ public void get_comments() throws IOException {
         assertEquals("1", response.get("$.data.post.id"));
     }
 
+    @Test
+    public void get_comments_withFragments() throws IOException {
+        List<String> fragments = new ArrayList<>();
+        fragments.add("graphql/all-comment-fields-fragment.graphql");
+        GraphQLResponse response = graphQLTestTemplate.postForResource("graphql/post-get-comments-with-fragment.graphql", fragments);
+        assertNotNull(response);
+        assertTrue(response.isOk());
+        assertEquals("1", response.get("$.data.post.id"));
+    }
+
     @Test
     public void create_post() throws IOException {
         ObjectNode variables = new ObjectMapper().createObjectNode();

example-graphql-tools/src/test/resources/graphql/all-comment-fields-fragment.graphql

@@ -0,0 +1,4 @@
+fragment AllCommentFields on Comment {
+    id
+    description
+}

example-graphql-tools/src/test/resources/graphql/post-get-comments-with-fragment.graphql

@@ -0,0 +1,8 @@
+query {
+    post(id: "1") {
+        id
+        comments {
+            ...AllCommentFields
+        }
+    }
+}

example-request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/CustomerResolver.java

@@ -1,6 +1,6 @@
 package graphql.servlet.examples.dataloader.requestscope;
 
-import com.coxautodev.graphql.tools.GraphQLResolver;
+import graphql.kickstart.tools.GraphQLResolver;
 import graphql.kickstart.execution.context.GraphQLContext;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;