Move PU-specific test entities into their own packages

marko-bekhta · Mar 27, 2024 · 9d58018 · 9d58018
1 parent d7d237b
commit 9d58018
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 20 deletions.
diff --git a/...esql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java b/...esql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
@@ -32,6 +32,9 @@
 import jakarta.ws.rs.core.MediaType;
 
 import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.it.jpa.postgresql.defaultpu.EntityWithXml;
+import io.quarkus.it.jpa.postgresql.defaultpu.Person;
+import io.quarkus.it.jpa.postgresql.defaultpu.SequencedAddress;
 import io.quarkus.it.jpa.postgresql.otherpu.EntityWithXmlOtherPU;
 import io.quarkus.narayana.jta.QuarkusTransaction;
 

diff --git a/...rkus/it/jpa/postgresql/EntityWithXml.java → ...a/postgresql/defaultpu/EntityWithXml.java b/...rkus/it/jpa/postgresql/EntityWithXml.java → ...a/postgresql/defaultpu/EntityWithXml.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/.../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 jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;

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/integration-tests/jpa-postgresql-withxml/src/main/resources/application.properties b/integration-tests/jpa-postgresql-withxml/src/main/resources/application.properties
@@ -3,7 +3,7 @@ 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
 
 #Necessary for assertions in JPAFunctionalityInGraalITCase:
@@ -14,4 +14,5 @@ quarkus.native.additional-build-args=-J-Dio.quarkus.jdbc.postgresql.graalvm.diag
 
 # Define non-default PU so that we can configure a custom XML 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
+quarkus.hibernate-orm."other".database.generation=drop-and-create
diff --git a/...a-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java b/...a-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
@@ -16,6 +16,10 @@
 import jakarta.ws.rs.core.MediaType;
 
 import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.it.jpa.postgresql.defaultpu.EntityWithJson;
+import io.quarkus.it.jpa.postgresql.defaultpu.MyUUIDEntity;
+import io.quarkus.it.jpa.postgresql.defaultpu.Person;
+import io.quarkus.it.jpa.postgresql.defaultpu.SequencedAddress;
 import io.quarkus.it.jpa.postgresql.otherpu.EntityWithJsonOtherPU;
 import io.quarkus.narayana.jta.QuarkusTransaction;
 

diff --git a/.../jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPATestReflectionEndpoint.java b/.../jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPATestReflectionEndpoint.java
@@ -16,6 +16,11 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
+import io.quarkus.it.jpa.postgresql.defaultpu.Address;
+import io.quarkus.it.jpa.postgresql.defaultpu.Customer;
+import io.quarkus.it.jpa.postgresql.defaultpu.NotAnEntityNotReferenced;
+import io.quarkus.it.jpa.postgresql.defaultpu.WorkAddress;
+
 /**
  * Various tests for the JPA integration.
  * WARNING: these tests will ONLY pass in native mode, as it also verifies reflection non-functionality.
@@ -32,8 +37,9 @@ public String test() throws SQLException, TransformerException, IOException {
         makeSureNonAnnotatedEmbeddableAreAccessibleViaReflection(errors);
         makeSureAnnotatedEmbeddableAreAccessibleViaReflection(errors);
         String packageName = this.getClass().getPackage().getName();
-        makeSureClassAreAccessibleViaReflection(packageName + ".Human", "Unable to enlist @MappedSuperclass", errors);
-        makeSureClassAreAccessibleViaReflection(packageName + ".Animal", "Unable to enlist entity superclass", errors);
+        makeSureClassAreAccessibleViaReflection(packageName + ".defaultpu.Human", "Unable to enlist @MappedSuperclass", errors);
+        makeSureClassAreAccessibleViaReflection(packageName + ".defaultpu.Animal", "Unable to enlist entity superclass",
+                errors);
         if (errors.isEmpty()) {
             return "OK";
         } else {

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/...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/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".database.generation=drop-and-create
+quarkus.hibernate-orm."other".database.generation.create-schemas=true
 
 #Necessary for assertions in JPAFunctionalityInGraalITCase:
 quarkus.native.enable-reports=true