Merge pull request #145 from graphql-java-kickstart/feature/124-disable-introspection-option

Added option to disable introspection query (fix #124)

Author: oliemansm

README.md

@@ -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/src/main/resources/application.yml

@@ -3,8 +3,6 @@ spring:
     name: graphql-java-tools-app
 server:
   port: 9000
-  servlet:
-    context-path: /abc
 graphiql:
   headers:
     Authorization: "Bearer 05bd9a5f3fe0408f89520946b0fe1b06"

gradle.properties

@@ -41,7 +41,7 @@ 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_JAVA_TOOLS_VER = 5.3.4-SNAPSHOT
 LIB_COMMONS_IO_VER = 2.6
 
 GRADLE_WRAPPER_VER = 4.7

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLJavaToolsAutoConfiguration.java

@@ -8,6 +8,7 @@
 import graphql.schema.GraphQLSchema;
 import graphql.servlet.GraphQLSchemaProvider;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -39,6 +40,9 @@ public class GraphQLJavaToolsAutoConfiguration {
     @Autowired(required = false)
     private SchemaParserOptions options;
 
+    @Value("${graphql.tools.introspectionEnabled:true}")
+    private boolean introspectionEnabled;
+
     @Bean
     @ConditionalOnMissingBean
     public SchemaStringProvider schemaStringProvider() {
@@ -67,6 +71,7 @@ public SchemaParser schemaParser(
         } else if (perFieldObjectMapperProvider != null) {
             final SchemaParserOptions.Builder optionsBuilder =
                     newOptions().objectMapperProvider(perFieldObjectMapperProvider);
+            optionsBuilder.introspectionEnabled(introspectionEnabled);
             builder.options(optionsBuilder.build());
         }
 

graphql-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -44,6 +44,16 @@
       "name": "graphql.servlet.maxQueryDepth",
       "defaultValue": null,
       "type": "java.lang.Integer"
+    },
+    {
+      "name": "graphql.tools.schemaLocationPattern",
+      "defaultValue": "**/*.graphqls",
+      "type": "java.lang.String"
+    },
+    {
+      "name": "graphql.tools.introspectionEnabled",
+      "defaultValue": true,
+      "type": "java.lang.Boolean"
     }
   ]
 }