From cf5465d055c72879f2994a9edd028f2543552e7f Mon Sep 17 00:00:00 2001 From: Christopher Lambert <1204398+XN137@users.noreply.github.com> Date: Tue, 4 Nov 2025 10:32:33 +0100 Subject: [PATCH] Prefer RealmConfig fields minor cleanup of verbose code --- .../service/admin/PolarisAdminService.java | 20 ++++++------------- .../generic/GenericTableCatalogHandler.java | 2 +- .../catalog/iceberg/IcebergCatalog.java | 4 +--- .../admin/PolarisAdminServiceTest.java | 2 +- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java b/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java index 3aaeafbaf1..b64394844b 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java @@ -518,10 +518,8 @@ private PolarisResolutionManifest authorizeGrantOnTableLikeOperationOrThrow( resolutionManifest.getResolvedPath( identifier, PolarisEntityType.TABLE_LIKE, PolarisEntitySubType.ANY_SUBTYPE, true); boolean rbacForFederatedCatalogsEnabled = - getCurrentPolarisContext() - .getRealmConfig() - .getConfig( - FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS, catalogEntity); + realmConfig.getConfig( + FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS, catalogEntity); if (!(resolutionManifest.getIsPassthroughFacade() && rbacForFederatedCatalogsEnabled) && !subTypes.contains(tableLikeWrapper.getRawLeafEntity().getSubType())) { CatalogHandler.throwNotFoundExceptionForTableLikeEntity(identifier, subTypes); @@ -1698,11 +1696,8 @@ public PrivilegeResult grantPrivilegeOnNamespaceToRole( if (resolvedPathWrapper == null || !resolvedPathWrapper.isFullyResolvedNamespace(catalogName, namespace)) { boolean rbacForFederatedCatalogsEnabled = - getCurrentPolarisContext() - .getRealmConfig() - .getConfig( - FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS, - catalogEntity); + realmConfig.getConfig( + FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS, catalogEntity); if (resolutionManifest.getIsPassthroughFacade() && rbacForFederatedCatalogsEnabled) { resolvedPathWrapper = createSyntheticNamespaceEntities( @@ -2140,11 +2135,8 @@ private PrivilegeResult grantPrivilegeOnTableLikeToRole( if (resolvedPathWrapper == null || !subTypes.contains(resolvedPathWrapper.getRawLeafEntity().getSubType())) { boolean rbacForFederatedCatalogsEnabled = - getCurrentPolarisContext() - .getRealmConfig() - .getConfig( - FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS, - catalogEntity); + realmConfig.getConfig( + FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS, catalogEntity); if (resolutionManifest.getIsPassthroughFacade() && rbacForFederatedCatalogsEnabled) { resolvedPathWrapper = createSyntheticTableLikeEntities( diff --git a/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogHandler.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogHandler.java index eeb8206da0..05d2d16b73 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogHandler.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogHandler.java @@ -87,7 +87,7 @@ protected void initializeCatalog() { .addKeyValue("remoteUrl", connectionConfigInfoDpo.getUri()) .log("Initializing federated catalog"); FeatureConfiguration.enforceFeatureEnabledOrThrow( - callContext.getRealmConfig(), FeatureConfiguration.ENABLE_CATALOG_FEDERATION); + realmConfig, FeatureConfiguration.ENABLE_CATALOG_FEDERATION); GenericTableCatalog federatedCatalog; ConnectionType connectionType = diff --git a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java index 1f94cde9cb..75742412e3 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java @@ -806,9 +806,7 @@ protected ViewOperations newViewOps(TableIdentifier identifier) { @Override public boolean dropView(TableIdentifier identifier) { boolean purge = - callContext - .getRealmConfig() - .getConfig(FeatureConfiguration.PURGE_VIEW_METADATA_ON_DROP, catalogEntity); + realmConfig.getConfig(FeatureConfiguration.PURGE_VIEW_METADATA_ON_DROP, catalogEntity); return dropTableLike(PolarisEntitySubType.ICEBERG_VIEW, identifier, Map.of(), purge) .isSuccess(); diff --git a/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java b/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java index d584dc0bdb..9241bec85f 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java @@ -83,7 +83,7 @@ public class PolarisAdminServiceTest { void setUp() throws Exception { MockitoAnnotations.openMocks(this); when(callContext.getPolarisCallContext()).thenReturn(polarisCallContext); - when(polarisCallContext.getRealmConfig()).thenReturn(realmConfig); + when(callContext.getRealmConfig()).thenReturn(realmConfig); // Default feature configuration - enabled by default when(realmConfig.getConfig(FeatureConfiguration.ENABLE_SUB_CATALOG_RBAC_FOR_FEDERATED_CATALOGS))