Skip to content

Commit fac650a

Browse files
authored
Replace CallContext with RealmConfig in enforceFeatureEnabledOrThrow (#2348)
1 parent b2b1453 commit fac650a

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

polaris-core/src/main/java/org/apache/polaris/core/config/FeatureConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.polaris.core.admin.model.AuthenticationParameters;
2424
import org.apache.polaris.core.admin.model.StorageConfigInfo;
2525
import org.apache.polaris.core.connection.ConnectionType;
26-
import org.apache.polaris.core.context.CallContext;
2726
import org.apache.polaris.core.persistence.cache.EntityWeigher;
2827

2928
/**
@@ -48,8 +47,8 @@ protected FeatureConfiguration(
4847
* we want to throw an UnsupportedOperationException if it's not enabled.
4948
*/
5049
public static void enforceFeatureEnabledOrThrow(
51-
CallContext callContext, FeatureConfiguration<Boolean> featureConfig) {
52-
boolean enabled = callContext.getRealmConfig().getConfig(featureConfig);
50+
RealmConfig realmConfig, FeatureConfiguration<Boolean> featureConfig) {
51+
boolean enabled = realmConfig.getConfig(featureConfig);
5352
if (!enabled) {
5453
throw new UnsupportedOperationException("Feature not enabled: " + featureConfig.key());
5554
}

runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ public PolarisEntity createCatalog(CreateCatalogRequest catalogRequest) {
783783
.addKeyValue("catalogName", entity.getName())
784784
.log("Creating a federated catalog");
785785
FeatureConfiguration.enforceFeatureEnabledOrThrow(
786-
callContext, FeatureConfiguration.ENABLE_CATALOG_FEDERATION);
786+
callContext.getRealmConfig(), FeatureConfiguration.ENABLE_CATALOG_FEDERATION);
787787
Map<String, UserSecretReference> processedSecretReferences = Map.of();
788788
List<String> supportedAuthenticationTypes =
789789
callContext

runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public GenericTableCatalogAdapter(
7474
private GenericTableCatalogHandler newHandlerWrapper(
7575
SecurityContext securityContext, String prefix) {
7676
FeatureConfiguration.enforceFeatureEnabledOrThrow(
77-
callContext, FeatureConfiguration.ENABLE_GENERIC_TABLES);
77+
callContext.getRealmConfig(), FeatureConfiguration.ENABLE_GENERIC_TABLES);
7878
validatePrincipal(securityContext);
7979

8080
return new GenericTableCatalogHandler(

runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ protected void initializeCatalog() {
212212
.addKeyValue("remoteUrl", connectionConfigInfoDpo.getUri())
213213
.log("Initializing federated catalog");
214214
FeatureConfiguration.enforceFeatureEnabledOrThrow(
215-
callContext, FeatureConfiguration.ENABLE_CATALOG_FEDERATION);
215+
callContext.getRealmConfig(), FeatureConfiguration.ENABLE_CATALOG_FEDERATION);
216216

217217
Catalog federatedCatalog;
218218
ConnectionType connectionType =

runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public PolicyCatalogAdapter(
7474

7575
private PolicyCatalogHandler newHandlerWrapper(SecurityContext securityContext, String prefix) {
7676
FeatureConfiguration.enforceFeatureEnabledOrThrow(
77-
callContext, FeatureConfiguration.ENABLE_POLICY_STORE);
77+
callContext.getRealmConfig(), FeatureConfiguration.ENABLE_POLICY_STORE);
7878
validatePrincipal(securityContext);
7979

8080
return new PolicyCatalogHandler(

0 commit comments

Comments
 (0)