Merge remote-tracking branch 'upstream/master' into metrics-instrumentation

Author: Bruno Rodrigues

README.md

@@ -19,8 +19,32 @@
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## WARNING: NoClassDefFoundError when using GraphQL Java Tools 5.4.x
 
-# Intro
+If you're using `graphl-java-tools` you need to set the `kotlin.version` in your Spring Boot project explicitly to 
+version 1.3.10, because Spring Boot Starter parent currently overrides it with a 1.2.* version of Kotlin. 
+`graphql-java-tools` requires 1.3.* however because of its coroutine support. If you don't override this version
+you will run into a `NoClassDefFoundError`.
+
+Spring Boot team has indicated the Kotlin version will be upgraded to 1.3 in Spring Boot 2.2.
+
+### Using Gradle
+Set the Kotlin version in your `gradle.properties`
+```
+kotlin.version=1.3.10
+```
+
+### Using Maven
+Set the Kotlin version in your `<properties>` section
+```xml
+<properties>
+  <kotlin.version>1.3.10</kotlin.version>
+</properties>
+```
+
+# Documentation
+
+See our new [Documentation](https://www.graphql-java-kickstart.com/spring-boot/).
 
 Repository contains:
 
@@ -42,13 +66,16 @@ repositories {
 }
 
 dependencies {
-  compile 'com.graphql-java-kickstart:graphql-spring-boot-starter:5.0.5'
+  compile 'com.graphql-java-kickstart:graphql-spring-boot-starter:5.3.1'
   
   // to embed GraphiQL tool
-  compile 'com.graphql-java-kickstart:graphiql-spring-boot-starter:5.0.5'
+  compile 'com.graphql-java-kickstart:graphiql-spring-boot-starter:5.3.1'
 
   // to embed Voyager tool
-  compile 'com.graphql-java-kickstart:voyager-spring-boot-starter:5.0.5'
+  compile 'com.graphql-java-kickstart:voyager-spring-boot-starter:5.3.1'
+  
+  // testing facilities
+  testCompile 'com.graphql-java-kickstart:graphql-spring-boot-starter-test:5.3.1'
 }
 ```
 
@@ -57,22 +84,31 @@ Maven:
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter</artifactId>
-    <version>5.0.5</version>
+    <version>5.3.1</version>
 </dependency>
 
 <!-- to embed GraphiQL tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphiql-spring-boot-starter</artifactId>
-    <version>5.0.5</version>
+    <version>5.3.1</version>
 </dependency>
 
 <!-- to embed Voyager tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>voyager-spring-boot-starter</artifactId>
-    <version>5.0.5</version>
+    <version>5.3.1</version>
 </dependency>
+
+<!-- testing facilities -->
+<dependency>
+    <groupId>com.graphql-java-kickstart</groupId>
+    <artifactId>graphql-spring-boot-starter-test</artifactId>
+    <version>5.3.1</version>
+    <scope>test</scope>
+</dependency>
+
 ```
 
 New releases will be available faster in the JCenter repository than in Maven Central. Add the following to use for Maven
@@ -104,9 +140,11 @@ Available Spring Boot configuration parameters (either `application.yml` or `app
 ```yaml
 graphql:
       servlet:
-               mapping: /graphql
-               enabled: true
-               corsEnabled: true
+           mapping: /graphql
+           enabled: true
+           corsEnabled: true
+           # if you want to @ExceptionHandler annotation for custom GraphQLErrors
+           exception-handlers-enabled: true
 ```
 
 By default a global CORS filter is enabled for `/graphql/**` context.
@@ -166,34 +204,15 @@ Available Spring Boot configuration parameters (either `application.yml` or `app
 ```yaml
 graphql:
     tools:
-        schemaLocationPattern: "**/*.graphqls"
+        schema-location-pattern: "**/*.graphqls"
         # Enable or disable the introspection query. Disabling it puts your server in contravention of the GraphQL
         # specification and expectations of most clients, so use this option with caution
-        introspectionEnabled: true
+        introspection-enabled: true
 ```
 By default GraphQL tools uses the location pattern `**/*.graphqls` to scan for GraphQL schemas on the classpath.
 Use the `schemaLocationPattern` property to customize this pattern.
 
 
-## GraphQL Spring Common [LATEST SUPPORTED VERSION: 3.1.1]
-**https://github.com/oembedler/spring-graphql-common**
-
-See the [Readme](https://github.com/oembedler/spring-graphql-common#usage) and the [example](https://github.com/graphql-java-kickstart/graphql-spring-boot/tree/master/example-spring-common) for usage instructions.
-
-#### Application Properties
-```yaml
-graphql:
-      spring-graphql-common:
-               clientMutationIdName: clientMutationId
-               injectClientMutationId: true
-               allowEmptyClientMutationId: false
-               mutationInputArgumentName: input
-               outputObjectNamePrefix: Payload
-               inputObjectNamePrefix: Input
-               schemaMutationObjectName: Mutation
-```
-
-
 # Contributions
 
 Contributions are welcome.  Please respect the [Code of Conduct](http://contributor-covenant.org/version/1/3/0/).
@@ -203,8 +222,6 @@ Contributions are welcome.  Please respect the [Code of Conduct](http://contribu
 
 `graphql-spring-boot-starter` and `graphiql-spring-boot-starter` are licensed under the MIT License. See [LICENSE](LICENSE.md) for details.
 
-[spring-graphql-common License](https://github.com/oembedler/spring-graphql-common/blob/master/LICENSE.md)
-
 [graphql-java License](https://github.com/andimarek/graphql-java/blob/master/LICENSE.md)
 
 [graphiql License](https://github.com/graphql/graphiql/blob/master/LICENSE)

build.gradle

@@ -34,6 +34,7 @@ buildscript {
 
 plugins {
     id 'net.researchgate.release' version '2.7.0'
+    id 'io.franzbecker.gradle-lombok' version '1.14' apply false
 }
 
 subprojects {
@@ -42,6 +43,7 @@ subprojects {
     apply plugin: 'maven'
     apply plugin: 'maven-publish'
     apply plugin: "com.jfrog.bintray"
+    apply plugin: 'io.franzbecker.gradle-lombok'
 
     group = PROJECT_GROUP
 
@@ -65,6 +67,14 @@ subprojects {
         targetCompatibility = TARGET_COMPATIBILITY
     }
 
+    compileJava.dependsOn(processResources)
+    
+    lombok {
+        version = "1.18.4"
+        sha256 = ""
+    }
+
+
     if (!it.name.startsWith('example')) {
 
         jar {

example-graphql-subscription/build.gradle

@@ -5,6 +5,7 @@ plugins {
 sourceCompatibility = 1.8
 
 repositories {
+    jcenter()
     mavenCentral()
 }
 

…moon/graphql/boot/resolvers/Comment.java …ava/com/graphql/sample/boot/Comment.javaexample-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Comment.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/Comment.java example-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Comment.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/Comment.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.resolvers;
+package com.graphql.sample.boot;
 
 class Comment {
 

…/boot/GraphQLToolsSampleApplication.java …/boot/GraphQLToolsSampleApplication.javaexample-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/GraphQLToolsSampleApplication.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/GraphQLToolsSampleApplication.java example-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/GraphQLToolsSampleApplication.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/GraphQLToolsSampleApplication.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot;
+package com.graphql.sample.boot;
 
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import graphql.servlet.ObjectMapperConfigurer;

…oon/graphql/boot/resolvers/Mutation.java …va/com/graphql/sample/boot/Mutation.javaexample-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Mutation.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/Mutation.java example-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Mutation.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/Mutation.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.resolvers;
+package com.graphql.sample.boot;
 
 import com.coxautodev.graphql.tools.GraphQLMutationResolver;
 import java.util.Random;

…er/moon/graphql/boot/resolvers/Post.java …n/java/com/graphql/sample/boot/Post.javaexample-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Post.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/Post.java example-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Post.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/Post.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.resolvers;
+package com.graphql.sample.boot;
 
 public class Post {
 

…graphql/boot/resolvers/PostResolver.java …om/graphql/sample/boot/PostResolver.javaexample-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/resolvers/PostResolver.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/PostResolver.java example-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/resolvers/PostResolver.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/PostResolver.java

@@ -1,4 +1,4 @@
-package com.oembedler.moon.graphql.boot.resolvers;
+package com.graphql.sample.boot;
 
 import com.coxautodev.graphql.tools.GraphQLResolver;
 import org.springframework.stereotype.Component;

…r/moon/graphql/boot/resolvers/Query.java …/java/com/graphql/sample/boot/Query.javaexample-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Query.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/Query.java example-graphql-tools/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Query.java renamed to example-graphql-tools/src/main/java/com/graphql/sample/boot/Query.java

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

example-graphql-tools/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: graphql-java-tools-app
 server:
-  port: 9000
+  port: 9001
 graphiql:
   headers:
     Authorization: "Bearer 05bd9a5f3fe0408f89520946b0fe1b06"