Merge pull request #1995 from Netflix/feature/legacy-module-removal

Remove legacy modules
Netflix · Dec 11, 2024 · 62d589f · 62d589f
2 parents 4e46433 + b29d2e0
commit 62d589f
Show file tree

Hide file tree

Showing 209 changed files with 5,430 additions and 18,894 deletions.
diff --git a/graphql-dgs-client/build.gradle.kts b/graphql-dgs-client/build.gradle.kts
@@ -36,9 +36,7 @@ dependencies {
     testImplementation("org.springframework.boot:spring-boot-starter-webflux")
     testImplementation("com.graphql-java:graphql-java-extended-scalars")
     testImplementation("io.projectreactor:reactor-test")
-    testImplementation(project(":graphql-dgs-subscriptions-graphql-sse-autoconfigure"))
-    testImplementation(project(":graphql-dgs-subscriptions-sse-autoconfigure"))
-    testImplementation(project(":graphql-dgs-subscriptions-websockets-autoconfigure"))
-    testImplementation(project(":graphql-dgs-spring-boot-oss-autoconfigure"))
-    testImplementation(project(":graphql-dgs-spring-webmvc-autoconfigure"))
+
+    testImplementation(project(":graphql-dgs-spring-graphql-starter"))
+    testImplementation(project(":graphql-dgs-spring-graphql-starter-test"))
 }
diff --git a/graphql-dgs-client/dependencies.lock b/graphql-dgs-client/dependencies.lock
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
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
@@ -55,6 +55,7 @@ class GraphqlSSESubscriptionGraphQLClient(
             webClient
                 .post()
                 .uri(url)
+                .contentType(MediaType.APPLICATION_JSON)
                 .bodyValue(jsonPayload)
                 .accept(MediaType.TEXT_EVENT_STREAM)
                 .retrieve()

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
@@ -31,6 +31,11 @@ import java.util.*
  * This client can be used for servers which are following the subscriptions-transport-sse specification, which can be found here:
  * https://github.com/CodeCommission/subscriptions-transport-sse
  */
+@Deprecated(
+    "This client uses the obsolete subscriptions-transport-sse protocol. Use GraphqlSSESubscriptionGraphQLClient to use the newer graphql-sse spec https://github.com/graphql/graphql-over-http/blob/d51ae80d62b5fd8802a3383793f01bdf306e8290/rfcs/GraphQLOverSSE.md.",
+    ReplaceWith("GraphqlSSESubscriptionGraphQLClient"),
+    DeprecationLevel.WARNING,
+)
 class SSESubscriptionGraphQLClient(
     private val url: String,
     private val webClient: WebClient,

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
@@ -40,6 +40,10 @@ import java.util.concurrent.atomic.AtomicReference
  * Reactive client implementation using websockets and the subscription-transport-ws protocol:
  * https://github.com/apollographql/subscriptions-transport-ws/blob/master/PROTOCOL.md
  */
+@Deprecated(
+    "This client is using the deprecated subscription-transport-ws protocol, which is no longer supported by DGS servers. Use Spring GraphQL WebSocketGraphQlClient instead. https://docs.spring.io/spring-graphql/reference/client.html#client.websocketgraphqlclient",
+    level = DeprecationLevel.WARNING,
+)
 class WebSocketGraphQLClient(
     private val client: OperationMessageWebSocketClient,
     private val acknowledgementTimeout: Duration = DEFAULT_ACKNOWLEDGEMENT_TIMEOUT,

diff --git a/graphql-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/CustomGraphQLClientTest.kt b/graphql-dgs-client/src/test/kotlin/com/netflix/graphql/dgs/client/CustomGraphQLClientTest.kt
@@ -19,17 +19,14 @@ package com.netflix.graphql.dgs.client
 import com.netflix.graphql.dgs.DgsComponent
 import com.netflix.graphql.dgs.DgsQuery
 import com.netflix.graphql.dgs.DgsTypeDefinitionRegistry
-import com.netflix.graphql.dgs.autoconfig.DgsAutoConfiguration
-import com.netflix.graphql.dgs.subscriptions.graphql.sse.DgsGraphQLSSEAutoConfig
-import com.netflix.graphql.dgs.webmvc.autoconfigure.DgsWebMvcAutoConfiguration
+import com.netflix.graphql.dgs.test.EnableDgsTest
 import graphql.language.FieldDefinition
 import graphql.language.ObjectTypeDefinition
 import graphql.language.TypeName
 import graphql.schema.idl.TypeDefinitionRegistry
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.server.LocalServerPort
@@ -39,10 +36,10 @@ import org.springframework.http.HttpMethod
 import org.springframework.web.client.RestTemplate
 
 @SpringBootTest(
-    classes = [DgsAutoConfiguration::class, DgsWebMvcAutoConfiguration::class, WebClientGraphQLClientTest.TestApp::class],
+    classes = [WebClientGraphQLClientTest.TestApp::class],
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 )
-@EnableAutoConfiguration(exclude = [DgsGraphQLSSEAutoConfig::class])
+@EnableDgsTest
 class CustomGraphQLClientTest {
     @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
     @LocalServerPort

diff --git a/...-client/src/test/kotlin/com/netflix/graphql/dgs/client/CustomReactiveGraphQLClientTest.kt b/...-client/src/test/kotlin/com/netflix/graphql/dgs/client/CustomReactiveGraphQLClientTest.kt
@@ -19,16 +19,13 @@ package com.netflix.graphql.dgs.client
 import com.netflix.graphql.dgs.DgsComponent
 import com.netflix.graphql.dgs.DgsQuery
 import com.netflix.graphql.dgs.DgsTypeDefinitionRegistry
-import com.netflix.graphql.dgs.autoconfig.DgsAutoConfiguration
-import com.netflix.graphql.dgs.subscriptions.graphql.sse.DgsGraphQLSSEAutoConfig
-import com.netflix.graphql.dgs.webmvc.autoconfigure.DgsWebMvcAutoConfiguration
+import com.netflix.graphql.dgs.test.EnableDgsTest
 import graphql.language.FieldDefinition
 import graphql.language.ObjectTypeDefinition
 import graphql.language.TypeName
 import graphql.schema.idl.TypeDefinitionRegistry
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.server.LocalServerPort
@@ -37,10 +34,10 @@ import org.springframework.web.reactive.function.client.toEntity
 import reactor.test.StepVerifier
 
 @SpringBootTest(
-    classes = [DgsAutoConfiguration::class, DgsWebMvcAutoConfiguration::class, WebClientGraphQLClientTest.TestApp::class],
+    classes = [WebClientGraphQLClientTest.TestApp::class],
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 )
-@EnableAutoConfiguration(exclude = [DgsGraphQLSSEAutoConfig::class])
+@EnableDgsTest
 class CustomReactiveGraphQLClientTest {
     @LocalServerPort
     var port: Int? = null