Merge branch 'master' into entity-representation-mappers

Netflix · Oct 19, 2023 · f3154ad · f3154ad
2 parents 71cd387 + 3c4bf47
commit f3154ad
Show file tree

Hide file tree

Showing 22 changed files with 79 additions and 54 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -15,5 +15,5 @@
  */
 
 object Versions {
-    const val KOTLIN_VERSION = "1.7.20"
+    const val KOTLIN_VERSION = "1.9.10"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -19,4 +19,7 @@ kotlin.code.style=official
 org.gradle.caching = true
 # org.gradle.parallel = true
 # org.gradle.configureondemand = true
-org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx2000m
+kotlin.daemon.useFallbackStrategy=false
+kotlin.compiler.execution.strategy=in-process
+
diff --git a/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/CustomGraphQLClient.kt b/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/CustomGraphQLClient.kt
@@ -24,7 +24,7 @@ import org.intellij.lang.annotations.Language
  * For a more convenient option, use [WebClientGraphQLClient] instead.
  */
 class CustomGraphQLClient(private val url: String, private val requestExecutor: RequestExecutor) : GraphQLClient {
-    override fun executeQuery(query: String): GraphQLResponse {
+    override fun executeQuery(@Language("graphql") query: String): GraphQLResponse {
         return executeQuery(query, emptyMap(), null)
     }
 

diff --git a/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/DefaultGraphQLClient.kt b/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/DefaultGraphQLClient.kt
@@ -16,6 +16,7 @@
 
 package com.netflix.graphql.dgs.client
 
+import org.intellij.lang.annotations.Language
 import reactor.core.publisher.Mono
 
 /**
@@ -55,7 +56,7 @@ class DefaultGraphQLClient(private val url: String) : GraphQLClient, MonoGraphQL
      */
     @Deprecated("The RequestExecutor should be provided while creating the implementation. Use CustomGraphQLClient/CustomMonoGraphQLClient instead.")
     override fun executeQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         operationName: String?,
         requestExecutor: RequestExecutor
@@ -65,15 +66,15 @@ class DefaultGraphQLClient(private val url: String) : GraphQLClient, MonoGraphQL
         return GraphQLClients.handleResponse(response, serializedRequest, url)
     }
 
-    override fun executeQuery(query: String): GraphQLResponse {
+    override fun executeQuery(@Language("graphql") query: String): GraphQLResponse {
         throw UnsupportedOperationException("Please move to [BlockingGraphQLClient] to use this method")
     }
 
-    override fun executeQuery(query: String, variables: Map<String, Any>): GraphQLResponse {
+    override fun executeQuery(@Language("graphql") query: String, variables: Map<String, Any>): GraphQLResponse {
         throw UnsupportedOperationException("Please move to [BlockingGraphQLClient] to use this method")
     }
 
-    override fun executeQuery(query: String, variables: Map<String, Any>, operationName: String?): GraphQLResponse {
+    override fun executeQuery(@Language("graphql") query: String, variables: Map<String, Any>, operationName: String?): GraphQLResponse {
         throw UnsupportedOperationException("Please move to [BlockingGraphQLClient] to use this method")
     }
 
@@ -90,24 +91,24 @@ class DefaultGraphQLClient(private val url: String) : GraphQLClient, MonoGraphQL
      */
     @Deprecated("The RequestExecutor should be provided while creating the implementation. Use CustomGraphQLClient/CustomMonoGraphQLClient instead.")
     override fun executeQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         requestExecutor: RequestExecutor
     ): GraphQLResponse {
         @Suppress("deprecation")
         return executeQuery(query, variables, null, requestExecutor)
     }
 
-    override fun reactiveExecuteQuery(query: String): Mono<GraphQLResponse> {
+    override fun reactiveExecuteQuery(@Language("graphql") query: String): Mono<GraphQLResponse> {
         throw UnsupportedOperationException("Please move to [CustomGraphQLClient] to use this method")
     }
 
-    override fun reactiveExecuteQuery(query: String, variables: Map<String, Any>): Mono<GraphQLResponse> {
+    override fun reactiveExecuteQuery(@Language("graphql") query: String, variables: Map<String, Any>): Mono<GraphQLResponse> {
         throw UnsupportedOperationException("Please move to [CustomGraphQLClient] to use this method")
     }
 
     override fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         operationName: String?
     ): Mono<GraphQLResponse> {
@@ -127,7 +128,7 @@ class DefaultGraphQLClient(private val url: String) : GraphQLClient, MonoGraphQL
      */
     @Deprecated("The RequestExecutor should be provided while creating the implementation. Use CustomGraphQLClient/CustomMonoGraphQLClient instead.")
     override fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         requestExecutor: MonoRequestExecutor
     ): Mono<GraphQLResponse> {
@@ -149,7 +150,7 @@ class DefaultGraphQLClient(private val url: String) : GraphQLClient, MonoGraphQL
      */
     @Deprecated("The RequestExecutor should be provided while creating the implementation. Use CustomGraphQLClient/CustomMonoGraphQLClient instead.")
     override fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         operationName: String?,
         requestExecutor: MonoRequestExecutor

diff --git a/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/GraphQLClient.kt b/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/GraphQLClient.kt
@@ -16,6 +16,8 @@
 
 package com.netflix.graphql.dgs.client
 
+import org.intellij.lang.annotations.Language
+
 /**
  * GraphQL client interface for blocking clients.
  */
@@ -25,15 +27,15 @@ interface GraphQLClient {
      * @param query The query string. Note that you can use [code generation](https://netflix.github.io/dgs/generating-code-from-schema/#generating-query-apis-for-external-services) for a type safe query!
      * @return [GraphQLResponse] parses the response and gives easy access to data and errors.
      */
-    fun executeQuery(query: String): GraphQLResponse
+    fun executeQuery(@Language("graphql") query: String): GraphQLResponse
 
     /**
      * A blocking call to execute a query and parse its result.
      * @param query The query string. Note that you can use [code generation](https://netflix.github.io/dgs/generating-code-from-schema/#generating-query-apis-for-external-services) for a type safe query!
      * @param variables A map of input variables
      * @return [GraphQLResponse] parses the response and gives easy access to data and errors.
      */
-    fun executeQuery(query: String, variables: Map<String, Any>): GraphQLResponse
+    fun executeQuery(@Language("graphql") query: String, variables: Map<String, Any>): GraphQLResponse
 
     /**
      * A blocking call to execute a query and parse its result.
@@ -42,7 +44,7 @@ interface GraphQLClient {
      * @param operationName Name of the operation
      * @return [GraphQLResponse] parses the response and gives easy access to data and errors.
      */
-    fun executeQuery(query: String, variables: Map<String, Any>, operationName: String?): GraphQLResponse
+    fun executeQuery(@Language("graphql") query: String, variables: Map<String, Any>, operationName: String?): GraphQLResponse
 
     @Deprecated(
         "The RequestExecutor should be provided while creating the implementation. Use CustomGraphQLClient/CustomMonoGraphQLClient instead.",
@@ -55,7 +57,7 @@ interface GraphQLClient {
         ReplaceWith("Example: new CustomGraphQLClient(url, requestExecutor);")
     )
     fun executeQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         operationName: String?,
         requestExecutor: RequestExecutor

diff --git a/...ent/src/main/kotlin/com/netflix/graphql/dgs/client/GraphqlSSESubscriptionGraphQLClient.kt b/...ent/src/main/kotlin/com/netflix/graphql/dgs/client/GraphqlSSESubscriptionGraphQLClient.kt
@@ -18,6 +18,7 @@ package com.netflix.graphql.dgs.client
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.netflix.graphql.types.subscription.QueryPayload
+import org.intellij.lang.annotations.Language
 import org.springframework.http.MediaType
 import org.springframework.web.reactive.function.client.WebClient
 import org.springframework.web.reactive.function.client.toEntityFlux
@@ -33,12 +34,12 @@ class GraphqlSSESubscriptionGraphQLClient(private val url: String, private val w
 
     private val mapper = jacksonObjectMapper()
 
-    override fun reactiveExecuteQuery(query: String, variables: Map<String, Any>): Flux<GraphQLResponse> {
+    override fun reactiveExecuteQuery(@Language("graphql") query: String, variables: Map<String, Any>): Flux<GraphQLResponse> {
         return reactiveExecuteQuery(query, variables, null)
     }
 
     override fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         operationName: String?
     ): Flux<GraphQLResponse> {

diff --git a/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/MonoGraphQLClient.kt b/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/MonoGraphQLClient.kt
@@ -67,7 +67,7 @@ interface MonoGraphQLClient {
         ReplaceWith("Example: new CustomGraphQLClient(url, requestExecutor);")
     )
     fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         requestExecutor: MonoRequestExecutor
     ): Mono<GraphQLResponse> = throw UnsupportedOperationException()
@@ -77,7 +77,7 @@ interface MonoGraphQLClient {
         ReplaceWith("Example: new CustomGraphQLClient(url, requestExecutor);")
     )
     fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         operationName: String?,
         requestExecutor: MonoRequestExecutor

diff --git a/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/ReactiveGraphQLClient.kt b/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/ReactiveGraphQLClient.kt
@@ -16,6 +16,7 @@
 
 package com.netflix.graphql.dgs.client
 
+import org.intellij.lang.annotations.Language
 import reactor.core.publisher.Flux
 
 /**
@@ -28,7 +29,7 @@ interface ReactiveGraphQLClient {
      * @return A [Flux] of [GraphQLResponse]. [GraphQLResponse] parses the response and gives easy access to data and errors.
      */
     fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>
     ): Flux<GraphQLResponse>
 
@@ -39,7 +40,7 @@ interface ReactiveGraphQLClient {
      * @return A [Flux] of [GraphQLResponse]. [GraphQLResponse] parses the response and gives easy access to data and errors.
      */
     fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         operationName: String?
     ): Flux<GraphQLResponse>

diff --git a/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/Request.kt b/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/Request.kt
@@ -16,4 +16,6 @@
 
 package com.netflix.graphql.dgs.client
 
-internal data class Request(val query: String, val variables: Map<String, Any>, val operationName: String?)
+import org.intellij.lang.annotations.Language
+
+internal data class Request(@Language("graphql") val query: String, val variables: Map<String, Any>, val operationName: String?)
diff --git a/...dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/SSESubscriptionGraphQLClient.kt b/...dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/SSESubscriptionGraphQLClient.kt
@@ -18,6 +18,7 @@ package com.netflix.graphql.dgs.client
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.netflix.graphql.types.subscription.QueryPayload
+import org.intellij.lang.annotations.Language
 import org.springframework.http.MediaType
 import org.springframework.web.reactive.function.client.WebClient
 import org.springframework.web.reactive.function.client.toEntityFlux
@@ -34,12 +35,12 @@ class SSESubscriptionGraphQLClient(private val url: String, private val webClien
 
     private val mapper = jacksonObjectMapper()
 
-    override fun reactiveExecuteQuery(query: String, variables: Map<String, Any>): Flux<GraphQLResponse> {
+    override fun reactiveExecuteQuery(@Language("graphql") query: String, variables: Map<String, Any>): Flux<GraphQLResponse> {
         return reactiveExecuteQuery(query, variables, null)
     }
 
     override fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         operationName: String?
     ): Flux<GraphQLResponse> {
@@ -60,7 +61,7 @@ class SSESubscriptionGraphQLClient(private val url: String, private val webClien
             .publishOn(Schedulers.single())
     }
 
-    private fun encodeQuery(query: String): String? {
+    private fun encodeQuery(@Language("graphql") query: String): String? {
         return Base64.getEncoder().encodeToString(query.toByteArray(StandardCharsets.UTF_8))
     }
 }
diff --git a/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/WebSocketGraphQLClient.kt b/graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/WebSocketGraphQLClient.kt
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonTypeRef
 import com.netflix.graphql.types.subscription.*
 import graphql.GraphQLException
+import org.intellij.lang.annotations.Language
 import org.springframework.web.reactive.socket.WebSocketHandler
 import org.springframework.web.reactive.socket.WebSocketMessage
 import org.springframework.web.reactive.socket.WebSocketSession
@@ -87,14 +88,14 @@ class WebSocketGraphQLClient(
     }
 
     override fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>
     ): Flux<GraphQLResponse> {
         return reactiveExecuteQuery(query, variables, null)
     }
 
     override fun reactiveExecuteQuery(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>,
         operationName: String?
     ): Flux<GraphQLResponse> {

diff --git a/.../main/kotlin/com/netflix/graphql/dgs/reactive/internal/DefaultDgsReactiveQueryExecutor.kt b/.../main/kotlin/com/netflix/graphql/dgs/reactive/internal/DefaultDgsReactiveQueryExecutor.kt
@@ -34,6 +34,7 @@ import graphql.execution.NonNullableFieldWasNullError
 import graphql.execution.instrumentation.Instrumentation
 import graphql.execution.preparsed.PreparsedDocumentProvider
 import graphql.schema.GraphQLSchema
+import org.intellij.lang.annotations.Language
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpHeaders
@@ -60,7 +61,7 @@ class DefaultDgsReactiveQueryExecutor(
     private val schema = AtomicReference(defaultSchema)
 
     override fun execute(
-        query: String?,
+        @Language("graphql") query: String?,
         variables: Map<String, Any>?,
         extensions: Map<String, Any>?,
         headers: HttpHeaders?,
@@ -104,7 +105,7 @@ class DefaultDgsReactiveQueryExecutor(
     }
 
     override fun <T : Any> executeAndExtractJsonPath(
-        query: String,
+        @Language("graphql") query: String,
         jsonPath: String,
         variables: Map<String, Any>?,
         serverRequest: ServerRequest?
@@ -113,14 +114,14 @@ class DefaultDgsReactiveQueryExecutor(
     }
 
     override fun executeAndGetDocumentContext(
-        query: String,
+        @Language("graphql") query: String,
         variables: Map<String, Any>
     ): Mono<DocumentContext> {
         return getJsonResult(query, variables, null).map(BaseDgsQueryExecutor.parseContext::parse)
     }
 
     override fun <T : Any?> executeAndExtractJsonPathAsObject(
-        query: String,
+        @Language("graphql") query: String,
         jsonPath: String,
         variables: Map<String, Any>,
         clazz: Class<T>
@@ -137,7 +138,7 @@ class DefaultDgsReactiveQueryExecutor(
     }
 
     override fun <T : Any?> executeAndExtractJsonPathAsObject(
-        query: String,
+        @Language("graphql") query: String,
         jsonPath: String,
         variables: Map<String, Any>,
         typeRef: TypeRef<T>
@@ -153,7 +154,7 @@ class DefaultDgsReactiveQueryExecutor(
             }
     }
 
-    private fun getJsonResult(query: String, variables: Map<String, Any>?, serverRequest: ServerRequest?): Mono<String> {
+    private fun getJsonResult(@Language("graphql") query: String, variables: Map<String, Any>?, serverRequest: ServerRequest?): Mono<String> {
         val httpHeaders = serverRequest?.headers()?.asHttpHeaders()
         return execute(query, variables, null, httpHeaders, null, serverRequest).map { executionResult ->
             if (executionResult.errors.size > 0) {

diff --git a/.../main/kotlin/com/netflix/graphql/dgs/metrics/micrometer/utils/QuerySignatureRepository.kt b/.../main/kotlin/com/netflix/graphql/dgs/metrics/micrometer/utils/QuerySignatureRepository.kt
@@ -22,6 +22,7 @@ import graphql.language.AstPrinter
 import graphql.language.AstSignature
 import graphql.language.Document
 import org.apache.commons.codec.digest.DigestUtils
+import org.intellij.lang.annotations.Language
 import java.util.*
 
 /**
@@ -42,7 +43,7 @@ import java.util.*
 fun interface QuerySignatureRepository {
 
     companion object {
-        internal fun queryHash(query: String): String = DigestUtils.sha256Hex(query)
+        internal fun queryHash(@Language("graphql") query: String): String = DigestUtils.sha256Hex(query)
 
         internal fun computeSignature(
             document: Document,

diff --git a/.../src/main/kotlin/com/netflix/graphql/dgs/webflux/handlers/DefaultDgsWebfluxHttpHandler.kt b/.../src/main/kotlin/com/netflix/graphql/dgs/webflux/handlers/DefaultDgsWebfluxHttpHandler.kt
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import com.netflix.graphql.dgs.DgsExecutionResult
 import com.netflix.graphql.dgs.reactive.DgsReactiveQueryExecutor
 import graphql.ExecutionResult
+import org.intellij.lang.annotations.Language
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.web.reactive.function.server.ServerRequest
@@ -105,7 +106,7 @@ class DefaultDgsWebfluxHttpHandler(
 }
 
 private data class QueryInput(
-    val query: String?,
+    @Language("graphql") val query: String?,
     val queryVariables: Map<String, Any> = emptyMap(),
     val extensions: Map<String, Any> = emptyMap(),
     val operationName: String = ""

diff --git a/graphql-dgs-spring-webmvc/src/main/kotlin/com/netflix/graphql/dgs/mvc/DgsRestController.kt b/graphql-dgs-spring-webmvc/src/main/kotlin/com/netflix/graphql/dgs/mvc/DgsRestController.kt
@@ -28,6 +28,7 @@ import com.netflix.graphql.dgs.internal.utils.MultipartVariableMapper
 import com.netflix.graphql.dgs.internal.utils.TimeTracer
 import com.netflix.graphql.dgs.internal.utils.VariableMappingException
 import graphql.execution.reactive.SubscriptionPublisher
+import org.intellij.lang.annotations.Language
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpHeaders
@@ -82,7 +83,7 @@ open class DgsRestController(
 
         @JsonIgnoreProperties(ignoreUnknown = true)
         private data class InputQuery(
-            val query: String?,
+            @Language("graphql") val query: String?,
             val operationName: String? = null,
             val variables: Map<String, Any>? = mapOf(),
             val extensions: Map<String, Any>? = mapOf()