Fix defaultAutomaticPersistedQueriesSettings.version to be const.

ExpediaGroup · Jun 27, 2023 · 6e0cc97 · 6e0cc97
1 parent 38c3d4e
commit 6e0cc97
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 30 deletions.
diff --git a/...rc/main/kotlin/com/expediagroup/graphql/client/types/AutomaticPersistedQueriesSettings.kt b/...rc/main/kotlin/com/expediagroup/graphql/client/types/AutomaticPersistedQueriesSettings.kt
@@ -17,11 +17,9 @@
 package com.expediagroup.graphql.client.types
 
 data class AutomaticPersistedQueriesSettings(
-    val enabled: Boolean,
-    val version: Int
-)
-
-val defaultAutomaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings(
-    enabled = false,
-    version = 1
-)
+    val enabled: Boolean = false
+) {
+    companion object {
+        const val VERSION: Int = 1
+    }
+}
diff --git a/...lin-ktor-client/src/main/kotlin/com/expediagroup/graphql/client/ktor/GraphQLKtorClient.kt b/...lin-ktor-client/src/main/kotlin/com/expediagroup/graphql/client/ktor/GraphQLKtorClient.kt
@@ -25,7 +25,6 @@ import com.expediagroup.graphql.client.types.AutomaticPersistedQueriesExtension
 import com.expediagroup.graphql.client.types.AutomaticPersistedQueriesSettings
 import com.expediagroup.graphql.client.types.GraphQLClientRequest
 import com.expediagroup.graphql.client.types.GraphQLClientResponse
-import com.expediagroup.graphql.client.types.defaultAutomaticPersistedQueriesSettings
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.engine.cio.CIO
@@ -49,14 +48,14 @@ open class GraphQLKtorClient(
     private val url: URL,
     private val httpClient: HttpClient = HttpClient(engineFactory = CIO),
     private val serializer: GraphQLClientSerializer = defaultGraphQLSerializer(),
-    override val automaticPersistedQueriesSettings: AutomaticPersistedQueriesSettings = defaultAutomaticPersistedQueriesSettings
+    override val automaticPersistedQueriesSettings: AutomaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings()
 ) : GraphQLClient<HttpRequestBuilder>, Closeable {
 
     override suspend fun <T : Any> execute(request: GraphQLClientRequest<T>, requestCustomizer: HttpRequestBuilder.() -> Unit): GraphQLClientResponse<T> {
         return if (automaticPersistedQueriesSettings.enabled) {
             val queryId = request.getQueryId()
             val automaticPersistedQueriesExtension = AutomaticPersistedQueriesExtension(
-                version = automaticPersistedQueriesSettings.version,
+                version = AutomaticPersistedQueriesSettings.VERSION,
                 sha256Hash = queryId
             )
 

diff --git a/...ktor-client/src/test/kotlin/com/expediagroup/graphql/client/ktor/GraphQLKtorClientTest.kt b/...ktor-client/src/test/kotlin/com/expediagroup/graphql/client/ktor/GraphQLKtorClientTest.kt
@@ -259,10 +259,7 @@ class GraphQLKtorClientTest {
         val client = GraphQLKtorClient(
             url = URL("${wireMockServer.baseUrl()}/graphql"),
             serializer = GraphQLClientJacksonSerializer(),
-            automaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings(
-                enabled = true,
-                version = 1
-            )
+            automaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings(enabled = true)
         )
 
         runBlocking {
@@ -320,10 +317,7 @@ class GraphQLKtorClientTest {
         val client = GraphQLKtorClient(
             url = URL("${wireMockServer.baseUrl()}/graphql"),
             serializer = GraphQLClientJacksonSerializer(),
-            automaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings(
-                enabled = true,
-                version = 1
-            )
+            automaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings(enabled = true)
         )
 
         runBlocking {

diff --git a/...-spring-client/src/main/kotlin/com/expediagroup/graphql/client/spring/GraphQLWebClient.kt b/...-spring-client/src/main/kotlin/com/expediagroup/graphql/client/spring/GraphQLWebClient.kt
@@ -25,7 +25,6 @@ import com.expediagroup.graphql.client.types.AutomaticPersistedQueriesExtension
 import com.expediagroup.graphql.client.types.AutomaticPersistedQueriesSettings
 import com.expediagroup.graphql.client.types.GraphQLClientRequest
 import com.expediagroup.graphql.client.types.GraphQLClientResponse
-import com.expediagroup.graphql.client.types.defaultAutomaticPersistedQueriesSettings
 import kotlinx.coroutines.reactive.awaitSingle
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
@@ -41,7 +40,7 @@ open class GraphQLWebClient(
     url: String,
     private val serializer: GraphQLClientSerializer = defaultGraphQLSerializer(),
     builder: WebClient.Builder = WebClient.builder(),
-    override val automaticPersistedQueriesSettings: AutomaticPersistedQueriesSettings = defaultAutomaticPersistedQueriesSettings
+    override val automaticPersistedQueriesSettings: AutomaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings()
 ) : GraphQLClient<WebClient.RequestBodyUriSpec> {
 
     private val client: WebClient = builder
@@ -59,7 +58,7 @@ open class GraphQLWebClient(
         return if (automaticPersistedQueriesSettings.enabled) {
             val queryId = request.getQueryId()
             val automaticPersistedQueriesExtension = AutomaticPersistedQueriesExtension(
-                version = automaticPersistedQueriesSettings.version,
+                version = AutomaticPersistedQueriesSettings.VERSION,
                 sha256Hash = queryId
             )
 

diff --git a/...ing-client/src/test/kotlin/com/expediagroup/graphql/client/spring/GraphQLWebClientTest.kt b/...ing-client/src/test/kotlin/com/expediagroup/graphql/client/spring/GraphQLWebClientTest.kt
@@ -266,10 +266,7 @@ class GraphQLWebClientTest {
         val client = GraphQLWebClient(
             url = "${wireMockServer.baseUrl()}/graphql",
             serializer = GraphQLClientJacksonSerializer(),
-            automaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings(
-                enabled = true,
-                version = 1
-            )
+            automaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings(enabled = true)
         )
 
         runBlocking {
@@ -327,10 +324,7 @@ class GraphQLWebClientTest {
         val client = GraphQLWebClient(
             url = "${wireMockServer.baseUrl()}/graphql",
             serializer = GraphQLClientJacksonSerializer(),
-            automaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings(
-                enabled = true,
-                version = 1
-            )
+            automaticPersistedQueriesSettings = AutomaticPersistedQueriesSettings(enabled = true)
         )
 
         runBlocking {