Enable all schema parser options to be set via properties

Author: tunaranch

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

@@ -14,6 +14,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -36,15 +37,13 @@ public class GraphQLJavaToolsAutoConfiguration {
     @Autowired(required = false)
     private GraphQLScalarType[] scalars;
 
-    @Autowired(required = false)
-    private SchemaParserOptions options;
-
     @Autowired(required = false)
     private List<SchemaDirective> directives;
 
     @Autowired(required = false)
     private List<TypeDefinitionFactory> typeDefinitionFactories;
 
+
     @Autowired
     private GraphQLToolsProperties props;
 
@@ -54,13 +53,33 @@ public SchemaStringProvider schemaStringProvider() {
         return new ClasspathResourceSchemaStringProvider(props.getSchemaLocationPattern());
     }
 
+    @Bean
+    @ConditionalOnMissingBean
+    @ConfigurationProperties("graphql.tools.schema-parser-options")
+    public SchemaParserOptions.Builder optionsBuilder(
+            PerFieldObjectMapperProvider perFieldObjectMapperProvider
+    ) {
+        SchemaParserOptions.Builder optionsBuilder = SchemaParserOptions.newOptions();
+
+        if (perFieldObjectMapperProvider != null) {
+            optionsBuilder.objectMapperProvider(perFieldObjectMapperProvider);
+        }
+        optionsBuilder.introspectionEnabled(props.isIntrospectionEnabled());
+
+        if (typeDefinitionFactories != null) {
+            typeDefinitionFactories.forEach(optionsBuilder::typeDefinitionFactory);
+        }
+
+        return optionsBuilder;
+    }
+
     @Bean
     @ConditionalOnBean({GraphQLResolver.class})
     @ConditionalOnMissingBean
     public SchemaParser schemaParser(
             List<GraphQLResolver<?>> resolvers,
             SchemaStringProvider schemaStringProvider,
-            PerFieldObjectMapperProvider perFieldObjectMapperProvider
+            SchemaParserOptions.Builder optionsBuilder
     ) throws IOException {
         SchemaParserBuilder builder = dictionary != null ? new SchemaParserBuilder(dictionary) : new SchemaParserBuilder();
 
@@ -71,23 +90,7 @@ public SchemaParser schemaParser(
             builder.scalars(scalars);
         }
 
-        // fixme: should we even support options directly like this? the combination with the builder makes it complex
-        if (options != null) {
-            builder.options(options);
-        } else {
-            SchemaParserOptions.Builder optionsBuilder = SchemaParserOptions.newOptions();
-
-            if (perFieldObjectMapperProvider != null) {
-                optionsBuilder.objectMapperProvider(perFieldObjectMapperProvider);
-            }
-            optionsBuilder.introspectionEnabled(props.isIntrospectionEnabled());
-
-            if (typeDefinitionFactories != null) {
-                typeDefinitionFactories.forEach(optionsBuilder::typeDefinitionFactory);
-            }
-
-            builder.options(optionsBuilder.build());
-        }
+        builder.options(optionsBuilder.build());
 
         if (directives != null) {
             directives.forEach(it -> builder.directive(it.getName(), it.getDirective()));

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

@@ -9,6 +9,8 @@
 class GraphQLToolsProperties {
 
     private String schemaLocationPattern = "**/*.graphqls";
+    /** @deprecated Set graphql.tools.schema-parser-options.introspection-enabled instead */
+    @Deprecated
     private boolean introspectionEnabled = true;
     private boolean useDefaultObjectmapper = true;