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

Added option for disabling introspection query

Author: oliemansm

src/main/kotlin/com/coxautodev/graphql/tools/SchemaObjects.kt

@@ -13,13 +13,19 @@ data class SchemaObjects(val query: GraphQLObjectType, val mutation: GraphQLObje
     /**
      * Makes a GraphQLSchema with query, mutation and subscription.
      */
-    fun toSchema(): GraphQLSchema = GraphQLSchema.newSchema()
-            .query(query)
-            .mutation(mutation)
-            .subscription(subscription)
-            .additionalTypes(dictionary)
-//            .fieldVisibility(NoIntrospectionGraphqlFieldVisibility.NO_INTROSPECTION_FIELD_VISIBILITY)
-            .build()
+    fun toSchema(introspectionEnabled: Boolean): GraphQLSchema {
+        val builder = GraphQLSchema.newSchema()
+                .query(query)
+                .mutation(mutation)
+                .subscription(subscription)
+                .additionalTypes(dictionary)
+
+        if (!introspectionEnabled) {
+            builder.fieldVisibility(NoIntrospectionGraphqlFieldVisibility.NO_INTROSPECTION_FIELD_VISIBILITY)
+        }
+
+        return builder.build()
+    }
 
     /**
      * Makes a GraphQLSchema with query but without mutation and subscription.

src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt

@@ -44,7 +44,7 @@ import kotlin.reflect.KClass
  *
  * @author Andrew Potter
  */
-class SchemaParser internal constructor(scanResult: ScannedSchemaObjects) {
+class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, private val options: SchemaParserOptions) {
 
     companion object {
         const val DEFAULT_DEPRECATION_MESSAGE = "No longer supported"
@@ -110,7 +110,7 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects) {
     /**
      * Parses the given schema with respect to the given dictionary and returns a GraphQLSchema
      */
-    fun makeExecutableSchema(): GraphQLSchema = parseSchemaObjects().toSchema()
+    fun makeExecutableSchema(): GraphQLSchema = parseSchemaObjects().toSchema(options.introspectionEnabled)
 
     /**
      * Returns any unused type definitions that were found in the schema

src/main/kotlin/com/coxautodev/graphql/tools/SchemaParserBuilder.kt

@@ -176,7 +176,7 @@ class SchemaParserBuilder constructor(private val dictionary: SchemaParserDictio
     /**
      * Build the parser with the supplied schema and dictionary.
      */
-    fun build() = SchemaParser(scan())
+    fun build() = SchemaParser(scan(), options)
 }
 
 class InvalidSchemaError(pce: ParseCancellationException, private val recognitionException: RecognitionException) : RuntimeException(pce) {
@@ -247,7 +247,7 @@ class SchemaParserDictionary {
     }
 }
 
-data class SchemaParserOptions internal constructor(val contextClass: Class<*>?, val genericWrappers: List<GenericWrapper>, val allowUnimplementedResolvers: Boolean, val objectMapperProvider: PerFieldObjectMapperProvider, val proxyHandlers: List<ProxyHandler>, val preferGraphQLResolver: Boolean) {
+data class SchemaParserOptions internal constructor(val contextClass: Class<*>?, val genericWrappers: List<GenericWrapper>, val allowUnimplementedResolvers: Boolean, val objectMapperProvider: PerFieldObjectMapperProvider, val proxyHandlers: List<ProxyHandler>, val preferGraphQLResolver: Boolean, val introspectionEnabled: Boolean) {
     companion object {
         @JvmStatic
         fun newOptions() = Builder()
@@ -264,6 +264,7 @@ data class SchemaParserOptions internal constructor(val contextClass: Class<*>?,
         private var objectMapperProvider: PerFieldObjectMapperProvider = PerFieldConfiguringObjectMapperProvider()
         private val proxyHandlers: MutableList<ProxyHandler> = mutableListOf(Spring4AopProxyHandler(), GuiceAopProxyHandler(), JavassistProxyHandler())
         private var preferGraphQLResolver = false
+        private var introspectionEnabled = true
 
         fun contextClass(contextClass: Class<*>) = this.apply {
             this.contextClass = contextClass
@@ -309,6 +310,10 @@ data class SchemaParserOptions internal constructor(val contextClass: Class<*>?,
             this.proxyHandlers.add(proxyHandler)
         }
 
+        fun introspectionEnabled(introspectionEnabled: Boolean) = this.apply {
+            this.introspectionEnabled = introspectionEnabled
+        }
+
         fun build(): SchemaParserOptions {
             val wrappers = if (useDefaultGenericWrappers) {
                 genericWrappers + listOf(
@@ -321,7 +326,7 @@ data class SchemaParserOptions internal constructor(val contextClass: Class<*>?,
                 genericWrappers
             }
 
-            return SchemaParserOptions(contextClass, wrappers, allowUnimplementedResolvers, objectMapperProvider, proxyHandlers, preferGraphQLResolver)
+            return SchemaParserOptions(contextClass, wrappers, allowUnimplementedResolvers, objectMapperProvider, proxyHandlers, preferGraphQLResolver, introspectionEnabled)
         }
     }