"normalize" the package name on package rules lookup

marko-bekhta · Mar 26, 2024 · e94f9d5 · e94f9d5
1 parent 6974793
commit e94f9d5
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 16 deletions.
diff --git a/...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
@@ -1356,7 +1356,8 @@ public static Map<String, Set<String>> getModelClassesAndPackagesPerPersistenceU
         }
 
         for (String modelPackageName : jpaModel.getAllModelPackageNames()) {
-            Set<String> persistenceUnitNames = packageRules.get(modelPackageName);
+            // Package rules keys are "normalized" package names, so we want to normalize the package on lookup:
+            Set<String> persistenceUnitNames = packageRules.get(normalizePackage(modelPackageName));
             if (persistenceUnitNames == null) {
                 continue;
             }

diff --git a/...io/quarkus/it/jpa/postgresql/Address.java → .../it/jpa/postgresql/defaultpu/Address.java b/...io/quarkus/it/jpa/postgresql/Address.java → .../it/jpa/postgresql/defaultpu/Address.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.Embeddable;
 

diff --git a/.../io/quarkus/it/jpa/postgresql/Animal.java → ...s/it/jpa/postgresql/defaultpu/Animal.java b/.../io/quarkus/it/jpa/postgresql/Animal.java → ...s/it/jpa/postgresql/defaultpu/Animal.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 /**
  * @author Emmanuel Bernard emmanuel@hibernate.org

diff --git a/...o/quarkus/it/jpa/postgresql/Customer.java → ...it/jpa/postgresql/defaultpu/Customer.java b/...o/quarkus/it/jpa/postgresql/Customer.java → ...it/jpa/postgresql/defaultpu/Customer.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;

diff --git a/...kus/it/jpa/postgresql/EntityWithJson.java → .../postgresql/defaultpu/EntityWithJson.java b/...kus/it/jpa/postgresql/EntityWithJson.java → .../postgresql/defaultpu/EntityWithJson.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import java.time.LocalDate;
 

diff --git a/...a/io/quarkus/it/jpa/postgresql/Human.java → ...us/it/jpa/postgresql/defaultpu/Human.java b/...a/io/quarkus/it/jpa/postgresql/Human.java → ...us/it/jpa/postgresql/defaultpu/Human.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.MappedSuperclass;
 

diff --git a/...tgresql/JPAFunctionalityTestEndpoint.java → ...faultpu/JPAFunctionalityTestEndpoint.java b/...tgresql/JPAFunctionalityTestEndpoint.java → ...faultpu/JPAFunctionalityTestEndpoint.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import java.time.LocalDate;
 import java.util.List;

diff --git a/...postgresql/JPATestReflectionEndpoint.java → .../defaultpu/JPATestReflectionEndpoint.java b/...postgresql/JPATestReflectionEndpoint.java → .../defaultpu/JPATestReflectionEndpoint.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import java.io.IOException;
 import java.io.PrintWriter;

diff --git a/...arkus/it/jpa/postgresql/MyUUIDEntity.java → ...pa/postgresql/defaultpu/MyUUIDEntity.java b/...arkus/it/jpa/postgresql/MyUUIDEntity.java → ...pa/postgresql/defaultpu/MyUUIDEntity.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import java.util.UUID;
 

diff --git a/.../postgresql/NotAnEntityNotReferenced.java → ...l/defaultpu/NotAnEntityNotReferenced.java b/.../postgresql/NotAnEntityNotReferenced.java → ...l/defaultpu/NotAnEntityNotReferenced.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 /**
  * Should not be referenced by the code

diff --git a/.../io/quarkus/it/jpa/postgresql/Person.java → ...s/it/jpa/postgresql/defaultpu/Person.java b/.../io/quarkus/it/jpa/postgresql/Person.java → ...s/it/jpa/postgresql/defaultpu/Person.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import java.time.Duration;
 

diff --git a/...s/it/jpa/postgresql/SequencedAddress.java → ...ostgresql/defaultpu/SequencedAddress.java b/...s/it/jpa/postgresql/SequencedAddress.java → ...ostgresql/defaultpu/SequencedAddress.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

diff --git a/.../io/quarkus/it/jpa/postgresql/Status.java → ...s/it/jpa/postgresql/defaultpu/Status.java b/.../io/quarkus/it/jpa/postgresql/Status.java → ...s/it/jpa/postgresql/defaultpu/Status.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 public enum Status {
     LIVING,

diff --git a/...uarkus/it/jpa/postgresql/WorkAddress.java → ...jpa/postgresql/defaultpu/WorkAddress.java b/...uarkus/it/jpa/postgresql/WorkAddress.java → ...jpa/postgresql/defaultpu/WorkAddress.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.Embeddable;
 

diff --git a/...-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/otherpu/EntityWithJsonOtherPU.java b/...-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/otherpu/EntityWithJsonOtherPU.java
@@ -7,6 +7,7 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
+import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.type.SqlTypes;
 
@@ -15,6 +16,8 @@
 import io.quarkus.runtime.annotations.RegisterForReflection;
 
 @Entity
+@Filter(name = "ids-over-zero")
+@Filter(name = "ids-over-zero-inner-package")
 public class EntityWithJsonOtherPU {
     @Id
     @GeneratedValue

diff --git a/...jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/otherpu/inner/package-info.java b/...jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/otherpu/inner/package-info.java
@@ -0,0 +1,4 @@
+@FilterDef(name = "ids-over-zero-inner-package", defaultCondition = "id > 0")
+package io.quarkus.it.jpa.postgresql.otherpu.inner;
+
+import org.hibernate.annotations.FilterDef;
diff --git a/...tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/otherpu/package-info.java b/...tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/otherpu/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * This filter is useless in terms of filtering, but we want to be sure that
+ * Quarkus detects and processes ORM annotations defined at a package level:
+ */
+@FilterDef(name = "ids-over-zero", defaultCondition = "id > 0")
+package io.quarkus.it.jpa.postgresql.otherpu;
+
+import org.hibernate.annotations.FilterDef;
diff --git a/integration-tests/jpa-postgresql/src/main/resources/application.properties b/integration-tests/jpa-postgresql/src/main/resources/application.properties
@@ -3,12 +3,14 @@ quarkus.datasource.password=hibernate_orm_test
 quarkus.datasource.jdbc.url=${postgres.url}
 quarkus.datasource.jdbc.max-size=8
 
-quarkus.hibernate-orm.packages=io.quarkus.it.jpa.postgresql
+quarkus.hibernate-orm.packages=io.quarkus.it.jpa.postgresql.defaultpu
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.database.generation.create-schemas=true
 # Define non-default PU so that we can configure a custom JSON format mapper. The default PU is using the default mapper.
 quarkus.hibernate-orm."other".datasource=<default>
-quarkus.hibernate-orm."other".packages=io.quarkus.it.jpa.postgresql.otherpu
+quarkus.hibernate-orm."other".packages=io.quarkus.it.jpa.postgresql.otherpu,io.quarkus.it.jpa.postgresql.otherpu.inner
+quarkus.hibernate-orm."other".database.generation=drop-and-create
+quarkus.hibernate-orm."other".database.generation.create-schemas=true
 
 #Necessary for assertions in JPAFunctionalityInGraalITCase:
 quarkus.native.enable-reports=true