Merge JPA module with EclipseLink Module (#1718)

flyrain · web-flow · commit ce3efe6d9e14 · 2025-05-28T18:30:22.000-07:00
diff --git a/README.md b/README.md
@@ -59,7 +59,6 @@ Apache Polaris is organized into the following modules:
   - `polaris-quarkus-server` - The Polaris server runtime
   - `polaris-quarkus-admin-tool` - The Polaris admin & maintenance tool
 - Persistence modules:
-  - `polaris-jpa-model` - The JPA entity definitions
   - `polaris-eclipselink` - The Eclipselink implementation of the MetaStoreManager interface
   - `polaris-relational-jdbc` - The JDBC implementation of BasePersistence to be used via AtomicMetaStoreManager
  
diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
@@ -43,7 +43,6 @@ dependencies {
 
     api(project(":polaris-eclipselink"))
     api(project(":polaris-relational-jdbc"))
-    api(project(":polaris-jpa-model"))
 
     api(project(":polaris-quarkus-admin"))
     api(project(":polaris-quarkus-common"))
diff --git a/extension/persistence/eclipselink/build.gradle.kts b/extension/persistence/eclipselink/build.gradle.kts
@@ -30,7 +30,6 @@ plugins {
 
 dependencies {
   implementation(project(":polaris-core"))
-  implementation(project(":polaris-jpa-model"))
 
   implementation(libs.eclipselink)
 
diff --git a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java
@@ -61,12 +61,12 @@
 import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
 import org.apache.polaris.core.storage.PolarisStorageIntegration;
 import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
-import org.apache.polaris.jpa.models.ModelEntity;
-import org.apache.polaris.jpa.models.ModelEntityActive;
-import org.apache.polaris.jpa.models.ModelEntityChangeTracking;
-import org.apache.polaris.jpa.models.ModelGrantRecord;
-import org.apache.polaris.jpa.models.ModelPolicyMappingRecord;
-import org.apache.polaris.jpa.models.ModelPrincipalSecrets;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPolicyMappingRecord;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java
@@ -38,12 +38,12 @@
 import org.apache.polaris.core.persistence.pagination.PageToken;
 import org.apache.polaris.core.policy.PolarisPolicyMappingRecord;
 import org.apache.polaris.core.policy.PolicyEntity;
-import org.apache.polaris.jpa.models.ModelEntity;
-import org.apache.polaris.jpa.models.ModelEntityActive;
-import org.apache.polaris.jpa.models.ModelEntityChangeTracking;
-import org.apache.polaris.jpa.models.ModelGrantRecord;
-import org.apache.polaris.jpa.models.ModelPolicyMappingRecord;
-import org.apache.polaris.jpa.models.ModelPrincipalSecrets;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPolicyMappingRecord;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisSequenceUtil.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisSequenceUtil.java
@@ -21,7 +21,7 @@
 import jakarta.persistence.*;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.polaris.jpa.models.ModelSequenceId;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId;
 import org.eclipse.persistence.internal.jpa.EntityManagerImpl;
 import org.eclipse.persistence.platform.database.DatabasePlatform;
 import org.eclipse.persistence.platform.database.PostgreSQLPlatform;
diff --git a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntity.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntity.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntityActive.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntityActive.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntityChangeTracking.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelEntityChangeTracking.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelGrantRecord.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelGrantRecord.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelPolicyMappingRecord.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelPolicyMappingRecord.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelPrincipalSecrets.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelPrincipalSecrets.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelSequenceId.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/models/ModelSequenceId.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.polaris.jpa.models;
+package org.apache.polaris.extension.persistence.impl.eclipselink.models;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml b/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml
@@ -25,13 +25,13 @@
 
   <persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
     <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-    <class>org.apache.polaris.jpa.models.ModelEntity</class>
-    <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
-    <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
-    <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
-    <class>org.apache.polaris.jpa.models.ModelPolicyMappingRecord</class>
-    <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
-    <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPolicyMappingRecord</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
     <shared-cache-mode>NONE</shared-cache-mode>
     <properties>
       <property name="jakarta.persistence.jdbc.url"
diff --git a/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java b/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java
@@ -41,7 +41,7 @@
 import org.apache.polaris.core.persistence.BasePolarisMetaStoreManagerTest;
 import org.apache.polaris.core.persistence.PolarisTestMetaStoreManager;
 import org.apache.polaris.core.persistence.transactional.TransactionalMetaStoreManagerImpl;
-import org.apache.polaris.jpa.models.ModelPrincipalSecrets;
+import org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/extension/persistence/jpa-model/build.gradle.kts b/extension/persistence/jpa-model/build.gradle.kts
diff --git a/getting-started/assets/eclipselink/persistence.xml b/getting-started/assets/eclipselink/persistence.xml
@@ -23,14 +23,14 @@
 
   <persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
     <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-    <class>org.apache.polaris.jpa.models.ModelEntity</class>
-    <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
-    <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
-    <class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
-    <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
-    <class>org.apache.polaris.jpa.models.ModelPolicyMappingRecord</class>
-    <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
-    <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityDropped</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPolicyMappingRecord</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
     <shared-cache-mode>NONE</shared-cache-mode>
     <properties>
       <property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://postgres:5432/{realm}"/>
diff --git a/gradle/projects.main.properties b/gradle/projects.main.properties
@@ -34,7 +34,6 @@ polaris-quarkus-admin=quarkus/admin
 polaris-quarkus-common=quarkus/common
 polaris-quarkus-test-commons=quarkus/test-commons
 polaris-eclipselink=extension/persistence/eclipselink
-polaris-jpa-model=extension/persistence/jpa-model
 polaris-relational-jdbc=extension/persistence/relational-jdbc
 polaris-tests=integration-tests
 aggregated-license-report=aggregated-license-report
diff --git a/helm/polaris/ci/fixtures/persistence.yaml b/helm/polaris/ci/fixtures/persistence.yaml
@@ -29,13 +29,13 @@ stringData:
       xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
       <persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
         <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <class>org.apache.polaris.jpa.models.ModelEntity</class>
-        <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
-        <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
-        <class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
-        <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
-        <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
-        <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+        <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+        <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+        <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+        <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityDropped</class>
+        <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+        <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+        <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
         <shared-cache-mode>NONE</shared-cache-mode>
         <properties>
           <property name="jakarta.persistence.jdbc.url"
diff --git a/quarkus/admin/src/testFixtures/java/org/apache/polaris/admintool/PostgresTestResourceLifecycleManager.java b/quarkus/admin/src/testFixtures/java/org/apache/polaris/admintool/PostgresTestResourceLifecycleManager.java
@@ -101,13 +101,13 @@ private Path createPersistenceXml() {
             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
             <persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
               <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-              <class>org.apache.polaris.jpa.models.ModelEntity</class>
-              <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
-              <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
-              <class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
-              <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
-              <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
-              <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+              <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+              <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+              <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+              <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityDropped</class>
+              <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+              <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+              <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
               <shared-cache-mode>NONE</shared-cache-mode>
               <properties>
                 <property name="jakarta.persistence.jdbc.url" value="%s"/>
diff --git a/site/content/in-dev/unreleased/metastores.md b/site/content/in-dev/unreleased/metastores.md
@@ -88,13 +88,13 @@ your H2 configuration using the persistence unit template below:
 ```xml
 <persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
     <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-    <class>org.apache.polaris.jpa.models.ModelEntity</class>
-    <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
-    <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
-    <class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
-    <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
-    <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
-    <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityDropped</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+    <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
     <shared-cache-mode>NONE</shared-cache-mode>
     <properties>
       <property name="jakarta.persistence.jdbc.url"
@@ -128,13 +128,13 @@ The following shows a sample configuration for integrating Polaris with Postgres
 ```xml
 <persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
   <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-  <class>org.apache.polaris.jpa.models.ModelEntity</class>
-  <class>org.apache.polaris.jpa.models.ModelEntityActive</class>
-  <class>org.apache.polaris.jpa.models.ModelEntityChangeTracking</class>
-  <class>org.apache.polaris.jpa.models.ModelEntityDropped</class>
-  <class>org.apache.polaris.jpa.models.ModelGrantRecord</class>
-  <class>org.apache.polaris.jpa.models.ModelPrincipalSecrets</class>
-  <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
+  <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntity</class>
+  <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityActive</class>
+  <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityChangeTracking</class>
+  <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelEntityDropped</class>
+  <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelGrantRecord</class>
+  <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelPrincipalSecrets</class>
+  <class>org.apache.polaris.extension.persistence.impl.eclipselink.models.ModelSequenceId</class>
   <shared-cache-mode>NONE</shared-cache-mode>
   <properties>
     <property name="jakarta.persistence.jdbc.url"
