Merge branch 'graphql-java-kickstart-master'

Author: donbeave

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

graphql-kickstart-spring-boot-autoconfigure-tools/src/main/java/graphql/kickstart/tools/boot/GraphQLJavaToolsAutoConfiguration.java

@@ -10,6 +10,7 @@
 import graphql.kickstart.tools.PerFieldObjectMapperProvider;
 import graphql.kickstart.tools.SchemaParser;
 import graphql.kickstart.tools.SchemaParserBuilder;
+import graphql.kickstart.tools.SchemaParserDictionary;
 import graphql.kickstart.tools.SchemaParserOptions;
 import graphql.kickstart.tools.SchemaParserOptions.GenericWrapper;
 import graphql.kickstart.tools.TypeDefinitionFactory;
@@ -34,6 +35,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import static java.util.Objects.nonNull;
+
 /**
  * @author Andrew Potter
  */
@@ -45,7 +48,7 @@
 public class GraphQLJavaToolsAutoConfiguration {
 
   @Autowired(required = false)
-  private SchemaParserBuilder schemaParserBuilder;
+  private SchemaParserDictionary dictionary;
 
   @Autowired(required = false)
   private GraphQLScalarType[] scalars;
@@ -87,7 +90,7 @@ public SchemaStringProvider schemaStringProvider() {
   @ConditionalOnMissingBean
   @ConfigurationProperties("graphql.tools.schema-parser-options")
   public SchemaParserOptions.Builder optionsBuilder(
-      PerFieldObjectMapperProvider perFieldObjectMapperProvider
+      @Autowired(required = false) PerFieldObjectMapperProvider perFieldObjectMapperProvider
   ) {
     SchemaParserOptions.Builder optionsBuilder = SchemaParserOptions.newOptions();
 
@@ -122,8 +125,10 @@ public SchemaParser schemaParser(
       SchemaStringProvider schemaStringProvider,
       SchemaParserOptions.Builder optionsBuilder
   ) throws IOException {
-    SchemaParserBuilder builder = schemaParserBuilder != null ? schemaParserBuilder : new SchemaParserBuilder();
-
+    SchemaParserBuilder builder = new SchemaParserBuilder();
+    if (nonNull(dictionary)) {
+      builder.dictionary(dictionary.getDictionary());
+    }
     List<String> schemaStrings = schemaStringProvider.schemaStrings();
     schemaStrings.forEach(builder::schemaString);
 

graphql-kickstart-spring-boot-autoconfigure-webflux/src/main/java/graphql/kickstart/spring/webflux/boot/GraphQLSpringWebfluxAutoConfiguration.java

@@ -37,6 +37,7 @@
 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.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -48,6 +49,7 @@
 
 @Slf4j
 @Configuration
+@ConditionalOnBean({GraphQLSchema.class})
 @AutoConfigureAfter({GraphQLJavaToolsAutoConfiguration.class})
 @ComponentScan(basePackageClasses = GraphQLController.class)
 public class GraphQLSpringWebfluxAutoConfiguration {

graphql-kickstart-spring-webflux/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
     api(project(':graphql-kickstart-spring-support'))
 
-    compileOnly "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
-    compileOnly "org.springframework.boot:spring-boot-starter-webflux"
+    api "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
+    api "org.springframework.boot:spring-boot-starter-webflux"
 }

graphql-spring-boot-autoconfigure/build.gradle

@@ -25,9 +25,9 @@ dependencies {
     api "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
     api "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
 
-    implementation "org.springframework.boot:spring-boot-starter-websocket"
-    implementation "org.springframework.boot:spring-boot-starter-web"
-    implementation "org.springframework.boot:spring-boot-starter-actuator"
+    api "org.springframework.boot:spring-boot-starter-websocket"
+    api "org.springframework.boot:spring-boot-starter-web"
+    api "org.springframework.boot:spring-boot-starter-actuator"
 
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
     compileOnly "org.springframework.boot:spring-boot-configuration-processor"

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWebAutoConfiguration.java

@@ -230,9 +230,7 @@ public GraphQLInvocationInputFactory invocationInputFactory(GraphQLSchemaServlet
 
   @Bean
   @ConditionalOnMissingBean
-  public GraphQLQueryInvoker queryInvoker(
-      ExecutionStrategyProvider executionStrategyProvider
-  ) {
+  public GraphQLQueryInvoker queryInvoker(ExecutionStrategyProvider executionStrategyProvider) {
     GraphQLQueryInvoker.Builder builder = GraphQLQueryInvoker.newBuilder()
         .withExecutionStrategyProvider(executionStrategyProvider);
 

graphql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/spring/web/boot/GraphQLWsServerEndpointRegistration.java

@@ -1,6 +1,7 @@
 package graphql.kickstart.spring.web.boot;
 
 import graphql.kickstart.servlet.GraphQLWebsocketServlet;
+import org.apache.tomcat.websocket.PerMessageDeflate;
 import org.springframework.context.Lifecycle;
 import org.springframework.web.socket.server.standard.ServerEndpointRegistration;