feat(spring-boot): respect the GraphQL specifications on the controller response

Author: WipeAir

graphql-kotlin-toolkit-spring-boot/src/main/kotlin/com/auritylab/graphql/kotlin/toolkit/spring/Controller.kt

@@ -4,7 +4,6 @@ import com.auritylab.graphql.kotlin.toolkit.spring.api.GraphQLInvocation
 import com.auritylab.kotlin.object_path.KObjectPath
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import graphql.ExecutionResult
 import java.util.concurrent.CompletableFuture
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
@@ -50,7 +49,7 @@ internal class Controller(
         @RequestParam(value = "operationName", required = false) operationName: String?,
         @RequestParam(value = "variables", required = false) variables: String?,
         request: WebRequest
-    ): CompletableFuture<ExecutionResult> =
+    ): CompletableFuture<out Any> =
         execute(Operation(query, operationName, variables?.let { parse<Map<String, String>>(it) }), request)
 
     /**
@@ -70,7 +69,7 @@ internal class Controller(
         @RequestParam(value = "query", required = false) query: String?,
         @RequestBody(required = false) body: String?,
         request: WebRequest
-    ): CompletableFuture<ExecutionResult> {
+    ): CompletableFuture<out Any> {
         // Parse the given contentType into a MediaType.
         val parsedMediaType = MediaType.parseMediaType(contentType)
 
@@ -111,7 +110,7 @@ internal class Controller(
         @RequestParam(value = "map") map: String,
         multipartRequest: MultipartRequest,
         request: WebRequest
-    ): CompletableFuture<ExecutionResult> {
+    ): CompletableFuture<out Any> {
         val parsedOperation = parse<Operation>(operations)
             ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Unable to parse operation")
         val parsedMap = parse<Map<String, List<String>>>(map)
@@ -149,11 +148,11 @@ internal class Controller(
     private fun execute(
         operation: Operation,
         request: WebRequest
-    ): CompletableFuture<ExecutionResult> =
+    ): CompletableFuture<out Any> =
         invocation.invoke(
             GraphQLInvocation.Data(operation.query, operation.operationName, operation.variables),
             request
-        )
+        ).thenApply { it.toSpecification() }
 
     /**
      * Represents a GraphQL operation with a [query], [operationName] (optional) and [variables] (optional).

graphql-kotlin-toolkit-spring-boot/src/test/kotlin/com/auritylab/graphql/kotlin/toolkit/spring/ControllerMockedInvocationTest.kt

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.argThat
 import com.nhaarman.mockitokotlin2.check
-import com.nhaarman.mockitokotlin2.reset
+import com.nhaarman.mockitokotlin2.clearInvocations
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import java.util.UUID
@@ -43,7 +43,7 @@ class ControllerMockedInvocationTest {
 
     @BeforeEach
     fun resetMock() {
-        reset(invocation)
+        clearInvocations(invocation)
     }
 
     @Test

graphql-kotlin-toolkit-spring-boot/src/test/kotlin/com/auritylab/graphql/kotlin/toolkit/spring/TestConfiguration.kt

@@ -4,6 +4,10 @@ import com.auritylab.graphql.kotlin.toolkit.spring.api.GraphQLInvocation
 import com.auritylab.graphql.kotlin.toolkit.spring.api.schemaOfResourceFiles
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.KotlinModule
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.whenever
+import graphql.ExecutionResultImpl
+import java.util.concurrent.CompletableFuture
 import org.mockito.Mockito
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.context.annotation.Bean
@@ -25,5 +29,11 @@ internal class TestConfiguration {
 
     @Bean
     @Profile("graphql-invocation-mock")
-    fun invocation(): GraphQLInvocation = Mockito.mock(GraphQLInvocation::class.java)
+    fun invocation(): GraphQLInvocation {
+        val m = Mockito.mock(GraphQLInvocation::class.java)
+
+        whenever(m.invoke(any(), any())).thenReturn(CompletableFuture.completedFuture(ExecutionResultImpl(listOf())))
+
+        return m
+    }
 }