diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..ac4f9793 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +build +.gradle +.idea/ +out +*.iml diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..4dd9621d --- /dev/null +++ b/build.gradle @@ -0,0 +1,48 @@ +import java.text.SimpleDateFormat + +subprojects { + + apply plugin: 'java' + apply plugin: 'maven' + + + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + version = "0.1" + group = 'org.springframework' + + ext { + graphqlJavaVersion = "15.0" + springVersion = "5.1.7.RELEASE" + springBootVersion = "2.1.5.RELEASE" + jacksonVersion = "2.9.8" + assertJVersion = "3.11.1" + } + + repositories { + mavenCentral() + mavenLocal() + } + + task sourcesJar(type: Jar) { + dependsOn classes + classifier 'sources' + from sourceSets.main.allSource + } + + task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir + } + + javadoc { + options.encoding = 'UTF-8' + } + +} + +task myWrapper(type: Wrapper) { + gradleVersion = '4.10.2' + distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip" +} + diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..50b23183 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.caching=true +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.jvmargs=-Dfile.encoding=UTF-8 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..29953ea1 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..d76b502e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..cccdd3d5 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..f9553162 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/graphql-java-spring-boot-starter-webmvc/build.gradle b/graphql-java-spring-boot-starter-webmvc/build.gradle new file mode 100644 index 00000000..c37e06b7 --- /dev/null +++ b/graphql-java-spring-boot-starter-webmvc/build.gradle @@ -0,0 +1,8 @@ +description = "GraphQL Java Spring Boot starter Webmvc" +dependencies { + compile "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion" + compile project(':graphql-java-spring-webmvc') + + testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion" + testCompile "org.springframework.boot:spring-boot-starter-web:$springBootVersion" +} diff --git a/graphql-java-spring-boot-starter-webmvc/src/main/java/org/springframework/graphql/GraphQLEndpointConfiguration.java b/graphql-java-spring-boot-starter-webmvc/src/main/java/org/springframework/graphql/GraphQLEndpointConfiguration.java new file mode 100644 index 00000000..a5c7ee07 --- /dev/null +++ b/graphql-java-spring-boot-starter-webmvc/src/main/java/org/springframework/graphql/GraphQLEndpointConfiguration.java @@ -0,0 +1,23 @@ +package org.springframework.graphql; + +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 org.springframework.graphql.components.GraphQLController; + +import javax.annotation.PostConstruct; + +@Configuration +@ConditionalOnWebApplication +@ComponentScan(basePackageClasses = GraphQLController.class) +public class GraphQLEndpointConfiguration { + + @Autowired + ApplicationContext applicationContext; + + @PostConstruct + public void init() { + } +} diff --git a/graphql-java-spring-boot-starter-webmvc/src/main/resources/META-INF/spring.factories b/graphql-java-spring-boot-starter-webmvc/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..fba5f62c --- /dev/null +++ b/graphql-java-spring-boot-starter-webmvc/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +org.springframework.graphql.GraphQLEndpointConfiguration diff --git a/graphql-java-spring-boot-starter-webmvc/src/test/java/org/springframework/graphql/IntegrationTest.java b/graphql-java-spring-boot-starter-webmvc/src/test/java/org/springframework/graphql/IntegrationTest.java new file mode 100644 index 00000000..c5a7e498 --- /dev/null +++ b/graphql-java-spring-boot-starter-webmvc/src/test/java/org/springframework/graphql/IntegrationTest.java @@ -0,0 +1,54 @@ +package org.springframework.graphql; + +import graphql.ExecutionInput; +import graphql.ExecutionResultImpl; +import graphql.GraphQL; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@RunWith(SpringRunner.class) +public class IntegrationTest { + + @Autowired + private TestRestTemplate restTemplate; + + @Autowired + GraphQL graphql; + + @Test + public void endpointIsAvailable() { + String query = "{foo}"; + + ExecutionResultImpl executionResult = ExecutionResultImpl.newExecutionResult() + .data("bar") + .build(); + CompletableFuture cf = CompletableFuture.completedFuture(executionResult); + ArgumentCaptor captor = ArgumentCaptor.forClass(ExecutionInput.class); + Mockito.when(graphql.executeAsync(captor.capture())).thenReturn(cf); + + Map body = new LinkedHashMap<>(); + body.put("query", query); + + ResponseEntity responseEntity = this.restTemplate.postForEntity("/graphql", body, Map.class); + + Map responseBody = (Map) responseEntity.getBody(); + assertThat(responseBody.get("data"), is("bar")); + assertThat(captor.getValue().getQuery(), is(query)); + } + +} \ No newline at end of file diff --git a/graphql-java-spring-boot-starter-webmvc/src/test/java/org/springframework/graphql/IntegrationTestConfig.java b/graphql-java-spring-boot-starter-webmvc/src/test/java/org/springframework/graphql/IntegrationTestConfig.java new file mode 100644 index 00000000..b6862103 --- /dev/null +++ b/graphql-java-spring-boot-starter-webmvc/src/test/java/org/springframework/graphql/IntegrationTestConfig.java @@ -0,0 +1,18 @@ +package org.springframework.graphql; + +import graphql.GraphQL; +import org.mockito.Mockito; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +public class IntegrationTestConfig { + + + @Bean + public GraphQL graphQL() { + return Mockito.mock(GraphQL.class); + } + +} + diff --git a/graphql-java-spring-webmvc/build.gradle b/graphql-java-spring-webmvc/build.gradle new file mode 100644 index 00000000..c9773262 --- /dev/null +++ b/graphql-java-spring-webmvc/build.gradle @@ -0,0 +1,15 @@ +description = "GraphQL Java Spring Webmvc integration" + +dependencies { + compile "org.springframework:spring-webmvc:$springVersion" + compile "org.springframework:spring-context:$springVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile "com.graphql-java:graphql-java:$graphqlJavaVersion" + + testCompile("org.assertj:assertj-core:$assertJVersion") + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile "org.springframework:spring-test:$springVersion" + testCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1' + testCompile group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0' + testCompile "org.mockito:mockito-core:2.+" +} diff --git a/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/ExecutionInputCustomizer.java b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/ExecutionInputCustomizer.java new file mode 100644 index 00000000..6f326d0c --- /dev/null +++ b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/ExecutionInputCustomizer.java @@ -0,0 +1,20 @@ +package org.springframework.graphql; + +import graphql.ExecutionInput; +import graphql.PublicApi; +import org.springframework.web.context.request.WebRequest; + +import java.util.concurrent.CompletableFuture; + +/** + * Lets you customize the #ExecutionInput before the query is executed. + * You can for example set a context object or define a root value. + *

+ * This is only used if you use the default {@link GraphQLInvocation}. + */ +@PublicApi +public interface ExecutionInputCustomizer { + + CompletableFuture customizeExecutionInput(ExecutionInput executionInput, WebRequest webRequest); + +} diff --git a/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/ExecutionResultHandler.java b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/ExecutionResultHandler.java new file mode 100644 index 00000000..21d4d1e7 --- /dev/null +++ b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/ExecutionResultHandler.java @@ -0,0 +1,12 @@ +package org.springframework.graphql; + +import graphql.ExecutionResult; +import graphql.PublicSpi; + +import java.util.concurrent.CompletableFuture; + +@PublicSpi +public interface ExecutionResultHandler { + + Object handleExecutionResult(CompletableFuture executionResultCF); +} diff --git a/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/GraphQLInvocation.java b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/GraphQLInvocation.java new file mode 100644 index 00000000..3c033bba --- /dev/null +++ b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/GraphQLInvocation.java @@ -0,0 +1,14 @@ +package org.springframework.graphql; + +import graphql.ExecutionResult; +import graphql.PublicApi; +import org.springframework.web.context.request.WebRequest; + +import java.util.concurrent.CompletableFuture; + +@PublicApi +public interface GraphQLInvocation { + + CompletableFuture invoke(GraphQLInvocationData invocationData, WebRequest webRequest); + +} diff --git a/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/GraphQLInvocationData.java b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/GraphQLInvocationData.java new file mode 100644 index 00000000..bccdf911 --- /dev/null +++ b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/GraphQLInvocationData.java @@ -0,0 +1,33 @@ +package org.springframework.graphql; + +import graphql.Assert; +import graphql.PublicApi; + +import java.util.Collections; +import java.util.Map; + +@PublicApi +public class GraphQLInvocationData { + + private final String query; + private final String operationName; + private final Map variables; + + public GraphQLInvocationData(String query, String operationName, Map variables) { + this.query = Assert.assertNotNull(query, () -> "query must be provided"); + this.operationName = operationName; + this.variables = variables != null ? variables : Collections.emptyMap(); + } + + public String getQuery() { + return query; + } + + public String getOperationName() { + return operationName; + } + + public Map getVariables() { + return variables; + } +} diff --git a/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/DefaultExecutionResultHandler.java b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/DefaultExecutionResultHandler.java new file mode 100644 index 00000000..bf69c095 --- /dev/null +++ b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/DefaultExecutionResultHandler.java @@ -0,0 +1,23 @@ +package org.springframework.graphql.components; + +import com.fasterxml.jackson.databind.ObjectMapper; +import graphql.ExecutionResult; +import graphql.Internal; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.graphql.ExecutionResultHandler; +import org.springframework.stereotype.Component; + +import java.util.concurrent.CompletableFuture; + +@Component +@Internal +public class DefaultExecutionResultHandler implements ExecutionResultHandler { + + @Autowired + ObjectMapper objectMapper; + + @Override + public Object handleExecutionResult(CompletableFuture executionResultCF) { + return executionResultCF.thenApply(ExecutionResult::toSpecification); + } +} diff --git a/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/DefaultGraphQLInvocation.java b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/DefaultGraphQLInvocation.java new file mode 100644 index 00000000..a56a23c9 --- /dev/null +++ b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/DefaultGraphQLInvocation.java @@ -0,0 +1,37 @@ +package org.springframework.graphql.components; + +import graphql.ExecutionInput; +import graphql.ExecutionResult; +import graphql.GraphQL; +import graphql.Internal; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.graphql.ExecutionInputCustomizer; +import org.springframework.graphql.GraphQLInvocation; +import org.springframework.graphql.GraphQLInvocationData; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.WebRequest; + +import java.util.concurrent.CompletableFuture; + +@Component +@Internal +public class DefaultGraphQLInvocation implements GraphQLInvocation { + + @Autowired + GraphQL graphQL; + + @Autowired + ExecutionInputCustomizer executionInputCustomizer; + + @Override + public CompletableFuture invoke(GraphQLInvocationData invocationData, WebRequest webRequest) { + ExecutionInput executionInput = ExecutionInput.newExecutionInput() + .query(invocationData.getQuery()) + .operationName(invocationData.getOperationName()) + .variables(invocationData.getVariables()) + .build(); + CompletableFuture customizedExecutionInput = executionInputCustomizer.customizeExecutionInput(executionInput, webRequest); + return customizedExecutionInput.thenCompose(graphQL::executeAsync); + } + +} diff --git a/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/GraphQLController.java b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/GraphQLController.java new file mode 100644 index 00000000..1f24fc3a --- /dev/null +++ b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/GraphQLController.java @@ -0,0 +1,43 @@ +package org.springframework.graphql.components; + + +import graphql.ExecutionResult; +import graphql.Internal; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.graphql.ExecutionResultHandler; +import org.springframework.graphql.GraphQLInvocation; +import org.springframework.graphql.GraphQLInvocationData; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.WebRequest; + +import java.util.concurrent.CompletableFuture; + +@RestController +@Internal +public class GraphQLController { + + @Autowired + GraphQLInvocation graphQLInvocation; + + @Autowired + ExecutionResultHandler executionResultHandler; + + @RequestMapping(value = "${graphql.url:graphql}", + method = RequestMethod.POST, + consumes = MediaType.APPLICATION_JSON_VALUE, + produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public Object graphqlPOST(@RequestBody GraphQLRequestBody body, + WebRequest webRequest) { + String query = body.getQuery(); + if (query == null) { + query = ""; + } + CompletableFuture executionResult = graphQLInvocation.invoke(new GraphQLInvocationData(query, body.getOperationName(), body.getVariables()), webRequest); + return executionResultHandler.handleExecutionResult(executionResult); + } + +} diff --git a/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/GraphQLRequestBody.java b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/GraphQLRequestBody.java new file mode 100644 index 00000000..10697e30 --- /dev/null +++ b/graphql-java-spring-webmvc/src/main/java/org/springframework/graphql/components/GraphQLRequestBody.java @@ -0,0 +1,36 @@ +package org.springframework.graphql.components; + +import graphql.Internal; + +import java.util.Map; + +@Internal +public class GraphQLRequestBody { + private String query; + private String operationName; + private Map variables; + + public String getQuery() { + return query; + } + + public void setQuery(String query) { + this.query = query; + } + + public String getOperationName() { + return operationName; + } + + public void setOperationName(String operationName) { + this.operationName = operationName; + } + + public Map getVariables() { + return variables; + } + + public void setVariables(Map variables) { + this.variables = variables; + } +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..e13df523 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,4 @@ +rootProject.name = 'spring-graphql' +include 'graphql-java-spring-boot-starter-webmvc' +include 'graphql-java-spring-webmvc' +