Remove callback methods and use only futures

vert-x3 · Mar 15, 2023 · 6ceb237 · 6ceb237
1 parent 5fa7cad
commit 6ceb237
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 71 deletions.
diff --git a/vertx-config-consul/src/main/java/io/vertx/config/consul/package-info.java b/vertx-config-consul/src/main/java/io/vertx/config/consul/package-info.java
@@ -15,7 +15,7 @@
  *
  */
 
-@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", checkCallbackDeprecation = true)
+@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", useFutures = true)
 package io.vertx.config.consul;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-config-git/src/main/java/io/vertx/config/git/package-info.java b/vertx-config-git/src/main/java/io/vertx/config/git/package-info.java
@@ -14,7 +14,7 @@
  * under the License.
  *
  */
-@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", checkCallbackDeprecation = true)
+@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", useFutures = true)
 package io.vertx.config.git;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-config-git/src/test/java/io/vertx/config/git/GitConfigStoreTest.java b/vertx-config-git/src/test/java/io/vertx/config/git/GitConfigStoreTest.java
@@ -89,7 +89,7 @@ public void tearDown() {
       bare.close();
     }
 
-    vertx.close(v -> done.set(true));
+    vertx.close().onComplete(v -> done.set(true));
 
     await().untilAtomic(done, is(true));
   }

diff --git a/vertx-config-git/src/test/java/io/vertx/config/git/GitConfigStoreWithGithubTest.java b/vertx-config-git/src/test/java/io/vertx/config/git/GitConfigStoreWithGithubTest.java
@@ -80,7 +80,7 @@ public void tearDown() {
       git.close();
     }
 
-    vertx.close(v -> done.set(true));
+    vertx.close().onComplete(v -> done.set(true));
 
     await().untilAtomic(done, is(true));
   }

diff --git a/vertx-config-hocon/src/main/java/io/vertx/config/hocon/package-info.java b/vertx-config-hocon/src/main/java/io/vertx/config/hocon/package-info.java
@@ -15,7 +15,7 @@
  *
  */
 
-@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", checkCallbackDeprecation = true)
+@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", useFutures = true)
 package io.vertx.config.hocon;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-config-kubernetes-configmap/src/main/java/io/vertx/config/kubernetes/package-info.java b/vertx-config-kubernetes-configmap/src/main/java/io/vertx/config/kubernetes/package-info.java
@@ -14,7 +14,7 @@
  * under the License.
  *
  */
-@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", checkCallbackDeprecation = true)
+@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", useFutures = true)
 package io.vertx.config.kubernetes;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-config-redis/src/main/java/io/vertx/config/redis/package-info.java b/vertx-config-redis/src/main/java/io/vertx/config/redis/package-info.java
@@ -15,7 +15,7 @@
  *
  */
 
-@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", checkCallbackDeprecation = true)
+@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", useFutures = true)
 package io.vertx.config.redis;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-config-spring-config-server/src/main/java/io/vertx/config/spring/package-info.java b/vertx-config-spring-config-server/src/main/java/io/vertx/config/spring/package-info.java
@@ -15,7 +15,7 @@
  *
  */
 
-@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", checkCallbackDeprecation = true)
+@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", useFutures = true)
 package io.vertx.config.spring;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-config-vault/src/main/java/io/vertx/config/vault/package-info.java b/vertx-config-vault/src/main/java/io/vertx/config/vault/package-info.java
@@ -14,7 +14,7 @@
  * under the License.
  *
  */
-@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", checkCallbackDeprecation = true)
+@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", useFutures = true)
 package io.vertx.config.vault;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-config-vault/src/test/java/io/vertx/config/vault/client/VaultClientTest.java b/vertx-config-vault/src/test/java/io/vertx/config/vault/client/VaultClientTest.java
@@ -60,7 +60,7 @@ public void setup() {
 
   @After
   public void tearDown(TestContext tc) {
-    vertx.close(tc.asyncAssertSuccess());
+    vertx.close().onComplete(tc.asyncAssertSuccess());
   }
 
   /**

diff --git a/...x-config-vault/src/test/java/io/vertx/config/vault/client/VaultClientWithAppRoleTest.java b/...x-config-vault/src/test/java/io/vertx/config/vault/client/VaultClientWithAppRoleTest.java
@@ -72,7 +72,7 @@ public void setup() {
 
   @After
   public void tearDown(TestContext tc) {
-    vertx.close(tc.asyncAssertSuccess());
+    vertx.close().onComplete(tc.asyncAssertSuccess());
   }
 
   /**

diff --git a/vertx-config-vault/src/test/java/io/vertx/config/vault/client/VaultClientWithCertTest.java b/vertx-config-vault/src/test/java/io/vertx/config/vault/client/VaultClientWithCertTest.java
@@ -92,7 +92,7 @@ public void setup() {
 
   @After
   public void tearDown(TestContext tc) {
-    vertx.close(tc.asyncAssertSuccess());
+    vertx.close().onComplete(tc.asyncAssertSuccess());
   }
 
   /**

diff --git a/...-config-vault/src/test/java/io/vertx/config/vault/client/VaultClientWithUsernameTest.java b/...-config-vault/src/test/java/io/vertx/config/vault/client/VaultClientWithUsernameTest.java
@@ -58,7 +58,7 @@ public void setup() {
 
   @After
   public void tearDown(TestContext tc) {
-    vertx.close(tc.asyncAssertSuccess());
+    vertx.close().onComplete(tc.asyncAssertSuccess());
   }
 
   /**

diff --git a/vertx-config-yaml/src/main/java/io/vertx/config/yaml/package-info.java b/vertx-config-yaml/src/main/java/io/vertx/config/yaml/package-info.java
@@ -14,7 +14,7 @@
  * under the License.
  *
  */
-@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", checkCallbackDeprecation = true)
+@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", useFutures = true)
 package io.vertx.config.yaml;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-config-zookeeper/src/main/java/io/vertx/config/zookeeper/package-info.java b/vertx-config-zookeeper/src/main/java/io/vertx/config/zookeeper/package-info.java
@@ -14,7 +14,7 @@
  * under the License.
  *
  */
-@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", checkCallbackDeprecation = true)
+@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", useFutures = true)
 package io.vertx.config.zookeeper;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-config-zookeeper/src/test/java/io/vertx/config/zookeeper/ZookeeperConfigStoreTest.java b/vertx-config-zookeeper/src/test/java/io/vertx/config/zookeeper/ZookeeperConfigStoreTest.java
@@ -69,7 +69,7 @@ public void setUp(TestContext tc) throws Exception {
   public void tearDown(TestContext tc) throws IOException {
     retriever.close();
     client.close();
-    vertx.close(tc.asyncAssertSuccess());
+    vertx.close().onComplete(tc.asyncAssertSuccess());
     server.close();
   }
 

diff --git a/vertx-config/src/main/java/io/vertx/config/ConfigRetriever.java b/vertx-config/src/main/java/io/vertx/config/ConfigRetriever.java
@@ -69,15 +69,8 @@ static ConfigRetriever create(Vertx vertx) {
    * Reads the configuration from the different {@link ConfigStore}
    * and computes the final configuration.
    *
-   * @param completionHandler handler receiving the computed configuration, or a failure if the
+   * @return a future notified the computed configuration, or a failure if the
    *                          configuration cannot be retrieved
-   * @deprecated use {@link #getConfig()} instead
-   */
-  @Deprecated
-  void getConfig(Handler<AsyncResult<JsonObject>> completionHandler);
-
-  /**
-   * Like {@link #getConfig(Handler)} but returns a {@code Future} of the asynchronous result
    */
   Future<JsonObject> getConfig();
 

diff --git a/vertx-config/src/main/java/io/vertx/config/impl/ConfigRetrieverImpl.java b/vertx-config/src/main/java/io/vertx/config/impl/ConfigRetrieverImpl.java
@@ -169,12 +169,6 @@ public synchronized void initializePeriodicScan() {
     }
   }
 
-  @Override
-  public void getConfig(Handler<AsyncResult<JsonObject>> completionHandler) {
-    Objects.requireNonNull(completionHandler);
-    getConfig().onComplete(completionHandler);
-  }
-
   @Override
   public Future<JsonObject> getConfig() {
     return compute().onSuccess(result -> {

diff --git a/vertx-config/src/main/java/io/vertx/config/package-info.java b/vertx-config/src/main/java/io/vertx/config/package-info.java
@@ -15,7 +15,7 @@
  *
  */
 
-@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", checkCallbackDeprecation = true)
+@ModuleGen(name = "vertx-config", groupPackage = "io.vertx", useFutures = true)
 package io.vertx.config;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-config/src/main/java/io/vertx/config/spi/ConfigProcessor.java b/vertx-config/src/main/java/io/vertx/config/spi/ConfigProcessor.java
@@ -38,29 +38,13 @@ public interface ConfigProcessor {
 
   /**
    * Transforms the given {@code input} into a {@link JsonObject}. This is an asynchronous non-blocking
-   * transformation. The result is passed to the given {@code Handler}. If the transformation fails, the passed
+   * transformation. If the transformation fails, the passed
    * {@link AsyncResult} would be marked as failed. On success, the result contains the {@link JsonObject}.
    *
    * @param vertx         the Vert.x instance
    * @param configuration the processor configuration, may be {@code null}
    * @param input         the input, must not be {@code null}
-   * @param handler       the result handler, must not be {@code null}. The handler will be called in the same context as
-   *                      the caller.
-   * @deprecated implement {@link #process(Vertx, JsonObject, Buffer)} instead
-   */
-  @Deprecated
-  default void process(Vertx vertx, JsonObject configuration, Buffer input, Handler<AsyncResult<JsonObject>> handler) {
-    vertx.runOnContext(v -> handler.handle(Future.failedFuture("Deprecated")));
-  }
-
-  /**
-   * Transforms the given {@code input} into a {@link JsonObject}.
-   * <p>
-   * This is an asynchronous non-blocking transformation.
-   *
-   * @param vertx         the Vert.x instance
-   * @param configuration the processor configuration, may be {@code null}
-   * @param input         the input, must not be {@code null}
+   * @return a future notified  with the result
    */
   Future<JsonObject> process(Vertx vertx, JsonObject configuration, Buffer input);
 }
diff --git a/vertx-config/src/main/java/io/vertx/config/spi/ConfigStore.java b/vertx-config/src/main/java/io/vertx/config/spi/ConfigStore.java
@@ -29,28 +29,6 @@
  */
 public interface ConfigStore {
 
-  /**
-   * Closes the configuration store.
-   *
-   * @param completionHandler handler called when the cleanup has been completed
-   * @deprecated implement {@link #close()} instead
-   */
-  @Deprecated
-  default void close(Handler<Void> completionHandler) {
-    completionHandler.handle(null);
-  }
-
-  /**
-   * Retrieves the configuration store in this store.
-   *
-   * @param completionHandler the handler to pass the configuration
-   * @deprecated implement {@link #get()} instead
-   */
-  @Deprecated
-  default void get(Handler<AsyncResult<Buffer>> completionHandler) {
-    completionHandler.handle(Future.failedFuture("Deprecated"));
-  }
-
   /**
    * Retrieves the configuration store in this store.
    *