From 7a3a9877afbab9d6645b954d8e750fe303664e8e Mon Sep 17 00:00:00 2001 From: zero88 Date: Sun, 10 Apr 2022 20:01:47 +0700 Subject: [PATCH] [#101] Add @Deprecated for LegacyJooqx --- .../java/io/github/zero88/jooqx/LegacyJooqx.java | 5 +++++ .../github/zero88/jooqx/LegacyJooqxBuilder.java | 1 + .../io/github/zero88/jooqx/LegacyJooqxTx.java | 1 + .../github/zero88/jooqx/LegacySQLCollector.java | 1 + .../io/github/zero88/jooqx/LegacySQLImpl.java | 16 +++++++++++++--- .../zero88/jooqx/LegacySQLPreparedQuery.java | 1 + 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/io/github/zero88/jooqx/LegacyJooqx.java b/core/src/main/java/io/github/zero88/jooqx/LegacyJooqx.java index c577a16f..b496de7f 100644 --- a/core/src/main/java/io/github/zero88/jooqx/LegacyJooqx.java +++ b/core/src/main/java/io/github/zero88/jooqx/LegacyJooqx.java @@ -24,8 +24,13 @@ * @see JDBCClient * @see ResultSet * @since 1.0.0 + * @deprecated Since Vertx + * deprecated, this interface still works but not able to using with + * Rxify version 3 and + * Vertx mutiny */ @VertxGen +@Deprecated public interface LegacyJooqx extends LegacyInternal { /** diff --git a/core/src/main/java/io/github/zero88/jooqx/LegacyJooqxBuilder.java b/core/src/main/java/io/github/zero88/jooqx/LegacyJooqxBuilder.java index 69492fe1..2f39a77f 100644 --- a/core/src/main/java/io/github/zero88/jooqx/LegacyJooqxBuilder.java +++ b/core/src/main/java/io/github/zero88/jooqx/LegacyJooqxBuilder.java @@ -18,6 +18,7 @@ * @since 2.0.0 */ @VertxGen +@Deprecated public interface LegacyJooqxBuilder extends SQLExecutorBuilder { diff --git a/core/src/main/java/io/github/zero88/jooqx/LegacyJooqxTx.java b/core/src/main/java/io/github/zero88/jooqx/LegacyJooqxTx.java index b2f68b0c..bac0a5b0 100644 --- a/core/src/main/java/io/github/zero88/jooqx/LegacyJooqxTx.java +++ b/core/src/main/java/io/github/zero88/jooqx/LegacyJooqxTx.java @@ -26,6 +26,7 @@ * @since 1.0.0 */ @VertxGen +@Deprecated public interface LegacyJooqxTx extends LegacyInternal, SQLTxExecutor { diff --git a/core/src/main/java/io/github/zero88/jooqx/LegacySQLCollector.java b/core/src/main/java/io/github/zero88/jooqx/LegacySQLCollector.java index b135cad8..f6d76337 100644 --- a/core/src/main/java/io/github/zero88/jooqx/LegacySQLCollector.java +++ b/core/src/main/java/io/github/zero88/jooqx/LegacySQLCollector.java @@ -16,6 +16,7 @@ * @since 1.0.0 */ @VertxGen +@Deprecated public interface LegacySQLCollector extends SQLResultCollector, SQLBatchCollector> { static LegacySQLCollector create() { diff --git a/core/src/main/java/io/github/zero88/jooqx/LegacySQLImpl.java b/core/src/main/java/io/github/zero88/jooqx/LegacySQLImpl.java index 88959067..cff05f29 100644 --- a/core/src/main/java/io/github/zero88/jooqx/LegacySQLImpl.java +++ b/core/src/main/java/io/github/zero88/jooqx/LegacySQLImpl.java @@ -28,6 +28,7 @@ import io.github.zero88.jooqx.adapter.SQLResultAdapter; import io.github.zero88.jooqx.adapter.SelectStrategy; import io.github.zero88.jooqx.datatype.DataTypeMapperRegistry; +import io.vertx.codegen.annotations.Nullable; import io.vertx.core.Future; import io.vertx.core.Promise; import io.vertx.core.Vertx; @@ -38,8 +39,10 @@ import io.vertx.ext.sql.SQLOperations; import io.vertx.ext.sql.UpdateResult; +@Deprecated final class LegacySQLImpl { + @Deprecated interface LegacyInternal extends SQLExecutor { @@ -52,6 +55,7 @@ interface LegacyInternal } + @Deprecated static final class LegacySQLPQ extends SQLPQ implements LegacySQLPreparedQuery { @Override @@ -68,6 +72,7 @@ protected JsonArray doConvert(Map> params, DataTypeMapperRegist } + @Deprecated static final class LegacySQLRC implements LegacySQLCollector { @NotNull @@ -106,6 +111,7 @@ private Map, Integer> getColumnMap(ResultSet rs, Function extends SQLEI implements LegacyInternal { @@ -117,7 +123,7 @@ abstract static class LegacySQLEI } @Override - public final Future execute(@NotNull Query query, @NotNull SQLResultAdapter adapter) { + public final Future<@Nullable R> execute(@NotNull Query query, @NotNull SQLResultAdapter adapter) { final Promise promise = Promise.promise(); sqlClient().queryWithParams(preparedQuery().sql(dsl().configuration(), query), preparedQuery().bindValues(query, typeMapperRegistry()), promise); @@ -158,6 +164,7 @@ public Future ddl(@NotNull DDLQuery statement) { } + @Deprecated static final class LegacyJooqxImpl extends LegacySQLEI implements LegacyJooqx { LegacyJooqxImpl(Vertx vertx, DSLContext dsl, SQLClient sqlClient, LegacySQLPreparedQuery preparedQuery, @@ -190,6 +197,7 @@ protected Future openConn() { } + @Deprecated static final class LegacyJooqTxImpl extends LegacySQLEI implements LegacyJooqxTx { private final LegacySQLEI delegate; @@ -259,8 +267,10 @@ private void failed(@NotNull SQLConnection conn, @NotNull Promise promise } - static class LegacyJooqxBuilderImpl extends SQLExecutorBuilderImpl + @Deprecated + static class LegacyJooqxBuilderImpl extends + SQLExecutorBuilderImpl implements LegacyJooqxBuilder { @Override diff --git a/core/src/main/java/io/github/zero88/jooqx/LegacySQLPreparedQuery.java b/core/src/main/java/io/github/zero88/jooqx/LegacySQLPreparedQuery.java index 4faf2a06..ea005d32 100644 --- a/core/src/main/java/io/github/zero88/jooqx/LegacySQLPreparedQuery.java +++ b/core/src/main/java/io/github/zero88/jooqx/LegacySQLPreparedQuery.java @@ -18,6 +18,7 @@ * @since 1.0.0 */ @VertxGen +@Deprecated public interface LegacySQLPreparedQuery extends SQLPreparedQuery { /**