Merge pull request #2204 from Netflix/feature/reload-data-loader

Fix: Properly construct a dgsDataLoaderReloadController

Author: paulbakker

graphql-dgs-spring-graphql/src/main/kotlin/com/netflix/graphql/dgs/springgraphql/autoconfig/DgsSpringGraphQLAutoConfiguration.kt

@@ -257,12 +257,11 @@ open class DgsSpringGraphQLAutoConfiguration(
         /**
          * Creates a [ReloadableDgsDataLoaderProvider] that wraps the standard [DgsDataLoaderProvider].
          *
-         * This provider supports dynamic reloading of data loaders based on the [DgsReloadDataLoadersIndicator].
+         * This provider supports dynamic reloading of data loaders based on the [DgsDataLoaderReloadController].
          * It maintains the same interface as the standard provider but adds reload capabilities.
          *
          * The `@Primary` annotation ensures this bean takes precedence over the standard `DgsDataLoaderProvider`
          * when reload functionality is enabled.
-         *
          */
         @Bean
         @Primary
@@ -272,7 +271,7 @@ open class DgsSpringGraphQLAutoConfiguration(
             @Qualifier("dgsScheduledExecutorService") dgsScheduledExecutorService: ScheduledExecutorService,
             extensionProviders: List<DataLoaderInstrumentationExtensionProvider>,
             customizers: List<DgsDataLoaderCustomizer>,
-        ): DgsDataLoaderProvider {
+        ): ReloadableDgsDataLoaderProvider {
             LOG.info("Creating reloadable data loader provider with reload support enabled")
             return ReloadableDgsDataLoaderProvider(
                 applicationContext = applicationContext,

graphql-dgs-spring-graphql/src/test/kotlin/com/netflix/graphql/dgs/springgraphql/autoconfig/DgsSpringGraphQlAutoConfigurationTest.kt

@@ -16,9 +16,13 @@
 
 package com.netflix.graphql.dgs.springgraphql.autoconfig
 
+import com.netflix.graphql.dgs.DgsDataLoaderReloadController
 import com.netflix.graphql.dgs.DgsQueryExecutor
 import com.netflix.graphql.dgs.autoconfig.DgsConfigurationProperties
+import com.netflix.graphql.dgs.internal.DefaultDgsDataLoaderProvider
+import com.netflix.graphql.dgs.internal.DgsDataLoaderProvider
 import com.netflix.graphql.dgs.internal.DgsSchemaProvider
+import com.netflix.graphql.dgs.internal.ReloadableDgsDataLoaderProvider
 import com.netflix.graphql.dgs.mvc.internal.method.HandlerMethodArgumentResolverAdapter
 import com.netflix.graphql.dgs.reactive.DgsReactiveQueryExecutor
 import com.netflix.graphql.dgs.reactive.internal.DefaultDgsReactiveGraphQLContextBuilder
@@ -179,6 +183,44 @@ class DgsSpringGraphQlAutoConfigurationTest {
             }
     }
 
+    @Test
+    fun supportsReloadableDataLoaders() {
+        // when dgs reload is disabled
+        ApplicationContextRunner()
+            .withConfiguration(autoConfigurations)
+            .withPropertyValues("dgs.reload=false")
+            .run { context ->
+                assertThat(context)
+                    .doesNotHaveBean(DgsSpringGraphQLAutoConfiguration.DgsDataLoaderReloadAutoConfiguration::class.java)
+                assertThat(context)
+                    .doesNotHaveBean(ReloadableDgsDataLoaderProvider::class.java)
+                assertThat(context)
+                    .doesNotHaveBean(DgsDataLoaderReloadController::class.java)
+                assertThat(context)
+                    .getBean(DgsDataLoaderProvider::class.java)
+                    .describedAs { "The primary DgsDataLoaderProvider " }
+                    .isNotNull
+                    .isInstanceOf(DefaultDgsDataLoaderProvider::class.java)
+            }
+        // when dgs reload is enabled
+        ApplicationContextRunner()
+            .withConfiguration(autoConfigurations)
+            .withPropertyValues("dgs.reload=true")
+            .run { context ->
+                assertThat(context)
+                    .hasSingleBean(DgsSpringGraphQLAutoConfiguration.DgsDataLoaderReloadAutoConfiguration::class.java)
+                assertThat(context)
+                    .hasSingleBean(ReloadableDgsDataLoaderProvider::class.java)
+                assertThat(context)
+                    .hasSingleBean(DgsDataLoaderReloadController::class.java)
+                assertThat(context)
+                    .getBean(DgsDataLoaderProvider::class.java)
+                    .describedAs { "The primary DgsDataLoaderProvider " }
+                    .isNotNull
+                    .isInstanceOf(ReloadableDgsDataLoaderProvider::class.java)
+            }
+    }
+
     @Test
     fun introspectionDefaultPropertyTest() {
         ApplicationContextRunner()