diff --git a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveRuntimeConfig.java b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveRuntimeConfig.java index f1004d7d105b4..2008de673fb09 100644 --- a/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveRuntimeConfig.java +++ b/extensions/reactive-datasource/runtime/src/main/java/io/quarkus/reactive/datasource/runtime/DataSourceReactiveRuntimeConfig.java @@ -100,15 +100,6 @@ public class DataSourceReactiveRuntimeConfig { @ConfigItem public PfxConfiguration keyCertificatePfx = new PfxConfiguration(); - /** - * Deprecated: this was removed and is no longer available. - * - * @Deprecated - */ - @ConfigItem - @Deprecated - public Optional threadLocal = Optional.empty(); - /** * The number of reconnection attempts when a pooled connection cannot be established on first try. */ diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java index 299821dd49d23..7b7a867c6511c 100644 --- a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java +++ b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java @@ -80,10 +80,6 @@ private DB2Pool initialize(Vertx vertx, // io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter.extractClientName connectOptions.setMetricsName("db2|" + dataSourceName); - if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent()) { - log.warn( - "Configuration element 'thread-local' on Reactive datasource connections is deprecated and will be ignored. The started pool will always be based on a per-thread separate pool now."); - } return createPool(vertx, poolOptions, connectOptions, dataSourceName); } @@ -161,13 +157,7 @@ private DB2ConnectOptions toConnectOptions(DataSourceRuntimeConfig dataSourceRun } } - if (dataSourceReactiveDB2Config.cachePreparedStatements.isPresent()) { - log.warn( - "datasource.reactive.db2.cache-prepared-statements is deprecated, use datasource.reactive.cache-prepared-statements instead"); - connectOptions.setCachePreparedStatements(dataSourceReactiveDB2Config.cachePreparedStatements.get()); - } else { - connectOptions.setCachePreparedStatements(dataSourceReactiveRuntimeConfig.cachePreparedStatements); - } + connectOptions.setCachePreparedStatements(dataSourceReactiveRuntimeConfig.cachePreparedStatements); connectOptions.setSsl(dataSourceReactiveDB2Config.ssl); diff --git a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourceReactiveDB2Config.java b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourceReactiveDB2Config.java index c2d4f018eea4b..bb0ac8a9e82c7 100644 --- a/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourceReactiveDB2Config.java +++ b/extensions/reactive-db2-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DataSourceReactiveDB2Config.java @@ -1,22 +1,11 @@ package io.quarkus.reactive.db2.client.runtime; -import java.util.Optional; - import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; @ConfigGroup public class DataSourceReactiveDB2Config { - /** - * Whether prepared statements should be cached on the client side. - * - * @deprecated use {@code datasource.reactive.cache-prepared-statements} instead. - */ - @ConfigItem - @Deprecated - public Optional cachePreparedStatements = Optional.empty(); - /** * Whether SSL/TLS is enabled. */ diff --git a/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/MSSQLPoolRecorder.java b/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/MSSQLPoolRecorder.java index ac34f3bc6e60d..a263dc355707c 100644 --- a/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/MSSQLPoolRecorder.java +++ b/extensions/reactive-mssql-client/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/MSSQLPoolRecorder.java @@ -80,10 +80,6 @@ private MSSQLPool initialize(Vertx vertx, // io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter.extractClientName mssqlConnectOptions.setMetricsName("mssql|" + dataSourceName); - if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent()) { - log.warn( - "Configuration element 'thread-local' on Reactive datasource connections is deprecated and will be ignored. The started pool will always be based on a per-thread separate pool now."); - } return createPool(vertx, poolOptions, mssqlConnectOptions, dataSourceName); } diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourceReactiveMySQLConfig.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourceReactiveMySQLConfig.java index e887b4930992d..c4d2219f919ae 100644 --- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourceReactiveMySQLConfig.java +++ b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/DataSourceReactiveMySQLConfig.java @@ -11,15 +11,6 @@ @ConfigGroup public class DataSourceReactiveMySQLConfig { - /** - * Whether prepared statements should be cached on the client side. - * - * @deprecated use {@code datasource.reactive.cache-prepared-statements} instead. - */ - @ConfigItem - @Deprecated - public Optional cachePreparedStatements = Optional.empty(); - /** * Charset for connections. */ diff --git a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java index d5f58d0fb7d16..8bad16eb41536 100644 --- a/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java +++ b/extensions/reactive-mysql-client/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java @@ -81,10 +81,6 @@ private MySQLPool initialize(Vertx vertx, // io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter.extractClientName mysqlConnectOptions.setMetricsName("mysql|" + dataSourceName); - if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent()) { - log.warn( - "Configuration element 'thread-local' on Reactive datasource connections is deprecated and will be ignored. The started pool will always be based on a per-thread separate pool now."); - } return createPool(vertx, poolOptions, mysqlConnectOptions, dataSourceName); } @@ -166,13 +162,7 @@ private MySQLConnectOptions toMySQLConnectOptions(DataSourceRuntimeConfig dataSo } } - if (dataSourceReactiveMySQLConfig.cachePreparedStatements.isPresent()) { - log.warn( - "datasource.reactive.mysql.cache-prepared-statements is deprecated, use datasource.reactive.cache-prepared-statements instead"); - mysqlConnectOptions.setCachePreparedStatements(dataSourceReactiveMySQLConfig.cachePreparedStatements.get()); - } else { - mysqlConnectOptions.setCachePreparedStatements(dataSourceReactiveRuntimeConfig.cachePreparedStatements); - } + mysqlConnectOptions.setCachePreparedStatements(dataSourceReactiveRuntimeConfig.cachePreparedStatements); if (dataSourceReactiveMySQLConfig.charset.isPresent()) { mysqlConnectOptions.setCharset(dataSourceReactiveMySQLConfig.charset.get()); diff --git a/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/OraclePoolRecorder.java b/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/OraclePoolRecorder.java index a32dfcf4bcb5b..ae666521f8f9f 100644 --- a/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/OraclePoolRecorder.java +++ b/extensions/reactive-oracle-client/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/OraclePoolRecorder.java @@ -74,10 +74,6 @@ private OraclePool initialize(Vertx vertx, // io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter.extractClientName oracleConnectOptions.setMetricsName("oracle|" + dataSourceName); - if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent()) { - log.warn( - "Configuration element 'thread-local' on Reactive datasource connections is deprecated and will be ignored. The started pool will always be based on a per-thread separate pool now."); - } return createPool(vertx, poolOptions, oracleConnectOptions, dataSourceName); } diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourceReactivePostgreSQLConfig.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourceReactivePostgreSQLConfig.java index 46f1d98f1399d..47607c9074dec 100644 --- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourceReactivePostgreSQLConfig.java +++ b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/DataSourceReactivePostgreSQLConfig.java @@ -10,15 +10,6 @@ @ConfigGroup public class DataSourceReactivePostgreSQLConfig { - /** - * Whether prepared statements should be cached on the client side. - * - * @deprecated use {@code datasource.reactive.cache-prepared-statements} instead. - */ - @ConfigItem - @Deprecated - public Optional cachePreparedStatements = Optional.empty(); - /** * The maximum number of inflight database commands that can be pipelined. */ diff --git a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java index 853f4e7dba23a..1377233895269 100644 --- a/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java +++ b/extensions/reactive-pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java @@ -80,10 +80,7 @@ private PgPool initialize(Vertx vertx, // See io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter.extractPrefix and // io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter.extractClientName pgConnectOptions.setMetricsName("postgresql|" + dataSourceName); - if (dataSourceReactiveRuntimeConfig.threadLocal.isPresent()) { - log.warn( - "Configuration element 'thread-local' on Reactive datasource connections is deprecated and will be ignored. The started pool will always be based on a per-thread separate pool now."); - } + return createPool(vertx, poolOptions, pgConnectOptions, dataSourceName); } @@ -161,14 +158,7 @@ private PgConnectOptions toPgConnectOptions(DataSourceRuntimeConfig dataSourceRu } } - if (dataSourceReactivePostgreSQLConfig.cachePreparedStatements.isPresent()) { - log.warn( - "datasource.reactive.postgresql.cache-prepared-statements is deprecated, use datasource.reactive.cache-prepared-statements instead"); - pgConnectOptions - .setCachePreparedStatements(dataSourceReactivePostgreSQLConfig.cachePreparedStatements.get()); - } else { - pgConnectOptions.setCachePreparedStatements(dataSourceReactiveRuntimeConfig.cachePreparedStatements); - } + pgConnectOptions.setCachePreparedStatements(dataSourceReactiveRuntimeConfig.cachePreparedStatements); if (dataSourceReactivePostgreSQLConfig.pipeliningLimit.isPresent()) { pgConnectOptions.setPipeliningLimit(dataSourceReactivePostgreSQLConfig.pipeliningLimit.getAsInt());