Merge pull request #107 from phocassoftware/update-graphql

update graphql to latest

Author: itstheceo

graphql-builder/pom.xml

@@ -28,7 +28,7 @@
 		<junit.jupiter.version>5.12.2</junit.jupiter.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jackson.version>2.19.0</jackson.version>
-		<graphql.version>22.3</graphql.version>
+		<graphql.version>24.0</graphql.version>
 	</properties>
 
 	<licenses>

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

@@ -87,7 +87,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(8, dir.size());
+		assertEquals(10, 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-database-manager-core/src/main/java/com/phocassoftware/graphql/database/manager/Database.java

@@ -33,6 +33,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderFactory;
 import org.dataloader.DataLoaderOptions;
 
 @SuppressWarnings("unchecked")
@@ -59,32 +60,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
 

renovate.json

@@ -20,12 +20,6 @@
       "autoApprove": true,
       "automerge": true,
       "groupName": "minor versions"
-    },
-    {
-      "allowedVersions": "/^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$/",
-      "matchPackageNames": [
-        "/^(com.graphql-java:).*/"
-       ]
     }
   ]
 }