Remove usage of Handler/AsyncResult idiom.

vert-x3 · Sep 12, 2024 · 3928ac8 · 3928ac8
1 parent e31ec56
commit 3928ac8
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 100 deletions.
diff --git a/vertx-infinispan/src/test/java/io/vertx/core/InfinispanComplexHATest.java b/vertx-infinispan/src/test/java/io/vertx/core/InfinispanComplexHATest.java
@@ -41,19 +41,14 @@ public void setUp() throws Exception {
   }
 
   @Override
-  protected void clusteredVertx(VertxOptions options, ClusterManager clusterManager, Handler<AsyncResult<Vertx>> handler) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Promise<Vertx> promise = Promise.promise();
-    promise.future().onComplete(ar -> {
-      handler.handle(ar);
-      latch.countDown();
-    });
-    super.clusteredVertx(options, clusterManager, promise);
+  protected Future<Vertx> clusteredVertx(VertxOptions options, ClusterManager clusterManager) {
+    Future<Vertx> ret = super.clusteredVertx(options, clusterManager);
     try {
-      assertTrue(latch.await(2, TimeUnit.MINUTES));
-    } catch (InterruptedException e) {
+      ret.await(2, TimeUnit.MINUTES);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
+    return ret;
   }
 
   @Override

diff --git a/vertx-infinispan/src/test/java/io/vertx/core/InfinispanHATest.java b/vertx-infinispan/src/test/java/io/vertx/core/InfinispanHATest.java
@@ -45,19 +45,14 @@ public void setUp() throws Exception {
   }
 
   @Override
-  protected void clusteredVertx(VertxOptions options, ClusterManager clusterManager, Handler<AsyncResult<Vertx>> handler) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Promise<Vertx> promise = Promise.promise();
-    promise.future().onComplete(ar -> {
-      handler.handle(ar);
-      latch.countDown();
-    });
-    super.clusteredVertx(options, clusterManager, promise);
+  protected Future<Vertx> clusteredVertx(VertxOptions options, ClusterManager clusterManager) {
+    Future<Vertx> ret = super.clusteredVertx(options, clusterManager);
     try {
-      assertTrue(latch.await(2, TimeUnit.MINUTES));
-    } catch (InterruptedException e) {
+      ret.await(2, TimeUnit.MINUTES);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
+    return ret;
   }
 
   @Override

diff --git a/vertx-infinispan/src/test/java/io/vertx/core/eventbus/InfinispanClusteredEventBusTest.java b/vertx-infinispan/src/test/java/io/vertx/core/eventbus/InfinispanClusteredEventBusTest.java
@@ -46,19 +46,14 @@ public void setUp() throws Exception {
   }
 
   @Override
-  protected void clusteredVertx(VertxOptions options, ClusterManager clusterManager, Handler<AsyncResult<Vertx>> handler) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Promise<Vertx> promise = Promise.promise();
-    promise.future().onComplete(ar -> {
-      handler.handle(ar);
-      latch.countDown();
-    });
-    super.clusteredVertx(options, clusterManager, promise);
+  protected Future<Vertx> clusteredVertx(VertxOptions options, ClusterManager clusterManager) {
+    Future<Vertx> ret = super.clusteredVertx(options, clusterManager);
     try {
-      assertTrue(latch.await(2, TimeUnit.MINUTES));
-    } catch (InterruptedException e) {
+      ret.await(2, TimeUnit.MINUTES);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
+    return ret;
   }
 
   @Override

diff --git a/vertx-infinispan/src/test/java/io/vertx/core/eventbus/InfinispanFaultToleranceTest.java b/vertx-infinispan/src/test/java/io/vertx/core/eventbus/InfinispanFaultToleranceTest.java
@@ -42,19 +42,14 @@ public void setUp() throws Exception {
   }
 
   @Override
-  protected void clusteredVertx(VertxOptions options, ClusterManager clusterManager, Handler<AsyncResult<Vertx>> handler) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Promise<Vertx> promise = Promise.promise();
-    promise.future().onComplete(ar -> {
-      handler.handle(ar);
-      latch.countDown();
-    });
-    super.clusteredVertx(options, clusterManager, promise);
+  protected Future<Vertx> clusteredVertx(VertxOptions options, ClusterManager clusterManager) {
+    Future<Vertx> ret = super.clusteredVertx(options, clusterManager);
     try {
-      assertTrue(latch.await(2, TimeUnit.MINUTES));
-    } catch (InterruptedException e) {
+      ret.await(2, TimeUnit.MINUTES);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
+    return ret;
   }
 
   @Override

diff --git a/vertx-infinispan/src/test/java/io/vertx/core/eventbus/InfinispanNodeInfoTest.java b/vertx-infinispan/src/test/java/io/vertx/core/eventbus/InfinispanNodeInfoTest.java
@@ -46,19 +46,14 @@ public void setUp() throws Exception {
   }
 
   @Override
-  protected void clusteredVertx(VertxOptions options, ClusterManager clusterManager, Handler<AsyncResult<Vertx>> handler) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Promise<Vertx> promise = Promise.promise();
-    promise.future().onComplete(ar -> {
-      handler.handle(ar);
-      latch.countDown();
-    });
-    super.clusteredVertx(options, clusterManager, promise);
+  protected Future<Vertx> clusteredVertx(VertxOptions options, ClusterManager clusterManager) {
+    Future<Vertx> ret = super.clusteredVertx(options, clusterManager);
     try {
-      assertTrue(latch.await(2, TimeUnit.MINUTES));
-    } catch (InterruptedException e) {
+      ret.await(2, TimeUnit.MINUTES);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
+    return ret;
   }
 
   @Override

diff --git a/vertx-infinispan/src/test/java/io/vertx/core/shareddata/InfinispanClusteredAsyncMapTest.java b/vertx-infinispan/src/test/java/io/vertx/core/shareddata/InfinispanClusteredAsyncMapTest.java
@@ -58,19 +58,14 @@ public void setUp() throws Exception {
   }
 
   @Override
-  protected void clusteredVertx(VertxOptions options, ClusterManager clusterManager, Handler<AsyncResult<Vertx>> handler) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Promise<Vertx> promise = Promise.promise();
-    promise.future().onComplete(ar -> {
-      handler.handle(ar);
-      latch.countDown();
-    });
-    super.clusteredVertx(options, clusterManager, promise);
+  protected Future<Vertx> clusteredVertx(VertxOptions options, ClusterManager clusterManager) {
+    Future<Vertx> ret = super.clusteredVertx(options, clusterManager);
     try {
-      assertTrue(latch.await(2, TimeUnit.MINUTES));
-    } catch (InterruptedException e) {
+      ret.await(2, TimeUnit.MINUTES);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
+    return ret;
   }
 
   @Override

diff --git a/...ispan/src/test/java/io/vertx/core/shareddata/InfinispanClusteredAsynchronousLockTest.java b/...ispan/src/test/java/io/vertx/core/shareddata/InfinispanClusteredAsynchronousLockTest.java
@@ -47,19 +47,14 @@ public void setUp() throws Exception {
   }
 
   @Override
-  protected void clusteredVertx(VertxOptions options, ClusterManager clusterManager, Handler<AsyncResult<Vertx>> handler) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Promise<Vertx> promise = Promise.promise();
-    promise.future().onComplete(ar -> {
-      handler.handle(ar);
-      latch.countDown();
-    });
-    super.clusteredVertx(options, clusterManager, promise);
+  protected Future<Vertx> clusteredVertx(VertxOptions options, ClusterManager clusterManager) {
+    Future<Vertx> ret = super.clusteredVertx(options, clusterManager);
     try {
-      assertTrue(latch.await(2, TimeUnit.MINUTES));
-    } catch (InterruptedException e) {
+      ret.await(2, TimeUnit.MINUTES);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
+    return ret;
   }
 
   @Override

diff --git a/...finispan/src/test/java/io/vertx/core/shareddata/InfinispanClusteredSharedCounterTest.java b/...finispan/src/test/java/io/vertx/core/shareddata/InfinispanClusteredSharedCounterTest.java
@@ -46,19 +46,14 @@ public void setUp() throws Exception {
   }
 
   @Override
-  protected void clusteredVertx(VertxOptions options, ClusterManager clusterManager, Handler<AsyncResult<Vertx>> handler) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Promise<Vertx> promise = Promise.promise();
-    promise.future().onComplete(ar -> {
-      handler.handle(ar);
-      latch.countDown();
-    });
-    super.clusteredVertx(options, clusterManager, promise);
+  protected Future<Vertx> clusteredVertx(VertxOptions options, ClusterManager clusterManager) {
+    Future<Vertx> ret = super.clusteredVertx(options, clusterManager);
     try {
-      assertTrue(latch.await(2, TimeUnit.MINUTES));
-    } catch (InterruptedException e) {
+      ret.await(2, TimeUnit.MINUTES);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
+    return ret;
   }
 
   @Override

diff --git a/vertx-infinispan/src/test/java/io/vertx/ext/cluster/infinispan/ClusterHealthCheckTest.java b/vertx-infinispan/src/test/java/io/vertx/ext/cluster/infinispan/ClusterHealthCheckTest.java
@@ -47,19 +47,14 @@ public void setUp() throws Exception {
   }
 
   @Override
-  protected void clusteredVertx(VertxOptions options, ClusterManager clusterManager, Handler<AsyncResult<Vertx>> handler) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Promise<Vertx> promise = Promise.promise();
-    promise.future().onComplete(ar -> {
-      handler.handle(ar);
-      latch.countDown();
-    });
-    super.clusteredVertx(options, clusterManager, promise);
+  protected Future<Vertx> clusteredVertx(VertxOptions options, ClusterManager clusterManager) {
+    Future<Vertx> ret = super.clusteredVertx(options, clusterManager);
     try {
-      assertTrue(latch.await(2, TimeUnit.MINUTES));
-    } catch (InterruptedException e) {
+      ret.await(2, TimeUnit.MINUTES);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
+    return ret;
   }
 
   @Override

diff --git a/...finispan/src/test/java/io/vertx/ext/web/sstore/InfinispanClusteredSessionHandlerTest.java b/...finispan/src/test/java/io/vertx/ext/web/sstore/InfinispanClusteredSessionHandlerTest.java
@@ -46,19 +46,14 @@ public void setUp() throws Exception {
   }
 
   @Override
-  protected void clusteredVertx(VertxOptions options, ClusterManager clusterManager, Handler<AsyncResult<Vertx>> handler) {
-    CountDownLatch latch = new CountDownLatch(1);
-    Promise<Vertx> promise = Promise.promise();
-    promise.future().onComplete(ar -> {
-      handler.handle(ar);
-      latch.countDown();
-    });
-    super.clusteredVertx(options, clusterManager, promise);
+  protected Future<Vertx> clusteredVertx(VertxOptions options, ClusterManager clusterManager) {
+    Future<Vertx> ret = super.clusteredVertx(options, clusterManager);
     try {
-      assertTrue(latch.await(2, TimeUnit.MINUTES));
-    } catch (InterruptedException e) {
+      ret.await(2, TimeUnit.MINUTES);
+    } catch (Exception e) {
       fail(e.getMessage());
     }
+    return ret;
   }
 
   @Override