Speed up DB2 client tests

.github/workflows/ci-4.x.yml

@@ -46,7 +46,6 @@ jobs:
             module: 'vertx-mssql-client'
           - os: ubuntu-latest
             jdk: 8
-            profile: 'DB2-11.5'
             module: 'vertx-db2-client'
           - os: ubuntu-latest
             jdk: 8

.github/workflows/ci-matrix-5.x.yml

@@ -53,7 +53,6 @@ jobs:
             module: 'vertx-mssql-client'
           - os: ubuntu-latest
             jdk: 11
-            profile: 'DB2-11.5'
             module: 'vertx-db2-client'
           - os: ubuntu-latest
             jdk: 11

vertx-db2-client/pom.xml

@@ -49,16 +49,10 @@
     <!-- Testing purposes -->
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers-db2</artifactId>
+      <artifactId>testcontainers</artifactId>
       <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-        <groupId>com.ibm.db2</groupId>
-        <artifactId>jcc</artifactId>
-        <version>11.1.4.4</version>
-        <scope>test</scope>
-    </dependency>
     <!-- SLF4J API for test code and Testcontainers -->
     <dependency>
       <groupId>org.slf4j</groupId>

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2SocketConnection.java

@@ -1,17 +1,12 @@
 /*
- * Copyright (C) 2019,2020 IBM Corporation
+ * Copyright (c) 2011-2026 Contributors to the Eclipse Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
 package io.vertx.db2client.impl;
 
@@ -24,23 +19,18 @@
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.db2client.DB2ConnectOptions;
 import io.vertx.db2client.DB2Exception;
-import io.vertx.db2client.impl.codec.ConnectionState;
-import io.vertx.db2client.impl.codec.DB2CommandMessage;
-import io.vertx.db2client.impl.codec.DB2Codec;
-import io.vertx.db2client.impl.codec.DB2PreparedStatement;
-import io.vertx.db2client.impl.codec.ExtendedBatchQueryDB2CommandMessage;
-import io.vertx.db2client.impl.codec.ExtendedQueryDB2CommandMessage;
+import io.vertx.db2client.impl.codec.*;
 import io.vertx.db2client.impl.command.InitialHandshakeCommand;
 import io.vertx.db2client.impl.drda.ConnectionMetaData;
 import io.vertx.db2client.impl.drda.SQLState;
 import io.vertx.db2client.impl.drda.SqlCode;
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.codec.CommandMessage;
-import io.vertx.sqlclient.spi.connection.Connection;
+import io.vertx.sqlclient.codec.SocketConnectionBase;
 import io.vertx.sqlclient.internal.PreparedStatement;
 import io.vertx.sqlclient.internal.QueryResultHandler;
-import io.vertx.sqlclient.codec.SocketConnectionBase;
 import io.vertx.sqlclient.spi.DatabaseMetadata;
+import io.vertx.sqlclient.spi.connection.Connection;
 import io.vertx.sqlclient.spi.protocol.CommandBase;
 import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;
 import io.vertx.sqlclient.spi.protocol.SimpleQueryCommand;
@@ -141,7 +131,9 @@ protected <R> void doSchedule(CommandBase<R> cmd, Completable<R> handler) {
   @Override
   public void handleClose(Throwable t) {
     super.handleClose(t);
-    context().runOnContext(closeHandler);
+    if (closeHandler != null) {
+      context().runOnContext(closeHandler);
+    }
   }
 
   @Override

vertx-db2-client/src/test/java/io/vertx/tests/db2client/DB2DataTypeTest.java

@@ -1,17 +1,12 @@
 /*
- * Copyright (C) 2020 IBM Corporation
+ * Copyright (c) 2011-2026 Contributors to the Eclipse Foundation
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
 package io.vertx.tests.db2client;
 
@@ -32,8 +27,6 @@
 import java.util.List;
 import java.util.UUID;
 
-import static org.junit.Assume.assumeTrue;
-
 @RunWith(VertxUnitRunner.class)
 public class DB2DataTypeTest extends DB2TestBase {
 
@@ -214,35 +207,6 @@ public void testUUID(TestContext ctx) {
     }));
   }
 
-  @Test
-  public void testRowId(TestContext ctx) {
-    assumeTrue("Only DB2/Z supports the ROWID column type", rule.isZOS());
-
-    final String msg = "insert data for testRowId";
-    connect(ctx.asyncAssertSuccess(conn -> {
-      // Insert some data
-      conn
-        .preparedQuery("INSERT INTO ROWTEST (message) VALUES ('" + msg + "')")
-        .execute()
-        .onComplete(ctx.asyncAssertSuccess(insertResult -> {
-           // Find it by msg
-           conn
-             .preparedQuery("SELECT * FROM ROWTEST WHERE message = '" + msg + "'")
-             .execute()
-             .onComplete(ctx.asyncAssertSuccess(rows -> {
-               RowId rowId = verifyRowId(ctx, rows, msg);
-               // Now find it by rowid
-               conn
-                 .preparedQuery("SELECT * FROM ROWTEST WHERE id = ?")
-                 .execute(Tuple.of(rowId))
-                 .onComplete(ctx.asyncAssertSuccess(rows2 -> {
-                   verifyRowId(ctx, rows2, msg);
-                 }));
-             }));
-        }));
-    }));
-  }
-
   /**
    * Test to support using enum string values in the Row and Tuple methods.
    */

vertx-db2-client/src/test/java/io/vertx/tests/db2client/QueryVariationsTest.java

@@ -1,19 +1,27 @@
-package io.vertx.tests.db2client;
-
-import static org.junit.Assume.assumeFalse;
-
-import java.util.Arrays;
-import java.util.function.Consumer;
+/*
+ * Copyright (c) 2011-2026 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ */
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+package io.vertx.tests.db2client;
 
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.RowIterator;
 import io.vertx.sqlclient.RowSet;
 import io.vertx.sqlclient.Tuple;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.function.Consumer;
 
 /**
  * Tests for subqueries which are documented here:
@@ -180,8 +188,6 @@ public void testSectionReuse(TestContext ctx) {
    */
   @Test
   public void testSequenceQuery(TestContext ctx) {
-      assumeFalse("TODO: Sequences behave differently on DB2/z and need to be implemented properly", rule.isZOS());
-
     connect(ctx.asyncAssertSuccess(con -> {
       con
         .query("values nextval for my_seq")
@@ -214,8 +220,6 @@ public void testSequenceQuery(TestContext ctx) {
    */
   @Test
   public void testSequenceQueryPrepared(TestContext ctx) {
-      assumeFalse("TODO: Sequences behave differently on DB2/z and need to be implemented properly", rule.isZOS());
-
     connect(ctx.asyncAssertSuccess(con -> {
       con
         .preparedQuery("VALUES nextval for my_seq")

vertx-db2-client/src/test/java/io/vertx/tests/db2client/TableJoinTest.java

@@ -1,15 +1,23 @@
-package io.vertx.tests.db2client;
-
-import static org.junit.Assume.assumeFalse;
-
-import java.util.Arrays;
+/*
+ * Copyright (c) 2011-2026 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ */
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+package io.vertx.tests.db2client;
 
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.sqlclient.Row;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
 
 /**
  * Tests for table joins which are documented here:
@@ -84,7 +92,6 @@ public void testRightOuterJoin(TestContext ctx) {
 
   @Test
   public void testFullOuterJoin(TestContext ctx) {
-      assumeFalse("DB2 on Z does not support operations within ON clause for FULL OUTER JOIN", rule.isZOS());
     testJoin(ctx, "FULL OUTER JOIN");
   }