Merge pull request #2274 from Netflix/cleanup-2026-02-03

Various clean up

Author: paulbakker

graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/GraphqlSSESubscriptionGraphQLClient.kt

@@ -33,7 +33,7 @@ import reactor.core.scheduler.Schedulers
 class GraphqlSSESubscriptionGraphQLClient(
     private val url: String,
     private val webClient: WebClient,
-    private val options: GraphQLRequestOptions? = null,
+    options: GraphQLRequestOptions? = null,
 ) : ReactiveGraphQLClient {
     constructor(url: String, webClient: WebClient) : this(url, webClient, null)
 

graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/RestClientGraphQLClient.kt

@@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import org.intellij.lang.annotations.Language
 import org.springframework.http.HttpHeaders
 import org.springframework.web.client.RestClient
+import org.springframework.web.client.toEntity
 import java.util.function.Consumer
 
 /**
@@ -103,7 +104,7 @@ class RestClientGraphQLClient(
                 }.headers(this.headersConsumer)
                 .body(serializedRequest)
                 .retrieve()
-                .toEntity(String::class.java)
+                .toEntity<String>()
 
         if (!responseEntity.statusCode.is2xxSuccessful) {
             throw GraphQLClientException(

graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/SSESubscriptionGraphQLClient.kt

@@ -25,8 +25,7 @@ import org.springframework.web.reactive.function.client.WebClient
 import org.springframework.web.reactive.function.client.toEntityFlux
 import reactor.core.publisher.Flux
 import reactor.core.scheduler.Schedulers
-import java.nio.charset.StandardCharsets
-import java.util.Base64
+import kotlin.io.encoding.Base64
 
 /*
  * This client can be used for servers which are following the subscriptions-transport-sse specification, which can be found here:
@@ -72,10 +71,10 @@ class SSESubscriptionGraphQLClient(
 
     private fun encodeQuery(
         @Language("graphql") query: String,
-    ): String? = Base64.getEncoder().encodeToString(query.toByteArray(StandardCharsets.UTF_8))
+    ): String = Base64.encode(query.encodeToByteArray())
 }
 
-private fun org.springframework.http.HttpHeaders.toMap(): Map<String, List<String>> {
+private fun HttpHeaders.toMap(): Map<String, List<String>> {
     val result = mutableMapOf<String, List<String>>()
     this.forEach { key, values -> result[key] = values }
     return result

graphql-dgs-client/src/main/kotlin/com/netflix/graphql/dgs/client/WebClientGraphQLClient.kt

@@ -17,7 +17,6 @@
 package com.netflix.graphql.dgs.client
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.netflix.graphql.dgs.client.WebClientGraphQLClient.RequestBodyUriCustomizer
 import org.intellij.lang.annotations.Language
 import org.springframework.http.HttpHeaders
 import org.springframework.http.ResponseEntity

graphql-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/CustomGraphQLClientTest.kt

@@ -34,6 +34,7 @@ import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpMethod
 import org.springframework.web.client.RestTemplate
+import org.springframework.web.client.exchange
 
 @SpringBootTest(
     classes = [WebClientGraphQLClientTest.TestApp::class],
@@ -53,9 +54,9 @@ class CustomGraphQLClientTest {
         client =
             GraphQLClient.createCustom("http://localhost:$port/graphql") { url, headers, body ->
                 val httpHeaders = HttpHeaders()
-                headers.forEach { key, values -> httpHeaders.addAll(key, values) }
+                headers.forEach { (key, values) -> httpHeaders.addAll(key, values) }
 
-                val exchange = restTemplate.exchange(url, HttpMethod.POST, HttpEntity(body, httpHeaders), String::class.java)
+                val exchange = restTemplate.exchange<String>(url, HttpMethod.POST, HttpEntity(body, httpHeaders))
                 HttpResponse(exchange.statusCode.value(), exchange.body)
             }
     }

graphql-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/CustomReactiveGraphQLClientTest.kt

@@ -50,7 +50,7 @@ class CustomReactiveGraphQLClientTest {
         client =
             MonoGraphQLClient.createCustomReactive("http://localhost:$port/graphql") { url, headers, body ->
                 val httpHeaders = HttpHeaders()
-                headers.forEach { key, values -> httpHeaders.addAll(key, values) }
+                headers.forEach { (key, values) -> httpHeaders.addAll(key, values) }
 
                 WebClient
                     .create(url)

graphql-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/ErrorsTest.kt

@@ -28,6 +28,7 @@ import org.springframework.test.web.client.match.MockRestRequestMatchers.method
 import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
 import org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess
 import org.springframework.web.client.RestTemplate
+import org.springframework.web.client.exchange
 
 class ErrorsTest {
     private val restTemplate = RestTemplate()
@@ -36,9 +37,9 @@ class ErrorsTest {
     private val requestExecutor =
         RequestExecutor { url, headers, body ->
             val httpHeaders = HttpHeaders()
-            headers.forEach { key, values -> httpHeaders.addAll(key, values) }
+            headers.forEach { (key, values) -> httpHeaders.addAll(key, values) }
 
-            val exchange = restTemplate.exchange(url, HttpMethod.POST, HttpEntity(body, httpHeaders), String::class.java)
+            val exchange = restTemplate.exchange<String>(url, HttpMethod.POST, HttpEntity(body, httpHeaders))
             HttpResponse(statusCode = exchange.statusCode.value(), body = exchange.body)
         }
 

graphql-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/GraphQLResponseTest.kt

@@ -34,6 +34,7 @@ import org.springframework.test.web.client.match.MockRestRequestMatchers.method
 import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
 import org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess
 import org.springframework.web.client.RestTemplate
+import org.springframework.web.client.exchange
 import java.time.OffsetDateTime
 
 class GraphQLResponseTest {
@@ -43,9 +44,9 @@ class GraphQLResponseTest {
     private val requestExecutor =
         RequestExecutor { url, headers, body ->
             val httpHeaders = HttpHeaders()
-            headers.forEach { key, values -> httpHeaders.addAll(key, values) }
+            headers.forEach { (key, values) -> httpHeaders.addAll(key, values) }
 
-            val response = restTemplate.exchange(url, HttpMethod.POST, HttpEntity(body, httpHeaders), String::class.java)
+            val response = restTemplate.exchange<String>(url, HttpMethod.POST, HttpEntity(body, httpHeaders))
             HttpResponse(statusCode = response.statusCode.value(), body = response.body, headers = response.headers.toMap())
         }
 

graphql-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/ReactiveWebClientTest.kt

@@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test
 import org.springframework.http.HttpStatus
 import org.springframework.web.reactive.function.client.ClientResponse
 import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.reactive.function.client.toEntity
 import reactor.core.publisher.Mono
 import java.time.Duration
 import java.time.LocalDate
@@ -46,10 +47,10 @@ class ReactiveWebClientTest {
                 }.build()
                 .post()
                 .uri(url)
-                .headers { consumer -> headers.forEach { key, values -> consumer.addAll(key, values) } }
+                .headers { consumer -> headers.forEach { (key, values) -> consumer.addAll(key, values) } }
                 .bodyValue(body)
                 .retrieve()
-                .toEntity(String::class.java)
+                .toEntity<String>()
                 .map { response -> HttpResponse(response.statusCode.value(), response.body) }
         }
 
@@ -65,7 +66,7 @@ class ReactiveWebClientTest {
         val mapper = ObjectMapper().registerModules(JavaTimeModule())
         val responseMono =
             CustomMonoGraphQLClient(url, requestExecutor, mapper).reactiveExecuteQuery(
-                "{ hello(${'$'}input: HelloInput!) }",
+                $$"{ hello($input: HelloInput!) }",
                 mapOf("foo" to LocalDate.now()),
             )
         val graphQLResponse = responseMono.block(Duration.ZERO) ?: fail("Expected non-null response")

graphql-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/WebSocketGraphQLClientTest.kt

@@ -67,9 +67,9 @@ class WebSocketGraphQLClientTest {
     companion object {
         private val VERIFY_TIMEOUT = Duration.ofSeconds(10)
         private val CONNECTION_ACK_MESSAGE = OperationMessage(GQL_CONNECTION_ACK, null, null)
-        private val TEST_DATA_A = mapOf(Pair("a", 1), Pair("b", "hello"), Pair("c", false))
-        private val TEST_DATA_B = mapOf(Pair("a", 2), Pair("b", null), Pair("c", true))
-        private val TEST_DATA_C = mapOf(Pair("a", 3), Pair("b", "world"), Pair("c", false))
+        private val TEST_DATA_A = mapOf("a" to 1, "b" to "hello", "c" to false)
+        private val TEST_DATA_B = mapOf("a" to 2, "b" to null, "c" to true)
+        private val TEST_DATA_C = mapOf("a" to 3, "b" to "world", "c" to false)
     }
 
     lateinit var subscriptionsClient: OperationMessageWebSocketClient