This is an automated email from the ASF dual-hosted git repository. dimas pushed a commit to branch dmitri-tmp1 in repository https://gitbox.apache.org/repos/asf/polaris.git
commit 4fe92d306a52d19d2b0b9e991fbd0107a9e6a41a Author: Michael Collado <[email protected]> AuthorDate: Tue Sep 23 16:35:46 2025 -0700 Fixed unused method reference --- .../persistence/AtomicOperationMetaStoreManager.java | 17 +---------------- .../persistence/dao/entity/ResolvedEntitiesResult.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java index 4f07a1358..3381da9ba 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java @@ -1808,22 +1808,7 @@ public class AtomicOperationMetaStoreManager extends BaseMetaStoreManager { return entities.get(i); } }) - .map( - e -> { - if (e == null) { - return null; - } else { - // load the grant records - final List<PolarisGrantRecord> grantRecordsAsSecurable = - ms.loadAllGrantRecordsOnSecurable(callCtx, e.getCatalogId(), e.getId()); - final List<PolarisGrantRecord> grantRecordsAsGrantee = - e.getType().isGrantee() - ? ms.loadAllGrantRecordsOnGrantee(callCtx, e.getCatalogId(), e.getId()) - : List.of(); - return new ResolvedPolarisEntity( - PolarisEntity.of(e), grantRecordsAsGrantee, grantRecordsAsSecurable); - } - }) + .map(e -> toResolvedPolarisEntity(callCtx, e, ms)) .collect(Collectors.toList()); return new ResolvedEntitiesResult(ret); } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java index 91fc4673a..61eb27da1 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/dao/entity/ResolvedEntitiesResult.java @@ -23,13 +23,10 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; -import org.apache.polaris.core.persistence.ResolvedPolarisEntity; - import java.util.List; +import org.apache.polaris.core.persistence.ResolvedPolarisEntity; -/** - * Response object for the loadResolvedEntities call. - */ +/** Response object for the loadResolvedEntities call. */ public class ResolvedEntitiesResult extends BaseResult { private final List<ResolvedPolarisEntity> resolvedEntities; @@ -45,9 +42,10 @@ public class ResolvedEntitiesResult extends BaseResult { } @JsonCreator - private ResolvedEntitiesResult(@JsonProperty("returnStatus") ReturnStatus returnStatus, - @JsonProperty("extraInformation") String extraInformation, - @JsonProperty("resolvedEntities") List<ResolvedPolarisEntity> resolvedEntities) { + private ResolvedEntitiesResult( + @JsonProperty("returnStatus") ReturnStatus returnStatus, + @JsonProperty("extraInformation") String extraInformation, + @JsonProperty("resolvedEntities") List<ResolvedPolarisEntity> resolvedEntities) { super(returnStatus, extraInformation); this.resolvedEntities = resolvedEntities; }
