Enable named data source for hibernate reactive

* Changed error message / log to avoid using the default data source
* Align FastBootHibernateReactivePersistenceProvider to FastBootHibernateReactivePersistenceProvider

Author: lucamolteni

docs/src/main/asciidoc/hibernate-reactive.adoc

@@ -354,6 +354,28 @@ public class SomeTest {
 ----
 ====
 
+[[hr-named-datasource]]
+==== Named data sources
+
+Hibernate Reactive supports having named data sources
+
+[source,properties]
+.Example `{config-file}`
+----
+# datasource configuration
+quarkus.hibernate-orm.datasource = named-datasource
+quarkus.datasource."named-datasource".db-kind" = postgresql
+
+# drop and create the database at startup (use `update` to only update the schema)
+%prod.quarkus.hibernate-orm.schema-management.strategy=drop-and-create
+%prod.quarkus.datasource."named-datasource".reactive" = true
+%prod.quarkus.datasource."named-datasource".username" = quarkus_test
+%prod.quarkus.datasource."named-datasource".password" = quarkus_test
+%prod.quarkus.datasource.reactive.url = vertx-reactive:postgresql://localhost/quarkus_test <1>
+----
+
+When using a named data source, you need to set the `quarkus.hibernate-orm.datasource` property to the name of the data source.
+
 [[hr-limitations]]
 == Limitations and other things you should know
 

extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java

@@ -152,37 +152,43 @@ public void buildReactivePersistenceUnit(
                         "Cannot use persistence.xml with Hibernate Reactive in Quarkus. Must use application.properties instead.");
             }
         }
+        HibernateOrmConfigPersistenceUnit persistenceUnitConfig = hibernateOrmConfig.defaultPersistenceUnit();
+
+        String datasourceNameFromConf = persistenceUnitConfig.datasource().orElse(DataSourceUtil.DEFAULT_DATASOURCE_NAME);
 
-        // we only support the default pool for now
         DataSourceBuildTimeConfig defaultDataSourceBuildTimeConfig = dataSourcesBuildTimeConfig.dataSources()
                 .get(DataSourceUtil.DEFAULT_DATASOURCE_NAME);
 
+        DataSourceBuildTimeConfig dataSourceBuildTimeConfig = dataSourcesBuildTimeConfig.dataSources()
+                .get(datasourceNameFromConf);
+
+        Optional<String> datasourceName = Optional.of(datasourceNameFromConf);
         Optional<String> explicitDialect = hibernateOrmConfig.defaultPersistenceUnit().dialect().dialect();
         Optional<String> explicitDbMinVersion = defaultDataSourceBuildTimeConfig.dbVersion();
         Optional<String> dbKindOptional = DefaultDataSourceDbKindBuildItem.resolve(
-                defaultDataSourceBuildTimeConfig.dbKind(),
+                dataSourceBuildTimeConfig.dbKind(),
                 defaultDataSourceDbKindBuildItems,
                 defaultDataSourceBuildTimeConfig.devservices().enabled()
                         .orElse(!dataSourcesBuildTimeConfig.hasNamedDataSources()),
                 curateOutcomeBuildItem);
+        Optional<String> dbVersion = dataSourceBuildTimeConfig.dbVersion();
 
         if (dbKindOptional.isEmpty()) {
             throw new ConfigurationException(
-                    "The default datasource must be configured for Hibernate Reactive. Refer to https://quarkus.io/guides/datasource for guidance.",
+                    "The datasource must be configured for Hibernate Reactive. Refer to https://quarkus.io/guides/datasource for guidance.",
                     Set.of("quarkus.datasource.db-kind", "quarkus.datasource.username",
                             "quarkus.datasource.password"));
         }
 
         // We only support Hibernate Reactive with a reactive data source, otherwise we don't configure the PU
         DataSourcesReactiveBuildTimeConfig.DataSourceReactiveOuterNamedBuildTimeConfig dataSourceReactiveBuildTimeConfig = dataSourcesReactiveBuildTimeConfig
-                .dataSources().get(DataSourceUtil.DEFAULT_DATASOURCE_NAME);
+                .dataSources().get(datasourceNameFromConf);
 
         if (dataSourceReactiveBuildTimeConfig == null || !dataSourceReactiveBuildTimeConfig.reactive().enabled()) {
-            LOG.warn("Hibernate Reactive is disabled because the default datasource is not reactive");
+            LOG.warn("Hibernate Reactive is disabled because the datasource is not reactive");
             return;
         }
 
-        HibernateOrmConfigPersistenceUnit persistenceUnitConfig = hibernateOrmConfig.defaultPersistenceUnit();
         QuarkusPersistenceUnitDescriptor reactivePU = generateReactivePersistenceUnit(
                 hibernateOrmConfig, index, persistenceUnitConfig, jpaModel,
                 dbKindOptional, explicitDialect, explicitDbMinVersion, applicationArchivesBuildItem,
@@ -201,8 +207,10 @@ public void buildReactivePersistenceUnit(
         // - we don't support starting Hibernate Reactive from a persistence.xml
         // - we don't support Hibernate Envers with Hibernate Reactive
         persistenceUnitDescriptors.produce(new PersistenceUnitDescriptorBuildItem(reactivePU,
-                new RecordedConfig(Optional.of(DataSourceUtil.DEFAULT_DATASOURCE_NAME),
-                        dbKindOptional, Optional.empty(),
+                new RecordedConfig(
+                        datasourceName,
+                        dbKindOptional,
+                        dbVersion,
                         persistenceUnitConfig.dialect().dialect(),
                         io.quarkus.hibernate.orm.runtime.migration.MultiTenancyStrategy.NONE,
                         hibernateOrmConfig.database().ormCompatibilityVersion(),

extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/compatibility/ORMReactiveCompatbilityNamedDataSourceBothUnitTest.java

@@ -1,18 +1,16 @@
 package io.quarkus.hibernate.reactive.compatibility;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.util.List;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.builder.Version;
 import io.quarkus.hibernate.reactive.entities.Hero;
 import io.quarkus.maven.dependency.Dependency;
-import io.quarkus.runtime.configuration.ConfigurationException;
 import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.vertx.RunOnVertxContext;
+import io.quarkus.test.vertx.UniAsserter;
 
 public class ORMReactiveCompatbilityNamedDataSourceBothUnitTest extends CompatibilityUnitTestBase {
 
@@ -30,19 +28,16 @@ public class ORMReactiveCompatbilityNamedDataSourceBothUnitTest extends Compatib
             .overrideConfigKey("quarkus.datasource.\"named-datasource\".reactive", "true")
             .overrideConfigKey("quarkus.datasource.\"named-datasource\".db-kind", POSTGRES_KIND)
             .overrideConfigKey("quarkus.datasource.\"named-datasource\".username", USERNAME_PWD)
-            .overrideConfigKey("quarkus.datasource.\"named-datasource\".password", USERNAME_PWD)
-            .assertException(t -> assertThat(t)
-                    .isInstanceOf(ConfigurationException.class)
-                    .hasMessageContainingAll(
-                            // Hibernate Reactive doesn't support explicitly setting the datasource (yet),
-                            // so it will just notice the default datasource is not configured!
-                            "The default datasource must be configured for Hibernate Reactive",
-                            "Refer to https://quarkus.io/guides/datasource for guidance."));
+            .overrideConfigKey("quarkus.datasource.\"named-datasource\".password", USERNAME_PWD);
 
     @Test
-    public void test() {
-        // deployment exception should happen first
-        Assertions.fail();
+    @RunOnVertxContext
+    public void test(UniAsserter uniAsserter) {
+        testReactiveWorks(uniAsserter);
     }
 
+    @Test
+    public void testBlocking() {
+        testBlockingWorks();
+    }
 }

extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/compatibility/ORMReactiveCompatbilityNamedDataSourceNamedPersistenceUnitBothUnitTest.java

@@ -35,9 +35,10 @@ public class ORMReactiveCompatbilityNamedDataSourceNamedPersistenceUnitBothUnitT
             .assertException(t -> assertThat(t)
                     .isInstanceOf(ConfigurationException.class)
                     .hasMessageContainingAll(
-                            // Hibernate Reactive doesn't support explicitly setting the datasource (yet),
-                            // so it will just notice the default datasource is not configured!
-                            "The default datasource must be configured for Hibernate Reactive",
+                            // Hibernate Reactive doesn't support named persistence unit
+                            // so it will just notice the datasource is not configured!
+                            // We probably need a better error message when named persistence unit is supported
+                            "The datasource must be configured for Hibernate Reactive",
                             "Refer to https://quarkus.io/guides/datasource for guidance."));
 
     @Test

extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/compatibility/ORMReactiveCompatbilityNamedDataSourceReactiveUnitTest.java

@@ -0,0 +1,43 @@
+package io.quarkus.hibernate.reactive.compatibility;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import jakarta.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.hibernate.reactive.entities.Hero;
+import io.quarkus.reactive.datasource.ReactiveDataSource;
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.vertx.RunOnVertxContext;
+import io.quarkus.test.vertx.UniAsserter;
+import io.vertx.sqlclient.Pool;
+
+public class ORMReactiveCompatbilityNamedDataSourceReactiveUnitTest extends CompatibilityUnitTestBase {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(Hero.class)
+                    .addAsResource("complexMultilineImports.sql", "import.sql"))
+            .withConfigurationResource("application-unittest-onlyreactive-named.properties")
+            .overrideConfigKey("quarkus.hibernate-orm.schema-management.strategy", SCHEMA_MANAGEMENT_STRATEGY)
+            .overrideConfigKey("quarkus.hibernate-orm.datasource", "named-datasource")
+            .overrideConfigKey("quarkus.datasource.\"named-datasource\".reactive", "true")
+            .overrideConfigKey("quarkus.datasource.\"named-datasource\".db-kind", POSTGRES_KIND)
+            .overrideConfigKey("quarkus.datasource.\"named-datasource\".username", USERNAME_PWD)
+            .overrideConfigKey("quarkus.datasource.\"named-datasource\".password", USERNAME_PWD);
+
+    @Inject
+    @ReactiveDataSource("named-datasource")
+    Pool pool;
+
+    @Test
+    @RunOnVertxContext
+    public void test(UniAsserter uniAsserter) {
+        testReactiveWorks(uniAsserter);
+        assertThat(pool).isNotNull();
+    }
+
+}

extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithExplicitDatasourceConfigActiveFalseTest.java

@@ -1,5 +1,6 @@
 package io.quarkus.hibernate.reactive.config.datasource;
 
+import static io.quarkus.datasource.common.runtime.DatabaseKind.POSTGRESQL;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Assertions;
@@ -21,13 +22,11 @@ public class EntitiesInDefaultPUWithExplicitDatasourceConfigActiveFalseTest {
             .overrideConfigKey("quarkus.datasource.\"ds-1\".active", "false")
             // We need at least one build-time property for the datasource,
             // otherwise it's considered unconfigured at build time...
-            .overrideConfigKey("quarkus.datasource.\"ds-1\".db-kind", "h2")
+            .overrideConfigKey("quarkus.datasource.\"ds-1\".db-kind", POSTGRESQL)
             .assertException(t -> assertThat(t)
                     .isInstanceOf(ConfigurationException.class)
                     .hasMessageContainingAll(
-                            // Hibernate Reactive doesn't support explicitly setting the datasource (yet),
-                            // so it will just notice the default datasource is not configured!
-                            "The default datasource must be configured for Hibernate Reactive",
+                            "Datasource 'ds-1' was deactivated through configuration properties. To activate the datasource, set configuration property 'quarkus.datasource.\"ds-1\".active' to 'true' and configure datasource 'ds-1'",
                             "Refer to https://quarkus.io/guides/datasource for guidance."));
 
     @Test

extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithExplicitDatasourceConfigUrlMissingTest.java

@@ -1,5 +1,6 @@
 package io.quarkus.hibernate.reactive.config.datasource;
 
+import static io.quarkus.datasource.common.runtime.DatabaseKind.POSTGRESQL;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Assertions;
@@ -22,13 +23,13 @@ public class EntitiesInDefaultPUWithExplicitDatasourceConfigUrlMissingTest {
             .overrideConfigKey("quarkus.devservices.enabled", "false")
             // We need at least one build-time property for the datasource,
             // otherwise it's considered unconfigured at build time...
-            .overrideConfigKey("quarkus.datasource.ds-1.db-kind", "h2")
+            .overrideConfigKey("quarkus.datasource.ds-1.db-kind", POSTGRESQL)
             .assertException(t -> assertThat(t)
                     .isInstanceOf(ConfigurationException.class)
                     .hasMessageContainingAll(
                             // Hibernate Reactive doesn't support explicitly setting the datasource (yet),
-                            // so it will just notice the default datasource is not configured!
-                            "The default datasource must be configured for Hibernate Reactive",
+                            // so it will just notice the datasource is not configured!
+                            "Datasource 'ds-1' was deactivated automatically because its URL is not set. To activate the datasource, set configuration property 'quarkus.datasource.\"ds-1\".reactive.url'",
                             "Refer to https://quarkus.io/guides/datasource for guidance."));
 
     @Test

extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithExplicitDatasourceMissingTest.java

@@ -31,8 +31,8 @@ public class EntitiesInDefaultPUWithExplicitDatasourceMissingTest {
                     .isInstanceOf(ConfigurationException.class)
                     .hasMessageContainingAll(
                             // Hibernate Reactive doesn't support explicitly setting the datasource (yet),
-                            // so it will just notice the default datasource is not configured!
-                            "The default datasource must be configured for Hibernate Reactive",
+                            // so it will just notice the datasource is not configured!
+                            "The datasource must be configured for Hibernate Reactive",
                             "Refer to https://quarkus.io/guides/datasource for guidance."));
 
     @Test

extensions/hibernate-reactive/deployment/src/test/java/io/quarkus/hibernate/reactive/config/datasource/EntitiesInDefaultPUWithImplicitDatasourceConfigUrlMissingTest.java

@@ -30,7 +30,7 @@ public class EntitiesInDefaultPUWithImplicitDatasourceConfigUrlMissingTest {
             .assertException(t -> assertThat(t)
                     .isInstanceOf(ConfigurationException.class)
                     .hasMessageContainingAll(
-                            "The default datasource must be configured for Hibernate Reactive",
+                            "The datasource must be configured for Hibernate Reactive",
                             "Refer to https://quarkus.io/guides/datasource for guidance."));
 
     @Test

extensions/hibernate-reactive/deployment/src/test/resources/application-unittest-onlyreactive-named.properties

@@ -0,0 +1 @@
+quarkus.datasource."named-datasource".reactive.url=${postgres.reactive.url}