Merge pull request quarkusio#43564 from yrodiere/reactive-with-unnamed

Use SmallRye Config @WithDefaults/@WithUnnamedKey for reactive datasource config
danielsoro · Sep 27, 2024 · 60a9780 · 60a9780
2 parents ceb7e30 + 4786257
commit 60a9780
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 28 deletions.
diff --git a/.../main/java/io/quarkus/reactive/datasource/runtime/DataSourcesReactiveBuildTimeConfig.java b/.../main/java/io/quarkus/reactive/datasource/runtime/DataSourcesReactiveBuildTimeConfig.java
@@ -1,37 +1,59 @@
 package io.quarkus.reactive.datasource.runtime;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefaults;
-import io.smallrye.config.WithName;
 import io.smallrye.config.WithParentName;
+import io.smallrye.config.WithUnnamedKey;
 
 @ConfigMapping(prefix = "quarkus.datasource")
 @ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
 public interface DataSourcesReactiveBuildTimeConfig {
 
+    /**
+     * Datasources.
+     */
+    @ConfigDocMapKey("datasource-name")
+    @WithParentName
+    @WithDefaults
+    @WithUnnamedKey(DataSourceUtil.DEFAULT_DATASOURCE_NAME)
+    Map<String, DataSourceReactiveOuterNamedBuildTimeConfig> dataSources();
+
     /**
      * The default datasource.
+     *
+     * @deprecated Use {@code dataSources().get(DataSourceUtil.DEFAULT_DATASOURCE_NAME).reactive()} instead.
      */
-    @WithName("reactive")
-    DataSourceReactiveBuildTimeConfig defaultDataSource();
+    @Deprecated
+    default DataSourceReactiveBuildTimeConfig defaultDataSource() {
+        return dataSources().get(DataSourceUtil.DEFAULT_DATASOURCE_NAME).reactive();
+    }
 
     /**
      * Additional named datasources.
+     *
+     * @deprecated Use {@code dataSources()} instead -- this will include the default datasource.
      */
-    @ConfigDocSection
-    @ConfigDocMapKey("datasource-name")
-    @WithParentName
-    @WithDefaults
-    Map<String, DataSourceReactiveOuterNamedBuildTimeConfig> namedDataSources();
+    @Deprecated
+    default Map<String, DataSourceReactiveOuterNamedBuildTimeConfig> namedDataSources() {
+        Map<String, DataSourceReactiveOuterNamedBuildTimeConfig> withoutDefault = new HashMap<>(dataSources());
+        withoutDefault.remove(DataSourceUtil.DEFAULT_DATASOURCE_NAME);
+        return withoutDefault;
+    }
 
+    /**
+     * Additional named datasources.
+     *
+     * @deprecated Use {@code dataSources().get(dataSourceName).reactive()} instead.
+     */
+    @Deprecated
     default DataSourceReactiveBuildTimeConfig getDataSourceReactiveBuildTimeConfig(String dataSourceName) {
         if (DataSourceUtil.isDefault(dataSourceName)) {
             return defaultDataSource();

diff --git a/...rc/main/java/io/quarkus/reactive/datasource/runtime/DataSourcesReactiveRuntimeConfig.java b/...rc/main/java/io/quarkus/reactive/datasource/runtime/DataSourcesReactiveRuntimeConfig.java
@@ -1,37 +1,59 @@
 package io.quarkus.reactive.datasource.runtime;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefaults;
-import io.smallrye.config.WithName;
 import io.smallrye.config.WithParentName;
+import io.smallrye.config.WithUnnamedKey;
 
 @ConfigMapping(prefix = "quarkus.datasource")
 @ConfigRoot(phase = ConfigPhase.RUN_TIME)
 public interface DataSourcesReactiveRuntimeConfig {
 
+    /**
+     * Datasources.
+     */
+    @ConfigDocMapKey("datasource-name")
+    @WithParentName
+    @WithDefaults
+    @WithUnnamedKey(DataSourceUtil.DEFAULT_DATASOURCE_NAME)
+    Map<String, DataSourceReactiveOuterNamedRuntimeConfig> dataSources();
+
     /**
      * The default datasource.
+     *
+     * @deprecated Use {@code dataSources().get(DataSourceUtil.DEFAULT_DATASOURCE_NAME).reactive()} instead.
      */
-    @WithName("reactive")
-    DataSourceReactiveRuntimeConfig defaultDataSource();
+    @Deprecated
+    default DataSourceReactiveRuntimeConfig defaultDataSource() {
+        return dataSources().get(DataSourceUtil.DEFAULT_DATASOURCE_NAME).reactive();
+    }
 
     /**
      * Additional named datasources.
+     *
+     * @deprecated Use {@code dataSources()} instead -- this will include the default datasource.
      */
-    @ConfigDocSection
-    @ConfigDocMapKey("datasource-name")
-    @WithParentName
-    @WithDefaults
-    Map<String, DataSourceReactiveOuterNamedRuntimeConfig> namedDataSources();
+    @Deprecated
+    default Map<String, DataSourceReactiveOuterNamedRuntimeConfig> namedDataSources() {
+        Map<String, DataSourceReactiveOuterNamedRuntimeConfig> withoutDefault = new HashMap<>(dataSources());
+        withoutDefault.remove(DataSourceUtil.DEFAULT_DATASOURCE_NAME);
+        return withoutDefault;
+    }
 
+    /**
+     * Additional named datasources.
+     *
+     * @deprecated Use {@code dataSources().get(dataSourceName).reactive()} instead.
+     */
+    @Deprecated
     default DataSourceReactiveRuntimeConfig getDataSourceReactiveRuntimeConfig(String dataSourceName) {
         if (DataSourceUtil.isDefault(dataSourceName)) {
             return defaultDataSource();

diff --git a/...t/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java b/...t/src/main/java/io/quarkus/reactive/db2/client/deployment/ReactiveDB2ClientProcessor.java
@@ -253,7 +253,7 @@ private static boolean isReactiveDB2PoolDefined(DataSourcesBuildTimeConfig dataS
         DataSourceBuildTimeConfig dataSourceBuildTimeConfig = dataSourcesBuildTimeConfig
                 .dataSources().get(dataSourceName);
         DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig = dataSourcesReactiveBuildTimeConfig
-                .getDataSourceReactiveBuildTimeConfig(dataSourceName);
+                .dataSources().get(dataSourceName).reactive();
 
         Optional<String> dbKind = DefaultDataSourceDbKindBuildItem.resolve(dataSourceBuildTimeConfig.dbKind(),
                 defaultDataSourceDbKindBuildItems,

diff --git a/...-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java b/...-client/runtime/src/main/java/io/quarkus/reactive/db2/client/runtime/DB2PoolRecorder.java
@@ -66,7 +66,7 @@ public DB2Pool apply(SyntheticCreationalContext<DB2Pool> context) {
                         eventLoopCount.get(),
                         dataSourceName,
                         dataSourcesRuntimeConfig.dataSources().get(dataSourceName),
-                        dataSourcesReactiveRuntimeConfig.getDataSourceReactiveRuntimeConfig(dataSourceName),
+                        dataSourcesReactiveRuntimeConfig.dataSources().get(dataSourceName).reactive(),
                         dataSourcesReactiveDB2Config.dataSources().get(dataSourceName).reactive().db2(),
                         context);
 

diff --git a/...c/main/java/io/quarkus/reactive/mssql/client/deployment/ReactiveMSSQLClientProcessor.java b/...c/main/java/io/quarkus/reactive/mssql/client/deployment/ReactiveMSSQLClientProcessor.java
@@ -251,7 +251,7 @@ private static boolean isReactiveMSSQLPoolDefined(DataSourcesBuildTimeConfig dat
         DataSourceBuildTimeConfig dataSourceBuildTimeConfig = dataSourcesBuildTimeConfig
                 .dataSources().get(dataSourceName);
         DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig = dataSourcesReactiveBuildTimeConfig
-                .getDataSourceReactiveBuildTimeConfig(dataSourceName);
+                .dataSources().get(dataSourceName).reactive();
 
         Optional<String> dbKind = DefaultDataSourceDbKindBuildItem.resolve(dataSourceBuildTimeConfig.dbKind(),
                 defaultDataSourceDbKindBuildItems,

diff --git a/...ent/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/MSSQLPoolRecorder.java b/...ent/runtime/src/main/java/io/quarkus/reactive/mssql/client/runtime/MSSQLPoolRecorder.java
@@ -71,7 +71,7 @@ public MSSQLPool apply(SyntheticCreationalContext<MSSQLPool> context) {
                         eventLoopCount.get(),
                         dataSourceName,
                         dataSourcesRuntimeConfig.dataSources().get(dataSourceName),
-                        dataSourcesReactiveRuntimeConfig.getDataSourceReactiveRuntimeConfig(dataSourceName),
+                        dataSourcesReactiveRuntimeConfig.dataSources().get(dataSourceName).reactive(),
                         dataSourcesReactiveMSSQLConfig.dataSources().get(dataSourceName).reactive().mssql(),
                         context);
 

diff --git a/...c/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java b/...c/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java
@@ -252,7 +252,7 @@ private static boolean isReactiveMySQLPoolDefined(DataSourcesBuildTimeConfig dat
         DataSourceBuildTimeConfig dataSourceBuildTimeConfig = dataSourcesBuildTimeConfig
                 .dataSources().get(dataSourceName);
         DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig = dataSourcesReactiveBuildTimeConfig
-                .getDataSourceReactiveBuildTimeConfig(dataSourceName);
+                .dataSources().get(dataSourceName).reactive();
 
         Optional<String> dbKind = DefaultDataSourceDbKindBuildItem.resolve(dataSourceBuildTimeConfig.dbKind(),
                 defaultDataSourceDbKindBuildItems,

diff --git a/...ent/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java b/...ent/runtime/src/main/java/io/quarkus/reactive/mysql/client/runtime/MySQLPoolRecorder.java
@@ -66,7 +66,7 @@ public MySQLPool apply(SyntheticCreationalContext<MySQLPool> context) {
                         eventLoopCount.get(),
                         dataSourceName,
                         dataSourcesRuntimeConfig.dataSources().get(dataSourceName),
-                        dataSourcesReactiveRuntimeConfig.getDataSourceReactiveRuntimeConfig(dataSourceName),
+                        dataSourcesReactiveRuntimeConfig.dataSources().get(dataSourceName).reactive(),
                         dataSourcesReactiveMySQLConfig.dataSources().get(dataSourceName).reactive().mysql(),
                         context);
 

diff --git a/...main/java/io/quarkus/reactive/oracle/client/deployment/ReactiveOracleClientProcessor.java b/...main/java/io/quarkus/reactive/oracle/client/deployment/ReactiveOracleClientProcessor.java
@@ -253,7 +253,7 @@ private static boolean isReactiveOraclePoolDefined(DataSourcesBuildTimeConfig da
         DataSourceBuildTimeConfig dataSourceBuildTimeConfig = dataSourcesBuildTimeConfig
                 .dataSources().get(dataSourceName);
         DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig = dataSourcesReactiveBuildTimeConfig
-                .getDataSourceReactiveBuildTimeConfig(dataSourceName);
+                .dataSources().get(dataSourceName).reactive();
 
         Optional<String> dbKind = DefaultDataSourceDbKindBuildItem.resolve(dataSourceBuildTimeConfig.dbKind(),
                 defaultDataSourceDbKindBuildItems,

diff --git a/...t/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/OraclePoolRecorder.java b/...t/runtime/src/main/java/io/quarkus/reactive/oracle/client/runtime/OraclePoolRecorder.java
@@ -62,7 +62,7 @@ public OraclePool apply(SyntheticCreationalContext<OraclePool> context) {
                         eventLoopCount.get(),
                         dataSourceName,
                         dataSourcesRuntimeConfig.dataSources().get(dataSourceName),
-                        dataSourcesReactiveRuntimeConfig.getDataSourceReactiveRuntimeConfig(dataSourceName),
+                        dataSourcesReactiveRuntimeConfig.dataSources().get(dataSourceName).reactive(),
                         dataSourcesReactiveOracleConfig.dataSources().get(dataSourceName).reactive().oracle(),
                         context);
 

diff --git a/...ent/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java b/...ent/src/main/java/io/quarkus/reactive/pg/client/deployment/ReactivePgClientProcessor.java
@@ -258,7 +258,7 @@ private static boolean isReactivePostgreSQLPoolDefined(DataSourcesBuildTimeConfi
         DataSourceBuildTimeConfig dataSourceBuildTimeConfig = dataSourcesBuildTimeConfig
                 .dataSources().get(dataSourceName);
         DataSourceReactiveBuildTimeConfig dataSourceReactiveBuildTimeConfig = dataSourcesReactiveBuildTimeConfig
-                .getDataSourceReactiveBuildTimeConfig(dataSourceName);
+                .dataSources().get(dataSourceName).reactive();
 
         Optional<String> dbKind = DefaultDataSourceDbKindBuildItem.resolve(dataSourceBuildTimeConfig.dbKind(),
                 defaultDataSourceDbKindBuildItems,

diff --git a/...pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java b/...pg-client/runtime/src/main/java/io/quarkus/reactive/pg/client/runtime/PgPoolRecorder.java
@@ -65,7 +65,7 @@ public PgPool apply(SyntheticCreationalContext<PgPool> context) {
                         eventLoopCount.get(),
                         dataSourceName,
                         dataSourcesRuntimeConfig.dataSources().get(dataSourceName),
-                        dataSourcesReactiveRuntimeConfig.getDataSourceReactiveRuntimeConfig(dataSourceName),
+                        dataSourcesReactiveRuntimeConfig.dataSources().get(dataSourceName).reactive(),
                         dataSourcesReactivePostgreSQLConfig.dataSources().get(dataSourceName).reactive().postgresql(),
                         context);