Move inner classes to standalone classes (apache#1095)

gh-yzou · Mar 3, 2025 · 7e4f840 · 7e4f840
1 parent 0dfdffb
commit 7e4f840
Show file tree

Hide file tree

Showing 40 changed files with 884 additions and 586 deletions.
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisGrantManager.java b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisGrantManager.java
@@ -31,7 +31,7 @@
 import org.apache.polaris.core.entity.PolarisEntityCore;
 import org.apache.polaris.core.entity.PolarisGrantRecord;
 import org.apache.polaris.core.entity.PolarisPrivilege;
-import org.apache.polaris.core.persistence.BaseResult;
+import org.apache.polaris.core.persistence.dao.entity.BaseResult;
 
 /** Manage grants for Polaris entities. */
 public interface PolarisGrantManager {

diff --git a/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisSecretsManager.java b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisSecretsManager.java
@@ -24,7 +24,7 @@
 import jakarta.annotation.Nullable;
 import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
-import org.apache.polaris.core.persistence.BaseResult;
+import org.apache.polaris.core.persistence.dao.entity.BaseResult;
 
 /** Manages secrets for Polaris principals. */
 public interface PolarisSecretsManager {

diff --git a/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntity.java
@@ -28,7 +28,7 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
+import org.apache.polaris.core.persistence.dao.entity.EntityResult;
 
 /**
  * For legacy reasons, this class is only a thin facade over PolarisBaseEntity's members/methods. No
@@ -146,7 +146,7 @@ public static PolarisEntity of(PolarisBaseEntity sourceEntity) {
     return null;
   }
 
-  public static PolarisEntity of(PolarisMetaStoreManager.EntityResult result) {
+  public static PolarisEntity of(EntityResult result) {
     if (result.isSuccess()) {
       return new PolarisEntity(result.getEntity());
     }

diff --git a/...rc/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java b/...rc/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
@@ -36,6 +36,8 @@
 import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
 import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
 import org.apache.polaris.core.persistence.cache.EntityCache;
+import org.apache.polaris.core.persistence.dao.entity.BaseResult;
+import org.apache.polaris.core.persistence.dao.entity.EntityResult;
 import org.apache.polaris.core.persistence.transactional.PolarisMetaStoreManagerImpl;
 import org.apache.polaris.core.persistence.transactional.TransactionalPersistence;
 import org.apache.polaris.core.storage.cache.StorageCredentialCache;
@@ -198,7 +200,7 @@ private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm
       CallContext.setCurrentContext(CallContext.of(realmContext, polarisContext));
     }
 
-    PolarisMetaStoreManager.EntityResult preliminaryRootPrincipalLookup =
+    EntityResult preliminaryRootPrincipalLookup =
         metaStoreManager.readEntityByName(
             polarisContext,
             null,
@@ -215,7 +217,7 @@ private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm
 
     metaStoreManager.bootstrapPolarisService(polarisContext);
 
-    PolarisMetaStoreManager.EntityResult rootPrincipalLookup =
+    EntityResult rootPrincipalLookup =
         metaStoreManager.readEntityByName(
             polarisContext,
             null,
@@ -256,7 +258,7 @@ private void checkPolarisServiceBootstrappedForRealm(
       CallContext.setCurrentContext(CallContext.of(realmContext, polarisContext));
     }
 
-    PolarisMetaStoreManager.EntityResult rootPrincipalLookup =
+    EntityResult rootPrincipalLookup =
         metaStoreManager.readEntityByName(
             polarisContext,
             null,

diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
@@ -24,6 +24,7 @@
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
 import org.apache.polaris.core.persistence.cache.EntityCache;
+import org.apache.polaris.core.persistence.dao.entity.BaseResult;
 import org.apache.polaris.core.persistence.transactional.TransactionalPersistence;
 import org.apache.polaris.core.storage.cache.StorageCredentialCache;