chore(deps): bump spring-boot.version from 3.2.2 to 3.2.3

autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLJpaQueryGraphQlExecutionAutoConfiguration.java

@@ -1,6 +1,12 @@
 package com.introproventures.graphql.jpa.query.autoconfigure;
 
+import static com.introproventures.graphql.jpa.query.schema.impl.BatchLoaderRegistry.getMappedBatchDataLoaderMap;
+
 import graphql.GraphQL;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import org.dataloader.DataLoaderOptions;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -11,6 +17,7 @@
 import org.springframework.graphql.ExecutionGraphQlService;
 import org.springframework.graphql.execution.BatchLoaderRegistry;
 import org.springframework.graphql.execution.GraphQlSource;
+import reactor.core.publisher.Mono;
 
 @AutoConfiguration(after = GraphQLJpaQueryGraphQlSourceAutoConfiguration.class)
 @ConditionalOnClass({ GraphQL.class, GraphQlSource.class })
@@ -19,7 +26,18 @@
     @Bean
     @ConditionalOnMissingBean
     BatchLoaderRegistry batchLoaderRegistry(ListableBeanFactory beanFactory) {
-        return new GraphQlAutoConfiguration(beanFactory).batchLoaderRegistry();
+        var batchLoaderRegistry = new GraphQlAutoConfiguration(beanFactory).batchLoaderRegistry();
+
+        DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
+
+        batchLoaderRegistry
+            .forName(GraphQLJpaQueryGraphQlExecutionAutoConfiguration.class.getName())
+            .withOptions(options)
+            .registerMappedBatchLoader((keys, env) ->
+                Mono.fromCompletionStage(CompletableFuture.completedStage(Map.of()))
+            );
+
+        return batchLoaderRegistry;
     }
 
     @Bean
@@ -32,4 +50,21 @@
     ) {
         return new GraphQlAutoConfiguration(beanFactory).executionGraphQlService(graphQlSource, batchLoaderRegistry);
     }
+
+    @Bean
+    InitializingBean batchLoaderRegistryConfigurer(BatchLoaderRegistry batchLoaderRegistry) {
+        return () -> {
+            DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
+
+            getMappedBatchDataLoaderMap()
+                .forEach((name, mappedBatchLoader) ->
+                    batchLoaderRegistry
+                        .forName(name)
+                        .withOptions(options)
+                        .registerMappedBatchLoader((keys, env) ->
+                            Mono.fromCompletionStage(mappedBatchLoader.load(keys, env))
+                        )
+                );
+        };
+    }
 }

autoconfigure/src/test/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLSchemaAutoConfigurationTest.java

@@ -1,5 +1,6 @@
 package com.introproventures.graphql.jpa.query.autoconfigure;
 
+import static graphql.GraphQLContext.newContext;
 import static graphql.annotations.AnnotationsSchemaCreator.newAnnotationsSchema;
 import static graphql.schema.FieldCoordinates.coordinates;
 import static graphql.schema.GraphQLCodeRegistry.newCodeRegistry;
@@ -9,6 +10,7 @@
 import static graphql.schema.idl.RuntimeWiring.newRuntimeWiring;
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.dataloader.DataLoaderRegistry.newRegistry;
 import static org.springframework.transaction.TransactionDefinition.PROPAGATION_REQUIRED;
 
 import com.introproventures.graphql.jpa.query.autoconfigure.support.AdditionalGraphQLType;
@@ -58,6 +60,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.assertj.core.api.InstanceOfAssertFactories;
+import org.dataloader.DataLoaderRegistry;
 import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
 import org.reflections.Reflections;
@@ -69,6 +72,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
+import org.springframework.graphql.execution.BatchLoaderRegistry;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.TransactionDefinition;
@@ -101,6 +105,9 @@ public class GraphQLSchemaAutoConfigurationTest {
     @Autowired
     private GraphQLJpaQueryProperties graphQLJpaQueryProperties;
 
+    @Autowired
+    BatchLoaderRegistry batchLoaderRegistry;
+
     @SpringBootApplication
     @EnableGraphQLJpaQuerySchema(basePackageClasses = TestEntity.class)
     static class Application {
@@ -520,4 +527,12 @@ void configuresSubscriptionTransactionalExecutionStrategyCustomizer() {
                     .isEqualTo(true);
             });
     }
+
+    @Test
+    void batchLoaderRegistry() {
+        DataLoaderRegistry dataLoaderRegistry = newRegistry().build();
+        batchLoaderRegistry.registerDataLoaders(dataLoaderRegistry, newContext().build());
+
+        assertThat(dataLoaderRegistry.getDataLoadersMap()).isNotEmpty().containsKeys("TestEntity.children");
+    }
 }

autoconfigure/src/test/java/com/introproventures/graphql/jpa/query/autoconfigure/support/TestChildEntity.java

@@ -0,0 +1,13 @@
+package com.introproventures.graphql.jpa.query.autoconfigure.support;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import lombok.Data;
+
+@Entity
+@Data
+public class TestChildEntity {
+
+    @Id
+    String id;
+}

autoconfigure/src/test/java/com/introproventures/graphql/jpa/query/autoconfigure/support/TestEntity.java

@@ -2,6 +2,8 @@
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import java.util.Set;
 import lombok.Data;
 
 @Entity
@@ -10,4 +12,7 @@ public class TestEntity {
 
     @Id
     private Long id;
+
+    @OneToMany
+    Set<TestChildEntity> children;
 }

dependencies/pom.xml

@@ -14,7 +14,7 @@
   </description>
 
   <properties>
-    <spring-boot.version>3.2.2</spring-boot.version>
+    <spring-boot.version>3.2.3</spring-boot.version>
     <graphql-java.version>21.4</graphql-java.version>
     <evo-inflector.version>1.3</evo-inflector.version>
     <joda-time.version>2.12.7</joda-time.version>

schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/BatchLoaderRegistry.java

@@ -33,6 +33,15 @@
         mappedToOneBatchLoaders.putIfAbsent(batchLoaderKey, mappedBatchLoader);
     }
 
+    public static Map<String, MappedBatchLoaderWithContext> getMappedBatchDataLoaderMap() {
+        var loaders = new LinkedHashMap<String, MappedBatchLoaderWithContext>();
+
+        loaders.putAll(mappedToManyBatchLoaders);
+        loaders.putAll(mappedToOneBatchLoaders);
+
+        return loaders;
+    }
+
     public static DataLoaderRegistry newDataLoaderRegistry(DataLoaderOptions dataLoaderOptions) {
         DataLoaderRegistry dataLoaderRegistry = new DataLoaderRegistry();
 

tests/boot-starter/src/test/java/com/introproventures/graphql/jpa/query/boot/test/autoconfigure/GraphQLJpaQueryGraphQlSourceAutoConfigurationTest.java

@@ -79,6 +79,6 @@ public void contextIsAutoConfigured() {
         DataLoaderRegistry dataLoaderRegistry = newRegistry().build();
         batchLoaderRegistry.registerDataLoaders(dataLoaderRegistry, newContext().build());
 
-        assertThat(dataLoaderRegistry.getDataLoadersMap()).isEmpty();
+        assertThat(dataLoaderRegistry.getDataLoadersMap()).isNotEmpty().containsKeys("Author.books", "Book.author");
     }
 }