From 9be74d9d21f616d553387969cee0bc907c28b0ca Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Sat, 4 Feb 2023 12:15:03 +0100 Subject: [PATCH] Simplify reactive pool size configuration Follow-up of #30801 --- .../datasource/runtime/DataSourceReactiveRuntimeConfig.java | 4 ++-- .../reactive/db2/client/runtime/DB2PoolRecorder.java | 6 +----- .../reactive/mssql/client/runtime/MSSQLPoolRecorder.java | 6 +----- .../reactive/mysql/client/runtime/MySQLPoolRecorder.java | 6 +----- .../reactive/oracle/client/runtime/OraclePoolRecorder.java | 6 +----- .../quarkus/reactive/pg/client/runtime/PgPoolRecorder.java | 6 +----- 6 files changed, 7 insertions(+), 27 deletions(-) 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..f7cfcd0e72846 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 @@ -31,8 +31,8 @@ public class DataSourceReactiveRuntimeConfig { /** * The datasource pool maximum size. */ - @ConfigItem(defaultValueDocumentation = "20") - public OptionalInt maxSize = OptionalInt.empty(); + @ConfigItem(defaultValue = "20") + public int maxSize = 20; /** * When a new connection object is created, the pool assigns it an event loop. 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..60103c3ad7303 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 @@ -94,11 +94,7 @@ private PoolOptions toPoolOptions(Integer eventLoopCount, PoolOptions poolOptions; poolOptions = new PoolOptions(); - if (dataSourceReactiveRuntimeConfig.maxSize.isPresent()) { - poolOptions.setMaxSize(dataSourceReactiveRuntimeConfig.maxSize.getAsInt()); - } else { - poolOptions.setMaxSize(20); - } + poolOptions.setMaxSize(dataSourceReactiveRuntimeConfig.maxSize); if (dataSourceReactiveRuntimeConfig.idleTimeout.isPresent()) { int idleTimeout = Math.toIntExact(dataSourceReactiveRuntimeConfig.idleTimeout.get().toMillis()); 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..e2e239be11ecc 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 @@ -94,11 +94,7 @@ private PoolOptions toPoolOptions(Integer eventLoopCount, PoolOptions poolOptions; poolOptions = new PoolOptions(); - if (dataSourceReactiveRuntimeConfig.maxSize.isPresent()) { - poolOptions.setMaxSize(dataSourceReactiveRuntimeConfig.maxSize.getAsInt()); - } else { - poolOptions.setMaxSize(20); - } + poolOptions.setMaxSize(dataSourceReactiveRuntimeConfig.maxSize); if (dataSourceReactiveRuntimeConfig.idleTimeout.isPresent()) { int idleTimeout = Math.toIntExact(dataSourceReactiveRuntimeConfig.idleTimeout.get().toMillis()); 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..be0e3e14e43a2 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 @@ -95,11 +95,7 @@ private PoolOptions toPoolOptions(Integer eventLoopCount, PoolOptions poolOptions; poolOptions = new PoolOptions(); - if (dataSourceReactiveRuntimeConfig.maxSize.isPresent()) { - poolOptions.setMaxSize(dataSourceReactiveRuntimeConfig.maxSize.getAsInt()); - } else { - poolOptions.setMaxSize(20); - } + poolOptions.setMaxSize(dataSourceReactiveRuntimeConfig.maxSize); if (dataSourceReactiveRuntimeConfig.idleTimeout.isPresent()) { int idleTimeout = Math.toIntExact(dataSourceReactiveRuntimeConfig.idleTimeout.get().toMillis()); 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..915e209f4de1e 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 @@ -88,11 +88,7 @@ private PoolOptions toPoolOptions(Integer eventLoopCount, PoolOptions poolOptions; poolOptions = new PoolOptions(); - if (dataSourceReactiveRuntimeConfig.maxSize.isPresent()) { - poolOptions.setMaxSize(dataSourceReactiveRuntimeConfig.maxSize.getAsInt()); - } else { - poolOptions.setMaxSize(20); - } + poolOptions.setMaxSize(dataSourceReactiveRuntimeConfig.maxSize); if (dataSourceReactiveRuntimeConfig.idleTimeout.isPresent()) { int idleTimeout = Math.toIntExact(dataSourceReactiveRuntimeConfig.idleTimeout.get().toMillis()); 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..dc2dc0126bbc7 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 @@ -94,11 +94,7 @@ private PoolOptions toPoolOptions(Integer eventLoopCount, PoolOptions poolOptions; poolOptions = new PoolOptions(); - if (dataSourceReactiveRuntimeConfig.maxSize.isPresent()) { - poolOptions.setMaxSize(dataSourceReactiveRuntimeConfig.maxSize.getAsInt()); - } else { - poolOptions.setMaxSize(20); - } + poolOptions.setMaxSize(dataSourceReactiveRuntimeConfig.maxSize); if (dataSourceReactiveRuntimeConfig.idleTimeout.isPresent()) { int idleTimeout = Math.toIntExact(dataSourceReactiveRuntimeConfig.idleTimeout.get().toMillis());