Remove deprecated code and replace deprecated code usage (#1329)

* Replace deprecated testcontainers code

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

* Remove SQL Client deprecated code

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

---------

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

Author: tsegismont

vertx-db2-client/src/test/java/io/vertx/db2client/junit/DB2Resource.java

@@ -15,6 +15,12 @@
  */
 package io.vertx.db2client.junit;
 
+import io.vertx.core.net.JksOptions;
+import io.vertx.db2client.DB2ConnectOptions;
+import org.junit.rules.ExternalResource;
+import org.testcontainers.containers.Db2Container;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -24,51 +30,44 @@
 import java.time.Duration;
 import java.util.Objects;
 
-import org.junit.rules.ExternalResource;
-import org.testcontainers.containers.Db2Container;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
-
-import io.vertx.core.net.JksOptions;
-import io.vertx.db2client.DB2ConnectOptions;
-
 public class DB2Resource extends ExternalResource {
 
   private static final boolean CUSTOM_DB2 = get("DB2_HOST") != null;
 
-    /**
-     * In order for this container to be reused across test runs you need to add the line:
-     * <code>testcontainers.reuse.enable=true</code> to your <code>~/.testcontainers.properties</code>
-     * file (create it if it does not exist)
-     */
-    public static final DB2Resource SHARED_INSTANCE = new DB2Resource();
+  /**
+   * In order for this container to be reused across test runs you need to add the line:
+   * <code>testcontainers.reuse.enable=true</code> to your <code>~/.testcontainers.properties</code>
+   * file (create it if it does not exist)
+   */
+  public static final DB2Resource SHARED_INSTANCE = new DB2Resource();
 
-    private boolean started = false;
-    private boolean isDb2OnZ = false;
-    private DB2ConnectOptions options;
-    private final Db2Container instance = new Db2Container()
-            .acceptLicense()
-            .withLogConsumer(out -> System.out.print("[DB2] " + out.getUtf8String()))
-            .withUsername("vertx")
-            .withPassword("vertx")
-            .withDatabaseName("vertx")
-            .withExposedPorts(50000, 50001)
-            .withFileSystemBind("src/test/resources/tls/server/", "/certs/")
-            .withFileSystemBind("src/test/resources/tls/db2_tls_setup.sh", "/var/custom/db2_tls_setup.sh")
-            .waitingFor(new LogMessageWaitStrategy()
-                .withRegEx(".*VERTX SSH SETUP DONE.*")
-                .withStartupTimeout(Duration.ofMinutes(10)))
-            .withReuse(true);
+  private boolean started = false;
+  private boolean isDb2OnZ = false;
+  private DB2ConnectOptions options;
+  private final Db2Container instance = new Db2Container("ibmcom/db2:11.5.0.0a")
+    .acceptLicense()
+    .withLogConsumer(out -> System.out.print("[DB2] " + out.getUtf8String()))
+    .withUsername("vertx")
+    .withPassword("vertx")
+    .withDatabaseName("vertx")
+    .withExposedPorts(50000, 50001)
+    .withFileSystemBind("src/test/resources/tls/server/", "/certs/")
+    .withFileSystemBind("src/test/resources/tls/db2_tls_setup.sh", "/var/custom/db2_tls_setup.sh")
+    .waitingFor(new LogMessageWaitStrategy()
+      .withRegEx(".*VERTX SSH SETUP DONE.*")
+      .withStartupTimeout(Duration.ofMinutes(10)))
+    .withReuse(true);
 
-    @Override
-    protected void before() throws Throwable {
-        if (started)
-          return;
+  @Override
+  protected void before() throws Throwable {
+    if (started)
+      return;
 
-      if (!CUSTOM_DB2) {
-        instance.start();
+    if (!CUSTOM_DB2) {
+      instance.start();
           options = new DB2ConnectOptions()
-                  .setHost(instance.getContainerIpAddress())
-                  .setPort(instance.getMappedPort(50000))
+            .setHost(instance.getHost())
+            .setPort(instance.getMappedPort(50000))
                   .setDatabase(instance.getDatabaseName())
                   .setUser(instance.getUsername())
                   .setPassword(instance.getPassword());

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/MSSQLException.java

@@ -46,14 +46,6 @@ public void add(MSSQLException e) {
     additional.add(e);
   }
 
-  /**
-   * @deprecated use {@link #getErrorCode()} instead
-   */
-  @Deprecated
-  public int number() {
-    return getErrorCode();
-  }
-
   public byte state() {
     return state;
   }

vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLQueriesTest.java

@@ -32,7 +32,6 @@
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -137,7 +136,7 @@ public void testQueryNonExisting(TestContext ctx) {
           assertThat(t, is(instanceOf(MSSQLException.class)));
         });
         MSSQLException mssqlException = (MSSQLException) t;
-        ctx.assertEquals(208, mssqlException.number());
+        ctx.assertEquals(208, mssqlException.getErrorCode());
       }));
   }
 

vertx-mssql-client/src/test/java/io/vertx/mssqlclient/junit/MSSQLRule.java

@@ -106,7 +106,7 @@ private MSSQLConnectOptions startMSSQL() throws IOException {
     initDb();
 
     return new MSSQLConnectOptions()
-      .setHost(server.getContainerIpAddress())
+      .setHost(server.getHost())
       .setPort(server.getMappedPort(DEFAULT_PORT))
       .setUser("SA")
       .setPassword(PASSWORD);

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/junit/MySQLRule.java

@@ -53,7 +53,7 @@ public synchronized MySQLConnectOptions startServer() throws Exception {
 
     return new MySQLConnectOptions()
       .setPort(server.getMappedPort(3306))
-      .setHost(server.getContainerIpAddress())
+      .setHost(server.getHost())
       .setDatabase("testschema")
       .setUser("mysql")
       .setPassword("password");

vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/junit/OracleRule.java

@@ -75,7 +75,7 @@ private OracleConnectOptions startOracle() throws IOException {
     server.start();
 
     return new OracleConnectOptions()
-      .setHost(server.getContainerIpAddress())
+      .setHost(server.getHost())
       .setPort(server.getMappedPort(PORT))
       .setUser("sys as sysdba")
       .setPassword(PASSWORD)

vertx-pg-client/src/main/java/io/vertx/pgclient/PgConnection.java

@@ -19,7 +19,6 @@
 
 import io.vertx.codegen.annotations.Fluent;
 import io.vertx.codegen.annotations.VertxGen;
-import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
@@ -97,14 +96,7 @@ static Future<PgConnection> connect(Vertx vertx, String connectionUri) {
    * Send a request cancellation message to tell the server to cancel processing request in this connection.
    * <br>Note: Use this with caution because the cancellation signal may or may not have any effect.
    *
-   * @param handler the handler notified if cancelling request is sent
-   * @return a reference to this, so the API can be used fluently
-   */
-  @Deprecated
-  PgConnection cancelRequest(Handler<AsyncResult<Void>> handler);
-
-  /**
-   * Like {@link #cancelRequest(Handler)} but returns a {@code Future} of the asynchronous result
+   * @return a future notified if cancelling request is sent
    */
   Future<Void> cancelRequest();
 

vertx-pg-client/src/main/java/io/vertx/pgclient/PgException.java

@@ -17,7 +17,6 @@
 
 package io.vertx.pgclient;
 
-import io.vertx.core.json.Json;
 import io.vertx.sqlclient.DatabaseException;
 
 /**
@@ -124,14 +123,6 @@ public String getSeverity() {
     return severity;
   }
 
-  /**
-   * @deprecated use {@link #getSqlState()} instead
-   */
-  @Deprecated
-  public String getCode() {
-    return getSqlState();
-  }
-
   /**
    * @return the SQLSTATE code for the error
    * (<a href="https://www.postgresql.org/docs/current/protocol-error-fields.html">'S' field</a>,

vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java

@@ -16,7 +16,9 @@
  */
 package io.vertx.pgclient.impl;
 
-import io.vertx.core.*;
+import io.vertx.core.Future;
+import io.vertx.core.Handler;
+import io.vertx.core.Promise;
 import io.vertx.core.impl.ContextInternal;
 import io.vertx.pgclient.PgConnectOptions;
 import io.vertx.pgclient.PgConnection;
@@ -117,18 +119,11 @@ public int secretKey() {
 
   @Override
   public Future<Void> cancelRequest() {
-    return Future.future(this::cancelRequest);
-  }
-
-  @Override
-  public PgConnection cancelRequest(Handler<AsyncResult<Void>> handler) {
-    Context current = Vertx.currentContext();
-    if (current == context) {
+    Promise<Void> promise = context.owner().getOrCreateContext().promise();
+    context.emit(promise, p -> {
       PgSocketConnection unwrap = (PgSocketConnection) conn.unwrap();
-      ((PgConnectionFactory)factory).cancelRequest(unwrap.connectOptions(), this.processId(), this.secretKey(), handler);
-    } else {
-      context.runOnContext(v -> cancelRequest(handler));
-    }
-    return this;
+      ((PgConnectionFactory) factory).cancelRequest(unwrap.connectOptions(), this.processId(), this.secretKey(), p);
+    });
+    return promise.future();
   }
 }

vertx-pg-client/src/test/java/io/vertx/pgclient/junit/ContainerPgRule.java

@@ -96,8 +96,8 @@ public synchronized PgConnectOptions startServer(String databaseVersion) throws
     server.start();
 
     return new PgConnectOptions()
-        .setPort(server.getMappedPort(POSTGRESQL_PORT))
-        .setHost(server.getContainerIpAddress())
+      .setPort(server.getMappedPort(POSTGRESQL_PORT))
+      .setHost(server.getHost())
         .setDatabase("postgres")
         .setUser(user)
         .setPassword("postgres");

vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/MySQLTest.java

@@ -43,7 +43,7 @@ public static void stopDatabase() {
 
   public static MySQLConnectOptions connectOptions() {
     Integer port = server.getMappedPort(3306);
-    String ip = server.getContainerIpAddress();
+    String ip = server.getHost();
     return new MySQLConnectOptions()
       .setPort(port)
       .setHost(ip)

vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/PgTemplateTestBase.java

@@ -6,7 +6,6 @@
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.pgclient.PgConnectOptions;
 import io.vertx.pgclient.PgConnection;
-import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.RowSet;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -15,7 +14,6 @@
 import org.junit.runner.RunWith;
 import org.testcontainers.containers.PostgreSQLContainer;
 
-import java.util.Map;
 import java.util.function.Function;
 
 @RunWith(VertxUnitRunner.class)
@@ -43,7 +41,7 @@ public static void stopDatabase() {
 
   public static PgConnectOptions connectOptions() {
     Integer port = server.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT);
-    String ip = server.getContainerIpAddress();
+    String ip = server.getHost();
     return new PgConnectOptions()
       .setPort(port)
       .setHost(ip)