Converted dataloader example to gradle and bumped graphql-java version

Author: oliemansm

example-request-scoped-dataloader/build.gradle

@@ -0,0 +1,25 @@
+plugins {
+    id 'java'
+}
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile("org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER")
+    compile(project(":graphql-spring-boot-starter"))
+    compile(project(":graphiql-spring-boot-starter"))
+
+    compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
+
+    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
+    testCompile(project(":graphql-spring-boot-starter-test"))
+}
+
+jar.enabled = false
+uploadArchives.enabled = false
+bintrayUpload.enabled = false
+install.enabled = false

example-request-scoped-dataloader/pom.xml

@@ -7,6 +7,8 @@
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
 import java.util.concurrent.CompletableFuture;
 
@@ -20,8 +22,8 @@ public CustomGraphQLContextBuilder(CustomerRepository customerRepository) {
     }
 
     @Override
-    public GraphQLContext build(HttpServletRequest req) {
-        GraphQLContext context = new GraphQLContext(req);
+    public GraphQLContext build(HttpServletRequest req, HttpServletResponse response) {
+        GraphQLContext context = new GraphQLContext(req, response);
         context.setDataLoaderRegistry(buildDataLoaderRegistry());
 
         return context;
@@ -36,8 +38,8 @@ public GraphQLContext build() {
     }
 
     @Override
-    public GraphQLContext build(HandshakeRequest request) {
-        GraphQLContext context = new GraphQLContext(request);
+    public GraphQLContext build(Session session, HandshakeRequest request) {
+        GraphQLContext context = new GraphQLContext(session, request);
         context.setDataLoaderRegistry(buildDataLoaderRegistry());
 
         return context;
@@ -51,4 +53,4 @@ private DataLoaderRegistry buildDataLoaderRegistry() {
                                 customerRepository.getUserNamesForIds(customerIds))));
         return dataLoaderRegistry;
     }
-}
+}

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

@@ -13,13 +13,13 @@ public class CustomerRepository {
     private final Map<Integer, String> data;
 
     private CustomerRepository() {
-        data = new HashMap<Integer, String>();
-        data.put(Integer.valueOf(101), "Customer Name 1");
-        data.put(Integer.valueOf(102), "Customer Name 2");
-        data.put(Integer.valueOf(103), "Customer Name 3");
-        data.put(Integer.valueOf(104), "Customer Name 4");
-        data.put(Integer.valueOf(105), "Customer Name 5");
-        data.put(Integer.valueOf(106), "Customer Name 6");
+        data = new HashMap<>();
+        data.put(101, "Customer Name 1");
+        data.put(102, "Customer Name 2");
+        data.put(103, "Customer Name 3");
+        data.put(104, "Customer Name 4");
+        data.put(105, "Customer Name 5");
+        data.put(106, "Customer Name 6");
     }
 
     public List getUserNamesForIds(List<Integer> customerIds) {

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

@@ -36,7 +36,7 @@ TARGET_COMPATIBILITY = 1.8
 
 ###
 
-LIB_GRAPHQL_JAVA_VER = 9.2
+LIB_GRAPHQL_JAVA_VER = 11.0
 LIB_JUNIT_VER = 4.12
 LIB_SPRING_CORE_VER = 5.0.4.RELEASE
 LIB_SPRING_BOOT_VER = 2.0.5.RELEASE

gradle.properties

@@ -32,6 +32,8 @@ include ":example"
 include ":example-spring-common"
 include ':example-graphql-tools'
 include ':example-graphql-subscription'
+include ':example-request-scoped-dataloader'
+
 include ':graphql-spring-boot-test'
 include ':graphql-spring-boot-test-autoconfigure'