Removed deprecated GraphQL dataloader creation method calls

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>
craig-day · Aug 16, 2021 · 1a6b11e · 1a6b11e
1 parent b142ae2
commit 1a6b11e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/vertx-web-graphql/src/main/java/examples/GraphQLExamples.java b/vertx-web-graphql/src/main/java/examples/GraphQLExamples.java
@@ -31,10 +31,7 @@
 import io.vertx.ext.web.handler.graphql.*;
 import io.vertx.ext.web.handler.graphql.schema.VertxDataFetcher;
 import io.vertx.ext.web.handler.graphql.schema.VertxPropertyDataFetcher;
-import org.dataloader.BatchLoaderEnvironment;
-import org.dataloader.BatchLoaderWithContext;
-import org.dataloader.DataLoader;
-import org.dataloader.DataLoaderRegistry;
+import org.dataloader.*;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -43,6 +40,7 @@
 /**
  * @author Thomas SEGISMONT
  */
+@SuppressWarnings("unused")
 public class GraphQLExamples {
 
   public void handlerSetup(Router router) {
@@ -225,7 +223,7 @@ private CompletionStage<List<Link>> retrieveLinksFromBackend(List<String> ids, B
   public void dataLoaderRegistry(GraphQL graphQL, BatchLoaderWithContext<String, Link> linksBatchLoader) {
     GraphQLHandler handler = GraphQLHandler.create(graphQL).dataLoaderRegistry(rc -> {
 
-      DataLoader<String, Link> linkDataLoader = DataLoader.newDataLoader(linksBatchLoader);
+      DataLoader<String, Link> linkDataLoader = DataLoaderFactory.newDataLoader(linksBatchLoader);
 
       return new DataLoaderRegistry().register("link", linkDataLoader);
 

diff --git a/vertx-web-graphql/src/test/java/io/vertx/ext/web/handler/graphql/VertxBatchLoaderTest.java b/vertx-web-graphql/src/test/java/io/vertx/ext/web/handler/graphql/VertxBatchLoaderTest.java
@@ -27,6 +27,7 @@
 import io.vertx.ext.web.handler.graphql.dataloader.VertxBatchLoader;
 import org.dataloader.BatchLoaderWithContext;
 import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderFactory;
 import org.dataloader.DataLoaderRegistry;
 import org.junit.Test;
 
@@ -58,7 +59,7 @@ public void setUp() throws Exception {
     );
 
     graphQLHandler.dataLoaderRegistry(rc -> {
-      DataLoader<String, User> userDataLoader = DataLoader.newDataLoader(userBatchLoader);
+      DataLoader<String, User> userDataLoader = DataLoaderFactory.newDataLoader(userBatchLoader);
       return new DataLoaderRegistry().register("user", userDataLoader);
     });
   }

diff --git a/...eb-graphql/src/test/java/io/vertx/ext/web/handler/graphql/VertxMappedBatchLoaderTest.java b/...eb-graphql/src/test/java/io/vertx/ext/web/handler/graphql/VertxMappedBatchLoaderTest.java
@@ -26,6 +26,7 @@
 import graphql.schema.idl.TypeDefinitionRegistry;
 import io.vertx.ext.web.handler.graphql.dataloader.VertxMappedBatchLoader;
 import org.dataloader.DataLoader;
+import org.dataloader.DataLoaderFactory;
 import org.dataloader.DataLoaderRegistry;
 import org.dataloader.MappedBatchLoaderWithContext;
 import org.junit.Test;
@@ -59,7 +60,7 @@ public void setUp() throws Exception {
     );
 
     graphQLHandler.dataLoaderRegistry(rc -> {
-      DataLoader<String, User> userDataLoader = DataLoader.newMappedDataLoader(userBatchLoader);
+      DataLoader<String, User> userDataLoader = DataLoaderFactory.newMappedDataLoader(userBatchLoader);
       return new DataLoaderRegistry().register("user", userDataLoader);
     });
   }