Skip to content

Move inner classes to standalone classes #1095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flyrain merged 3 commits into from
Mar 3, 2025
Merged

Move inner classes to standalone classes #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8cae88
Move inner classes to standalone classes
Mar 3, 2025
8a2c348
Resolve comments
Mar 3, 2025
b59ad22
resolve comments
Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisGrantManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisSecretsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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());
}
Expand Down
8 changes: 5 additions & 3 deletions ...rc/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -198,7 +200,7 @@ private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm
CallContext.setCurrentContext(CallContext.of(realmContext, polarisContext));
}

PolarisMetaStoreManager.EntityResult preliminaryRootPrincipalLookup =
EntityResult preliminaryRootPrincipalLookup =
metaStoreManager.readEntityByName(
polarisContext,
null,
Expand All @@ -215,7 +217,7 @@ private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm

metaStoreManager.bootstrapPolarisService(polarisContext);

PolarisMetaStoreManager.EntityResult rootPrincipalLookup =
EntityResult rootPrincipalLookup =
metaStoreManager.readEntityByName(
polarisContext,
null,
Expand Down Expand Up @@ -256,7 +258,7 @@ private void checkPolarisServiceBootstrappedForRealm(
CallContext.setCurrentContext(CallContext.of(realmContext, polarisContext));
}

PolarisMetaStoreManager.EntityResult rootPrincipalLookup =
EntityResult rootPrincipalLookup =
metaStoreManager.readEntityByName(
polarisContext,
null,
Expand Down
1 change: 1 addition & 0 deletions polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading