Revert "Downgrade to graphql 22"

This reverts commit 8208742.

# Conflicts:
#	graphql-builder/pom.xml

Author: josie-atkins

graphql-builder/pom.xml

@@ -29,7 +29,7 @@
         <junit.jupiter.version>5.13.0</junit.jupiter.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jackson.version>2.19.0</jackson.version>
-        <graphql.version>22.0</graphql.version>
+        <graphql.version>24.1</graphql.version>
     </properties>
 
     <licenses>
@@ -49,12 +49,12 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java-extended-scalars</artifactId>
-            <version>${graphql.version}</version>
+            <version>22.0</version>
         </dependency>
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java-extended-validation</artifactId>
-            <version>${graphql.version}</version>
+            <version>22.0</version>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>

graphql-builder/src/test/java/com/phocassoftware/graphql/builder/DirectiveTest.java

@@ -89,7 +89,7 @@ public void testDirectiveArgumentDefinition() {
 		List<LinkedHashMap<String, Object>> dir = (List<LinkedHashMap<String, Object>>) ((Map<String, Object>) response.get("__schema")).get("directives");
 		LinkedHashMap<String, Object> input = dir.stream().filter(map -> map.get("name").equals("Input")).collect(Collectors.toList()).get(0);
 
-		assertEquals(30, dir.size());
+		assertEquals(32, dir.size());
 		assertEquals("ARGUMENT_DEFINITION", ((List<String>) input.get("locations")).get(0));
 		assertEquals(1, ((List<Object>) input.get("args")).size());
 		// getNickname(nickName: String! @Input(value : "TT")): String!

graphql-builder/src/test/java/com/phocassoftware/graphql/builder/JakartaValidationDirectiveTest.java

@@ -53,7 +53,7 @@ void testJakartaSizeDirectiveArgumentDefinition() {
 		List<LinkedHashMap<String, Object>> dir = (List<LinkedHashMap<String, Object>>) ((Map<String, Object>) response.get("__schema")).get("directives");
 		LinkedHashMap<String, Object> constraint = dir.stream().filter(map -> map.get("name").equals("Size")).collect(Collectors.toList()).get(0);
 
-		assertEquals(30, dir.size());
+		assertEquals(32, dir.size());
 		assertEquals("ARGUMENT_DEFINITION", ((List<String>) constraint.get("locations")).get(0));
 		assertEquals("INPUT_FIELD_DEFINITION", ((List<String>) constraint.get("locations")).get(1));
 		assertEquals(5, ((List<Object>) constraint.get("args")).size());

graphql-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Database.java

@@ -35,6 +35,7 @@
 import java.util.stream.Stream;
 
 import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderFactory;
 import org.dataloader.DataLoaderOptions;
 
 @SuppressWarnings("unchecked")
@@ -61,32 +62,29 @@ public class Database {
 		this.submitted = new AtomicInteger();
 
 		items = new TableDataLoader<>(
-			new DataLoader<DatabaseKey<Table>, Table>(
-				keys -> {
-					return driver.get(keys);
-				},
-				DataLoaderOptions.newOptions().setMaxBatchSize(driver.maxBatchSize())
-			),
+			DataLoaderFactory
+				.newDataLoader(
+					driver::get,
+					DataLoaderOptions.newOptions().setMaxBatchSize(driver.maxBatchSize()).build()
+				),
 			this::handleFuture
 		); // will auto call global
 
 		queries = new TableDataLoader<>(
-			new DataLoader<DatabaseQueryKey<Table>, List<Table>>(
-				keys -> {
-					return merge(keys.stream().map(driver::query));
-				},
-				DataLoaderOptions.newOptions().setBatchingEnabled(false)
-			),
+			DataLoaderFactory
+				.newDataLoader(
+					keys -> merge(keys.stream().map(driver::query)),
+					DataLoaderOptions.newOptions().setBatchingEnabled(false).build()
+				),
 			this::handleFuture
 		); // will auto call global
 
 		queryHistories = new TableDataLoader<>(
-			new DataLoader<DatabaseQueryHistoryKey<Table>, List<Table>>(
-				keys -> {
-					return merge(keys.stream().map(driver::queryHistory));
-				},
-				DataLoaderOptions.newOptions().setBatchingEnabled(false)
-			),
+			DataLoaderFactory
+				.newDataLoader(
+					keys -> merge(keys.stream().map(driver::queryHistory)),
+					DataLoaderOptions.newOptions().setBatchingEnabled(false).build()
+				),
 			this::handleFuture
 		); // will auto call global