Deprecate callback methods

vietj · vietj · commit a85a00270bc9 · 2023-03-03T14:56:06.000+01:00
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/DB2Connection.java b/vertx-db2-client/src/main/java/io/vertx/db2client/DB2Connection.java
@@ -40,6 +40,7 @@ public interface DB2Connection extends SqlConnection {
    * @param connectOptions the options for the connection
    * @param handler        the handler called with the connection or the failure
    */
+  @Deprecated
   static void connect(Vertx vertx, DB2ConnectOptions connectOptions, Handler<AsyncResult<DB2Connection>> handler) {
     Future<DB2Connection> fut = connect(vertx, connectOptions);
     if (handler != null) {
@@ -59,6 +60,7 @@ static Future<DB2Connection> connect(Vertx vertx, DB2ConnectOptions connectOptio
    * Like {@link #connect(Vertx, DB2ConnectOptions, Handler)} with options build
    * from {@code connectionUri}.
    */
+  @Deprecated
   static void connect(Vertx vertx, String connectionUri, Handler<AsyncResult<DB2Connection>> handler) {
     connect(vertx, fromUri(connectionUri), handler);
   }
@@ -72,6 +74,7 @@ static Future<DB2Connection> connect(Vertx vertx, String connectionUri) {
   }
 
   @Override
+  @Deprecated
   DB2Connection prepare(String sql, Handler<AsyncResult<PreparedStatement>> handler);
 
   @Override
@@ -87,6 +90,7 @@ static Future<DB2Connection> connect(Vertx vertx, String connectionUri) {
    * @return a reference to this, so the API can be used fluently
    */
   @Fluent
+  @Deprecated
   DB2Connection ping(Handler<AsyncResult<Void>> handler);
 
   /**
@@ -102,6 +106,7 @@ static Future<DB2Connection> connect(Vertx vertx, String connectionUri) {
    * @return a reference to this, so the API can be used fluently
    */
   @Fluent
+  @Deprecated
   DB2Connection debug(Handler<AsyncResult<Void>> handler);
 
   /**
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/package-info.java b/vertx-db2-client/src/main/java/io/vertx/db2client/package-info.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@ModuleGen(name = "vertx-db2-client", groupPackage = "io.vertx")
+@ModuleGen(name = "vertx-db2-client", groupPackage = "io.vertx", checkCallbackDeprecation = true)
 package io.vertx.db2client;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/MSSQLConnection.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/MSSQLConnection.java
@@ -36,6 +36,7 @@ public interface MSSQLConnection extends SqlConnection {
    * @param connectOptions the options for the connection
    * @param handler        the handler called with the connection or the failure
    */
+  @Deprecated
   static void connect(Vertx vertx, MSSQLConnectOptions connectOptions, Handler<AsyncResult<MSSQLConnection>> handler) {
     Future<MSSQLConnection> fut = MSSQLConnectionImpl.connect(vertx, connectOptions);
     if (handler != null) {
@@ -53,6 +54,7 @@ static Future<MSSQLConnection> connect(Vertx vertx, MSSQLConnectOptions connectO
   /**
    * Like {@link #connect(Vertx, MSSQLConnectOptions, Handler)} with options built from {@code connectionUri}.
    */
+  @Deprecated
   static void connect(Vertx vertx, String connectionUri, Handler<AsyncResult<MSSQLConnection>> handler) {
     connect(vertx, fromUri(connectionUri), handler);
   }
@@ -69,6 +71,7 @@ static Future<MSSQLConnection> connect(Vertx vertx, String connectionUri) {
    */
   @Fluent
   @Override
+  @Deprecated
   MSSQLConnection prepare(String s, Handler<AsyncResult<PreparedStatement>> handler);
 
   /**
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/package-info.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/package-info.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
 
-@ModuleGen(name = "vertx-mssql-client", groupPackage = "io.vertx")
+@ModuleGen(name = "vertx-mssql-client", groupPackage = "io.vertx", checkCallbackDeprecation = true)
 package io.vertx.mssqlclient;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLConnection.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLConnection.java
@@ -49,6 +49,7 @@ public interface MySQLConnection extends SqlConnection {
    * @param connectOptions the options for the connection
    * @param handler the handler called with the connection or the failure
    */
+  @Deprecated
   static void connect(Vertx vertx, MySQLConnectOptions connectOptions, Handler<AsyncResult<MySQLConnection>> handler) {
     Future<MySQLConnection> fut = connect(vertx, connectOptions);
     if (handler != null) {
@@ -66,6 +67,7 @@ static Future<MySQLConnection> connect(Vertx vertx, MySQLConnectOptions connectO
   /**
    * Like {@link #connect(Vertx, MySQLConnectOptions, Handler)} with options built from {@code connectionUri}.
    */
+  @Deprecated
   static void connect(Vertx vertx, String connectionUri, Handler<AsyncResult<MySQLConnection>> handler) {
     connect(vertx, fromUri(connectionUri), handler);
   }
@@ -82,6 +84,7 @@ static Future<MySQLConnection> connect(Vertx vertx, String connectionUri) {
    */
   @Fluent
   @Override
+  @Deprecated
   MySQLConnection prepare(String sql, Handler<AsyncResult<PreparedStatement>> handler);
 
   /**
@@ -105,6 +108,7 @@ static Future<MySQLConnection> connect(Vertx vertx, String connectionUri) {
    * @return a reference to this, so the API can be used fluently
    */
   @Fluent
+  @Deprecated
   MySQLConnection ping(Handler<AsyncResult<Void>> handler);
 
   /**
@@ -120,6 +124,7 @@ static Future<MySQLConnection> connect(Vertx vertx, String connectionUri) {
    * @return a reference to this, so the API can be used fluently
    */
   @Fluent
+  @Deprecated
   MySQLConnection specifySchema(String schemaName, Handler<AsyncResult<Void>> handler);
 
   /**
@@ -134,6 +139,7 @@ static Future<MySQLConnection> connect(Vertx vertx, String connectionUri) {
    * @return a reference to this, so the API can be used fluently
    */
   @Fluent
+  @Deprecated
   MySQLConnection getInternalStatistics(Handler<AsyncResult<String>> handler);
 
   /**
@@ -150,6 +156,7 @@ static Future<MySQLConnection> connect(Vertx vertx, String connectionUri) {
    * @return a reference to this, so the API can be used fluently
    */
   @Fluent
+  @Deprecated
   MySQLConnection setOption(MySQLSetOption option, Handler<AsyncResult<Void>> handler);
 
   /**
@@ -164,6 +171,7 @@ static Future<MySQLConnection> connect(Vertx vertx, String connectionUri) {
    * @return a reference to this, so the API can be used fluently
    */
   @Fluent
+  @Deprecated
   MySQLConnection resetConnection(Handler<AsyncResult<Void>> handler);
 
   /**
@@ -178,6 +186,7 @@ static Future<MySQLConnection> connect(Vertx vertx, String connectionUri) {
    * @return a reference to this, so the API can be used fluently
    */
   @Fluent
+  @Deprecated
   MySQLConnection debug(Handler<AsyncResult<Void>> handler);
 
   /**
@@ -193,6 +202,7 @@ static Future<MySQLConnection> connect(Vertx vertx, String connectionUri) {
    * @return a reference to this, so the API can be used fluently
    */
   @Fluent
+  @Deprecated
   MySQLConnection changeUser(MySQLAuthOptions options, Handler<AsyncResult<Void>> handler);
 
   /**
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/package-info.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/package-info.java
@@ -15,7 +15,7 @@
  *
  */
 
-@ModuleGen(name = "vertx-mysql-client", groupPackage = "io.vertx")
+@ModuleGen(name = "vertx-mysql-client", groupPackage = "io.vertx", checkCallbackDeprecation = true)
 package io.vertx.mysqlclient;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/OracleConnection.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/OracleConnection.java
@@ -38,6 +38,7 @@ public interface OracleConnection extends SqlConnection {
    * @param connectOptions the options for the connection
    * @param handler the handler called with the connection or the failure
    */
+  @Deprecated
   static void connect(Vertx vertx, OracleConnectOptions connectOptions, Handler<AsyncResult<OracleConnection>> handler) {
     Objects.requireNonNull(handler);
     OracleConnectionImpl.connect(vertx, connectOptions).onComplete(handler);
@@ -53,6 +54,7 @@ static Future<OracleConnection> connect(Vertx vertx, OracleConnectOptions connec
   /**
    * Like {@link #connect(Vertx, OracleConnectOptions, Handler)} with options built from {@code connectionUri}.
    */
+  @Deprecated
   static void connect(Vertx vertx, String connectionUri, Handler<AsyncResult<OracleConnection>> handler) {
     connect(vertx, fromUri(connectionUri), handler);
   }
@@ -69,6 +71,7 @@ static Future<OracleConnection> connect(Vertx vertx, String connectionUri) {
    */
   @Fluent
   @Override
+  @Deprecated
   OracleConnection prepare(String s, Handler<AsyncResult<PreparedStatement>> handler);
 
   /**
diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/package-info.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/package-info.java
@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
-@ModuleGen(name = "vertx-oracle-client", groupPackage = "io.vertx")
+@ModuleGen(name = "vertx-oracle-client", groupPackage = "io.vertx", checkCallbackDeprecation = true)
 package io.vertx.oracleclient;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/PgConnection.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/PgConnection.java
@@ -52,6 +52,7 @@ public interface PgConnection extends SqlConnection {
    * @param options the connect options
    * @param handler the handler called with the connection or the failure
    */
+  @Deprecated
   static void connect(Vertx vertx, PgConnectOptions options, Handler<AsyncResult<PgConnection>> handler) {
     Future<PgConnection> fut = connect(vertx, options);
     if (handler != null) {
@@ -69,6 +70,7 @@ static Future<PgConnection> connect(Vertx vertx, PgConnectOptions options) {
   /**
    * Like {@link #connect(Vertx, PgConnectOptions, Handler)} with options build from the environment variables.
    */
+  @Deprecated
   static void connect(Vertx vertx, Handler<AsyncResult<PgConnection>> handler) {
     connect(vertx, PgConnectOptions.fromEnv(), handler);
   }
@@ -83,6 +85,7 @@ static Future<PgConnection> connect(Vertx vertx) {
   /**
    * Like {@link #connect(Vertx, PgConnectOptions, Handler)} with options build from {@code connectionUri}.
    */
+  @Deprecated
   static void connect(Vertx vertx, String connectionUri, Handler<AsyncResult<PgConnection>> handler) {
     connect(vertx, PgConnectOptions.fromUri(connectionUri), handler);
   }
@@ -122,6 +125,7 @@ static Future<PgConnection> connect(Vertx vertx, String connectionUri) {
    * @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);
 
   /**
@@ -138,6 +142,7 @@ static Future<PgConnection> connect(Vertx vertx, String connectionUri) {
    * {@inheritDoc}
    */
   @Fluent
+  @Deprecated
   @Override
   PgConnection prepare(String sql, Handler<AsyncResult<PreparedStatement>> handler);
 
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/package-info.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/package-info.java
@@ -15,7 +15,7 @@
  *
  */
 
-@ModuleGen(name = "vertx-pg-client", groupPackage = "io.vertx")
+@ModuleGen(name = "vertx-pg-client", groupPackage = "io.vertx", checkCallbackDeprecation = true)
 package io.vertx.pgclient;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/pubsub/PgSubscriber.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/pubsub/PgSubscriber.java
@@ -84,6 +84,7 @@ static PgSubscriber subscriber(Vertx vertx, PgConnectOptions options) {
    * @return a reference to this, so the API can be used fluently
    */
   @Fluent
+  @Deprecated
   PgSubscriber connect(Handler<AsyncResult<Void>> handler);
 
   /**
@@ -132,6 +133,7 @@ static PgSubscriber subscriber(Vertx vertx, PgConnectOptions options) {
   /**
    * Close the subscriber, the retry policy will not be invoked.
    */
+  @Deprecated
   void close(Handler<AsyncResult<Void>> handler);
 
 }
diff --git a/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/SqlTemplate.java b/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/SqlTemplate.java
@@ -142,6 +142,7 @@ default <T> SqlTemplate<T, R> mapFrom(Class<T> type) {
    * @param parameters the query parameters
    * @param handler the result handler
    */
+  @Deprecated
   void execute(I parameters, Handler<AsyncResult<R>> handler);
 
   /**
@@ -157,6 +158,7 @@ default <T> SqlTemplate<T, R> mapFrom(Class<T> type) {
    * @param batch the batch
    * @param handler the result handler
    */
+  @Deprecated
   void executeBatch(List<I> batch, Handler<AsyncResult<R>> handler);
 
   /**
diff --git a/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/package-info.java b/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/package-info.java
@@ -15,7 +15,7 @@
  *
  */
 
-@ModuleGen(name = "vertx-sql-templates", groupPackage = "io.vertx")
+@ModuleGen(name = "vertx-sql-templates", groupPackage = "io.vertx", checkCallbackDeprecation = true)
 package io.vertx.sqlclient.templates;
 
 import io.vertx.codegen.annotations.ModuleGen;
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/Cursor.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/Cursor.java
@@ -34,6 +34,7 @@ public interface Cursor {
    * @param count the amount of rows to read
    * @param handler the handler for the result
    */
+  @Deprecated
   void read(int count, Handler<AsyncResult<RowSet<Row>>> handler);
 
   /**
@@ -59,6 +60,7 @@ public interface Cursor {
   /**
    * Like {@link #close()} but with a {@code completionHandler} called when the cursor has been released.
    */
+  @Deprecated
   void close(Handler<AsyncResult<Void>> completionHandler);
 
   /**
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/Pool.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/Pool.java
@@ -95,6 +95,7 @@ static Pool pool(Vertx vertx, SqlConnectOptions database, PoolOptions options) {
    *
    * @param handler the handler that will get the connection result
    */
+  @Deprecated
   void getConnection(Handler<AsyncResult<SqlConnection>> handler);
 
   /**
@@ -136,6 +137,7 @@ static Pool pool(Vertx vertx, SqlConnectOptions database, PoolOptions options) {
    * @param function the code to execute
    * @param handler the result handler
    */
+  @Deprecated
   default <T> void withTransaction(Function<SqlConnection, Future<@Nullable T>> function, Handler<AsyncResult<@Nullable T>> handler) {
     Future<T> res = withTransaction(function);
     if (handler != null) {
@@ -201,6 +203,7 @@ default <T> void withTransaction(Function<SqlConnection, Future<@Nullable T>> fu
    * @param function the code to execute
    * @param handler the result handler
    */
+  @Deprecated
   default <T> void withConnection(Function<SqlConnection, Future<@Nullable T>> function, Handler<AsyncResult<@Nullable T>> handler) {
     Future<T> res = withConnection(function);
     if (handler != null) {
@@ -220,6 +223,7 @@ default <T> void withConnection(Function<SqlConnection, Future<@Nullable T>> fun
    *
    * @param handler the completion handler
    */
+  @Deprecated
   void close(Handler<AsyncResult<Void>> handler);
 
   /**
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/PreparedQuery.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/PreparedQuery.java
@@ -41,6 +41,7 @@ public interface PreparedQuery<T> extends Query<T> {
    *
    * @param handler the handler receiving the response
    */
+  @Deprecated
   void execute(Tuple tuple, Handler<AsyncResult<T>> handler);
 
   /**
@@ -54,6 +55,7 @@ public interface PreparedQuery<T> extends Query<T> {
    * @param batch the batch of tuples
    * @param handler the handler receiving the response
    */
+  @Deprecated
   void executeBatch(List<Tuple> batch, Handler<AsyncResult<T>> handler);
 
   /**
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/PreparedStatement.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/PreparedStatement.java
@@ -89,6 +89,7 @@ default RowStream<Row> createStream(int fetch) {
   /**
    * Like {@link #close()} but notifies the {@code completionHandler} when it's closed.
    */
+  @Deprecated
   void close(Handler<AsyncResult<Void>> completionHandler);
 
 }
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/Query.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/Query.java
@@ -39,6 +39,7 @@ public interface Query<T> {
    *
    * @param handler the handler receiving the response
    */
+  @Deprecated
   void execute(Handler<AsyncResult<T>> handler);
 
   /**
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/RowStream.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/RowStream.java
@@ -64,6 +64,7 @@ public interface RowStream<T> extends ReadStream<T> {
    *
    * @param completionHandler the completion handler for this operation
    */
+  @Deprecated
   void close(Handler<AsyncResult<Void>> completionHandler);
 
 }
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/SqlClient.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/SqlClient.java
@@ -59,6 +59,7 @@ public interface SqlClient {
    *
    * @param handler the completion handler
    */
+  @Deprecated
   void close(Handler<AsyncResult<Void>> handler);
 
   /**
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/SqlConnection.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/SqlConnection.java
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/Transaction.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/Transaction.java
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/package-info.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/package-info.java

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
`18`		`-@ModuleGen(name = "vertx-mysql-client", groupPackage = "io.vertx")`
	`18`	`+@ModuleGen(name = "vertx-mysql-client", groupPackage = "io.vertx", checkCallbackDeprecation = true)`
`19`	`19`	`package io.vertx.mysqlclient;`
`20`	`20`
`21`	`21`	`import io.vertx.codegen.annotations.ModuleGen;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0`
`10`	`10`	`*/`
`11`		`-@ModuleGen(name = "vertx-oracle-client", groupPackage = "io.vertx")`
	`11`	`+@ModuleGen(name = "vertx-oracle-client", groupPackage = "io.vertx", checkCallbackDeprecation = true)`
`12`	`12`	`package io.vertx.oracleclient;`
`13`	`13`
`14`	`14`	`import io.vertx.codegen.annotations.ModuleGen;`