add webmvc support, refactoring

Author: andimarek

.travis.yml

@@ -0,0 +1 @@
+language: java

graphql-java-spring-boot-starter-webflux/src/main/java/graphql/spring/web/reactive/GraphQLEndpointConfiguration.java

@@ -0,0 +1,23 @@
+package graphql.spring.web.reactive;
+
+import graphql.spring.web.reactive.controller.GraphQLController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+@Configuration
+@ConditionalOnWebApplication
+@ComponentScan(basePackageClasses = GraphQLController.class)
+public class GraphQLEndpointConfiguration {
+
+    @Autowired
+    ApplicationContext applicationContext;
+
+    @PostConstruct
+    public void init() {
+    }
+}

graphql-java-spring-boot-starter-webflux/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-graphql.spring.GraphQLEndpointConfiguration
+graphql.spring.web.reactive.GraphQLEndpointConfiguration

graphql-java-spring-boot-starter-webmvc/build.gradle

@@ -0,0 +1,9 @@
+
+version = "1.0"
+
+def springBootVersion = "2.1.0.RELEASE"
+
+dependencies {
+    compile "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion"
+    compile project(':graphql-java-spring-webmvc')
+}

graphql-java-spring-boot-starter-webflux/src/main/java/graphql/spring/GraphQLEndpointConfiguration.java renamed to graphql-java-spring-boot-starter-webmvc/src/main/java/graphql/spring/web/servlet/GraphQLEndpointConfiguration.java

@@ -1,6 +1,6 @@
-package graphql.spring;
+package graphql.spring.web.servlet;
 
-import graphql.spring.reactive.controller.GraphQLController;
+import graphql.spring.web.servlet.controller.GraphQLController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.ApplicationContext;

graphql-java-spring-boot-starter-webmvc/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+graphql.spring.web.servlet.GraphQLEndpointConfiguration

graphql-java-spring-webflux/build.gradle

@@ -1,7 +1,6 @@
 def springVersion = "5.1.2.RELEASE"
 def jacksonVersion = "2.9.6"
-//def graphqlJavaVersion = "11.0"
-def graphqlJavaVersion = "2018-09-16T01-27-46-27a6e44"
+def graphqlJavaVersion = "11.0"
 
 dependencies {
     compile "org.springframework:spring-webflux:$springVersion"

graphql-java-spring-webflux/src/main/java/graphql/spring/reactive/DefaultExecutionResultHandler.java

@@ -0,0 +1,24 @@
+package graphql.spring.web.reactive;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import graphql.ExecutionResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+@Component
+public class DefaultExecutionResultHandler implements ExecutionResultHandler {
+
+    @Autowired
+    ObjectMapper objectMapper;
+
+    @Override
+    public Object handleExecutionResult(Mono<ExecutionResult> executionResultMono, ServerHttpResponse serverHttpResponse) {
+        return executionResultMono.map(executionResult -> handleImpl(executionResult, serverHttpResponse));
+    }
+
+    private Object handleImpl(ExecutionResult executionResult, ServerHttpResponse serverHttpResponse) {
+        return executionResult.toSpecification();
+    }
+}

graphql-java-spring-webflux/src/main/java/graphql/spring/web/reactive/DefaultExecutionResultHandler.java

@@ -1,4 +1,4 @@
-package graphql.spring.reactive;
+package graphql.spring.web.reactive;
 
 import graphql.ExecutionInput;
 import graphql.ExecutionResult;