Simplify multiple persistence units configuration

We don't have a prefix in the other extensions so let's try to be consistent and see how it goes.
quarkusio · Aug 17, 2020 · 4d251f4 · 4d251f4
1 parent 1f015cd
commit 4d251f4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/...-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfig.java b/...-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfig.java
@@ -23,9 +23,7 @@ public class HibernateOrmConfig {
      */
     @ConfigDocSection
     @ConfigDocMapKey("persistence-unit-name")
-    // @ConfigItem(name = ConfigItem.PARENT)
-    // TODO MULTI-PUS for now, we keep the `persistence-units` but we will need to discuss it
-    // in most extensions, we decided to drop that part
+    @ConfigItem(name = ConfigItem.PARENT)
     public Map<String, HibernateOrmConfigPersistenceUnit> persistenceUnits;
 
     /**

diff --git a/...m/deployment/src/test/resources/application-multiple-persistence-units-invalid.properties b/...m/deployment/src/test/resources/application-multiple-persistence-units-invalid.properties
@@ -1,7 +1,7 @@
 quarkus.datasource.users.db-kind=h2
 quarkus.datasource.users.jdbc.url=jdbc:h2:tcp://localhost/mem:users;DB_CLOSE_DELAY=-1
 
-quarkus.hibernate-orm.persistence-units."users".dialect=org.hibernate.dialect.H2Dialect
-quarkus.hibernate-orm.persistence-units."users".log.sql=true
-quarkus.hibernate-orm.persistence-units."users".database.generation=drop-and-create
-quarkus.hibernate-orm.persistence-units."users".datasource=users
+quarkus.hibernate-orm."users".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."users".log.sql=true
+quarkus.hibernate-orm."users".database.generation=drop-and-create
+quarkus.hibernate-orm."users".datasource=users
diff --git a/...rnate-orm/deployment/src/test/resources/application-multiple-persistence-units.properties b/...rnate-orm/deployment/src/test/resources/application-multiple-persistence-units.properties
@@ -11,12 +11,12 @@ quarkus.hibernate-orm.dialect=org.hibernate.dialect.H2Dialect
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model
 
-quarkus.hibernate-orm.persistence-units."users".dialect=org.hibernate.dialect.H2Dialect
-quarkus.hibernate-orm.persistence-units."users".database.generation=drop-and-create
-quarkus.hibernate-orm.persistence-units."users".datasource=users
-quarkus.hibernate-orm.persistence-units."users".packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model.user
+quarkus.hibernate-orm."users".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."users".database.generation=drop-and-create
+quarkus.hibernate-orm."users".datasource=users
+quarkus.hibernate-orm."users".packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model.user
 
-quarkus.hibernate-orm.persistence-units."inventory".dialect=org.hibernate.dialect.H2Dialect
-quarkus.hibernate-orm.persistence-units."inventory".database.generation=drop-and-create
-quarkus.hibernate-orm.persistence-units."inventory".datasource=inventory
-quarkus.hibernate-orm.persistence-units."inventory".packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model.inventory
+quarkus.hibernate-orm."inventory".dialect=org.hibernate.dialect.H2Dialect
+quarkus.hibernate-orm."inventory".database.generation=drop-and-create
+quarkus.hibernate-orm."inventory".datasource=inventory
+quarkus.hibernate-orm."inventory".packages=io.quarkus.hibernate.orm.multiplepersistenceunits.model.inventory