Downgrade graphql-java to 22

Author: josie-atkins

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

@@ -17,6 +17,7 @@
 import com.phocassoftware.graphql.database.manager.util.BackupItem;
 import com.phocassoftware.graphql.database.manager.util.HistoryBackupItem;
 import com.phocassoftware.graphql.database.manager.util.TableCoreUtil;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -32,8 +33,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.dataloader.DataLoader;
-import org.dataloader.DataLoaderFactory;
 import org.dataloader.DataLoaderOptions;
 
 @SuppressWarnings("unchecked")
@@ -60,29 +61,32 @@ public class Database {
 		this.submitted = new AtomicInteger();
 
 		items = new TableDataLoader<>(
-			DataLoaderFactory
-				.newDataLoader(
-					driver::get,
-					DataLoaderOptions.newOptions().setMaxBatchSize(driver.maxBatchSize()).build()
-				),
+			new DataLoader<DatabaseKey<Table>, Table>(
+				keys -> {
+					return driver.get(keys);
+				},
+				DataLoaderOptions.newOptions().setMaxBatchSize(driver.maxBatchSize())
+			),
 			this::handleFuture
 		); // will auto call global
 
 		queries = new TableDataLoader<>(
-			DataLoaderFactory
-				.newDataLoader(
-					keys -> merge(keys.stream().map(driver::query)),
-					DataLoaderOptions.newOptions().setBatchingEnabled(false).build()
-				),
+			new DataLoader<DatabaseQueryKey<Table>, List<Table>>(
+				keys -> {
+					return merge(keys.stream().map(driver::query));
+				},
+				DataLoaderOptions.newOptions().setBatchingEnabled(false)
+			),
 			this::handleFuture
 		); // will auto call global
 
 		queryHistories = new TableDataLoader<>(
-			DataLoaderFactory
-				.newDataLoader(
-					keys -> merge(keys.stream().map(driver::queryHistory)),
-					DataLoaderOptions.newOptions().setBatchingEnabled(false).build()
-				),
+			new DataLoader<DatabaseQueryHistoryKey<Table>, List<Table>>(
+				keys -> {
+					return merge(keys.stream().map(driver::queryHistory));
+				},
+				DataLoaderOptions.newOptions().setBatchingEnabled(false)
+			),
 			this::handleFuture
 		); // will auto call global
 
@@ -254,8 +258,7 @@ public CompletableFuture<Boolean> destroyOrganisation(final String organisationI
 	 *
 	 * @param <T>    database entity type to update
 	 * @param entity revision must match database or request will fail
-	 * @return updated entity with the revision incremented by one
-	 *         CompletableFuture will fail with a RevisionMismatchException
+	 * @return updated entity with the revision incremented by one CompletableFuture will fail with a RevisionMismatchException
 	 */
 	public <T extends Table> CompletableFuture<T> put(T entity) {
 		return put(entity, true);
@@ -265,8 +268,7 @@ public <T extends Table> CompletableFuture<T> put(T entity) {
 	 * @param <T>    database entity type to update
 	 * @param entity revision must match database or request will fail
 	 * @param check  Will only pass if the entity revision matches what is currently in the database
-	 * @return updated entity with the revision incremented by one
-	 *         CompletableFuture will fail with a RevisionMismatchException
+	 * @return updated entity with the revision incremented by one CompletableFuture will fail with a RevisionMismatchException
 	 */
 	public <T extends Table> CompletableFuture<T> put(T entity, boolean check) {
 		return putAllow