Upgrade Spring Boot version to 3.5.4 / Graphql Java version 24.1

Author: igdianov

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

@@ -28,7 +28,7 @@ public class GraphQLJpaQueryGraphQlExecutionAutoConfiguration {
     BatchLoaderRegistry batchLoaderRegistry(ListableBeanFactory beanFactory) {
         var batchLoaderRegistry = new GraphQlAutoConfiguration(beanFactory).batchLoaderRegistry();
 
-        DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
+        DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();
 
         batchLoaderRegistry
             .forName(GraphQLJpaQueryGraphQlExecutionAutoConfiguration.class.getName())
@@ -54,7 +54,7 @@ ExecutionGraphQlService executionGraphQlService(
     @Bean
     InitializingBean batchLoaderRegistryConfigurer(BatchLoaderRegistry batchLoaderRegistry) {
         return () -> {
-            DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
+            DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();
 
             getMappedBatchDataLoaderMap()
                 .forEach((name, mappedBatchLoader) ->

dependencies/pom.xml

@@ -14,8 +14,8 @@
   </description>
 
   <properties>
-    <spring-boot.version>3.3.2</spring-boot.version>
-    <graphql-java.version>22.1</graphql-java.version>
+    <spring-boot.version>3.5.4</spring-boot.version>
+    <graphql-java.version>24.1</graphql-java.version>
     <evo-inflector.version>1.3</evo-inflector.version>
     <joda-time.version>2.12.7</joda-time.version>
     <graphql-java-extended-scalars.version>22.0</graphql-java-extended-scalars.version>

scalars/pom.xml

@@ -33,6 +33,11 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+
   </dependencies>
 
 </project>

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

@@ -45,10 +45,13 @@ public class GraphQLJpaExecutorContextFactory implements GraphQLExecutorContextF
     private Supplier<Instrumentation> instrumentation = () -> new SimpleInstrumentation();
     private Supplier<GraphQLContext> graphqlContext = () -> GraphQLContext.newContext().build();
 
-    private Supplier<DataLoaderOptions> dataLoaderOptions = () -> DataLoaderOptions.newOptions();
+    private Supplier<DataLoaderOptions> dataLoaderOptions = () -> DataLoaderOptions.newOptions().build();
 
     private Supplier<DataLoaderRegistry> dataLoaderRegistry = () -> {
-        DataLoaderOptions options = dataLoaderOptions.get().setCachingEnabled(false);
+        DataLoaderOptions options = DataLoaderOptions
+            .newOptions(dataLoaderOptions.get())
+            .setCachingEnabled(false)
+            .build();
 
         return BatchLoaderRegistry.newDataLoaderRegistry(options);
     };

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

@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Optional;
 import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderFactory;
 import org.dataloader.DataLoaderOptions;
 import org.dataloader.DataLoaderRegistry;
 import org.dataloader.MappedBatchLoaderWithContext;
@@ -84,9 +85,9 @@ protected DataLoader<Object, List<Object>> getDataLoader(
                     queryFactory
                 );
 
-                DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
+                DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();
 
-                DataLoader<Object, List<Object>> dataLoader = DataLoader.newMappedDataLoader(
+                DataLoader<Object, List<Object>> dataLoader = DataLoaderFactory.newMappedDataLoader(
                     mappedBatchLoader,
                     options
                 );

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

@@ -26,6 +26,7 @@
 import jakarta.persistence.metamodel.SingularAttribute;
 import java.util.Optional;
 import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderFactory;
 import org.dataloader.DataLoaderOptions;
 import org.dataloader.DataLoaderRegistry;
 import org.dataloader.MappedBatchLoaderWithContext;
@@ -81,9 +82,12 @@ protected DataLoader<Object, Object> getDataLoader(DataFetchingEnvironment envir
                     queryFactory
                 );
 
-                DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false);
+                DataLoaderOptions options = DataLoaderOptions.newOptions().setCachingEnabled(false).build();
 
-                DataLoader<Object, Object> dataLoader = DataLoader.newMappedDataLoader(mappedBatchLoader, options);
+                DataLoader<Object, Object> dataLoader = DataLoaderFactory.newMappedDataLoader(
+                    mappedBatchLoader,
+                    options
+                );
                 dataLoaderRegistry.register(dataLoaderKey, dataLoader);
             }
         }