Merge branch 'master' into metrics-instrumentation

Author: Bruno Rodrigues

README.md

@@ -42,13 +42,13 @@ repositories {
 }
 
 dependencies {
-  compile 'com.graphql-java-kickstart:graphql-spring-boot-starter:5.0.4'
+  compile 'com.graphql-java-kickstart:graphql-spring-boot-starter:5.0.5'
   
   // to embed GraphiQL tool
-  compile 'com.graphql-java-kickstart:graphiql-spring-boot-starter:5.0.4'
+  compile 'com.graphql-java-kickstart:graphiql-spring-boot-starter:5.0.5'
 
   // to embed Voyager tool
-  compile 'com.graphql-java-kickstart:voyager-spring-boot-starter:5.0.4'
+  compile 'com.graphql-java-kickstart:voyager-spring-boot-starter:5.0.5'
 }
 ```
 
@@ -57,21 +57,21 @@ Maven:
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter</artifactId>
-    <version>5.0.4</version>
+    <version>5.0.5</version>
 </dependency>
 
 <!-- to embed GraphiQL tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphiql-spring-boot-starter</artifactId>
-    <version>5.0.4</version>
+    <version>5.0.5</version>
 </dependency>
 
 <!-- to embed Voyager tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>voyager-spring-boot-starter</artifactId>
-    <version>5.0.4</version>
+    <version>5.0.5</version>
 </dependency>
 ```
 
@@ -167,6 +167,9 @@ Available Spring Boot configuration parameters (either `application.yml` or `app
 graphql:
     tools:
         schemaLocationPattern: "**/*.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
 ```
 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.

build.gradle

@@ -20,7 +20,9 @@
 buildscript {
     repositories {
         mavenLocal()
-        maven { url "http://dl.bintray.com/graphql-java-kickstart/releases" }
+        mavenCentral()
+        jcenter()
+        maven { url "https://dl.bintray.com/graphql-java-kickstart/releases" }
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url 'http://repo.spring.io/plugins-release' }
     }
@@ -45,8 +47,9 @@ subprojects {
 
     repositories {
         mavenLocal()
+        mavenCentral()
         jcenter()
-        maven { url "http://dl.bintray.com/graphql-java-kickstart/releases" }
+        maven { url "http://oss.jfrog.org/artifactory/oss-snapshot-local" }
         maven { url "http://repo.spring.io/libs-milestone" }
     }
 

example-graphql-tools/build.gradle

@@ -29,6 +29,7 @@ repositories {
 dependencies {
     compile(project(":graphql-spring-boot-starter"))
     compile(project(":graphiql-spring-boot-starter"))
+    compile(project(":voyager-spring-boot-starter"))
     compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 
     compile("org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER")

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

@@ -28,7 +28,6 @@ public void get_comments() throws IOException {
         GraphQLResponse response = graphQLTestTemplate.postForResource("graphql/post-get-comments.graphql");
         assertNotNull(response);
         assertTrue(response.isOk());
-        System.out.println(response.getRawResponse().getBody());
         assertEquals("1", response.get("$.data.post.id"));
     }
 

example-graphql-tools/src/test/java/com/oembedler/moon/graphql/boot/SpringBootTestWithoutWebEnvironmentTest.java

@@ -0,0 +1,19 @@
+package com.oembedler.moon.graphql.boot;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SpringBootTestWithoutWebEnvironmentTest {
+
+    @Test
+    @Ignore
+    public void loads_without_complaining_about_missing_ServerContainer() {
+
+    }
+
+}

gradle.properties

@@ -17,7 +17,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-version = 5.0.5-SNAPSHOT
+version = 5.0.7-SNAPSHOT
 PROJECT_GROUP = com.graphql-java-kickstart
 PROJECT_NAME = graphql-spring-boot
 PROJECT_DESC = GraphQL Spring Framework Boot
@@ -40,8 +40,8 @@ LIB_GRAPHQL_JAVA_VER = 9.2
 LIB_JUNIT_VER = 4.12
 LIB_SPRING_CORE_VER = 5.0.4.RELEASE
 LIB_SPRING_BOOT_VER = 2.0.5.RELEASE
-LIB_GRAPHQL_SERVLET_VER = 6.1.4
-LIB_GRAPHQL_JAVA_TOOLS_VER = 5.3.3
+LIB_GRAPHQL_SERVLET_VER = 6.2.0
+LIB_GRAPHQL_JAVA_TOOLS_VER = 5.3.5
 LIB_COMMONS_IO_VER = 2.6
 
 GRADLE_WRAPPER_VER = 4.7

graphiql-spring-boot-autoconfigure/build.gradle

@@ -17,7 +17,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies{
-    compile "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    
     compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
     compile "org.apache.commons:commons-text:1.1"
     compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"

graphiql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphiql/boot/GraphiQLController.java

@@ -109,14 +109,14 @@ private Map<String, String> getReplacements(String graphqlEndpoint, String subsc
         replacements.put("subscriptionsEndpoint", subscriptionsEndpoint);
         replacements.put("staticBasePath", staticBasePath);
         replacements.put("pageTitle", pageTitle);
-        replacements.put("graphiqlCssUrl", graphiqlUrl("graphiql.min.css"));
-        replacements.put("graphiqlJsUrl", graphiqlUrl("graphiql.min.js"));
+        replacements.put("graphiqlCssUrl", graphiqlUrl(staticBasePath, "graphiql.min.css"));
+        replacements.put("graphiqlJsUrl", graphiqlUrl(staticBasePath, "graphiql.min.js"));
         replacements.put("props", props);
         replacements.put("headers", headers);
         return replacements;
     }
 
-    private String graphiqlUrl(String filename) {
+    private String graphiqlUrl(String staticBasePath, String filename) {
         if (graphiqlCdnEnabled && StringUtils.isNotBlank(graphiqlCdnVersion)) {
             return CDNJS_CLOUDFLARE_COM_AJAX_LIBS_GRAPHIQL + graphiqlCdnVersion + "/" + filename;
         }

graphiql-spring-boot-autoconfigure/src/main/resources/graphiql.html

@@ -31,8 +31,8 @@
 
     <link rel="stylesheet" href="${graphiqlCssUrl}"/>
     <script src="${graphiqlJsUrl}"></script>
-    <script src="//unpkg.com/subscriptions-transport-ws@0.8.3/browser/client.js"></script>
-    <script src="//unpkg.com/graphiql-subscriptions-fetcher@0.0.2/browser/client.js"></script>
+    <script src="${staticBasePath}vendor/subscriptions-transport-ws-browser-client-0.8.3.js"></script>
+    <script src="${staticBasePath}vendor/graphiql-subscriptions-fetcher-browser-client-0.0.2.js"></script>
 </head>
 <body>
 <div id="splash">