Skip to content

Replace CallContext with RealmConfig in enforceFeatureEnabledOrThrow #2348

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 1 commit into from
Aug 14, 2025
Merged

Replace CallContext with RealmConfig in enforceFeatureEnabledOrThrow #2348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions polaris-core/src/main/java/org/apache/polaris/core/config/FeatureConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.apache.polaris.core.admin.model.AuthenticationParameters;
import org.apache.polaris.core.admin.model.StorageConfigInfo;
import org.apache.polaris.core.connection.ConnectionType;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.persistence.cache.EntityWeigher;

/**
Expand All @@ -48,8 +47,8 @@ protected FeatureConfiguration(
* we want to throw an UnsupportedOperationException if it's not enabled.
*/
public static void enforceFeatureEnabledOrThrow(
CallContext callContext, FeatureConfiguration<Boolean> featureConfig) {
boolean enabled = callContext.getRealmConfig().getConfig(featureConfig);
RealmConfig realmConfig, FeatureConfiguration<Boolean> featureConfig) {
boolean enabled = realmConfig.getConfig(featureConfig);
if (!enabled) {
throw new UnsupportedOperationException("Feature not enabled: " + featureConfig.key());
}
Expand Down
2 changes: 1 addition & 1 deletion runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ public PolarisEntity createCatalog(CreateCatalogRequest catalogRequest) {
.addKeyValue("catalogName", entity.getName())
.log("Creating a federated catalog");
FeatureConfiguration.enforceFeatureEnabledOrThrow(
callContext, FeatureConfiguration.ENABLE_CATALOG_FEDERATION);
callContext.getRealmConfig(), FeatureConfiguration.ENABLE_CATALOG_FEDERATION);
Map<String, UserSecretReference> processedSecretReferences = Map.of();
List<String> supportedAuthenticationTypes =
callContext
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/polaris/service/catalog/generic/GenericTableCatalogAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public GenericTableCatalogAdapter(
private GenericTableCatalogHandler newHandlerWrapper(
SecurityContext securityContext, String prefix) {
FeatureConfiguration.enforceFeatureEnabledOrThrow(
callContext, FeatureConfiguration.ENABLE_GENERIC_TABLES);
callContext.getRealmConfig(), FeatureConfiguration.ENABLE_GENERIC_TABLES);
validatePrincipal(securityContext);

return new GenericTableCatalogHandler(
Expand Down
2 changes: 1 addition & 1 deletion ...rvice/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ protected void initializeCatalog() {
.addKeyValue("remoteUrl", connectionConfigInfoDpo.getUri())
.log("Initializing federated catalog");
FeatureConfiguration.enforceFeatureEnabledOrThrow(
callContext, FeatureConfiguration.ENABLE_CATALOG_FEDERATION);
callContext.getRealmConfig(), FeatureConfiguration.ENABLE_CATALOG_FEDERATION);

Catalog federatedCatalog;
ConnectionType connectionType =
Expand Down
2 changes: 1 addition & 1 deletion ...service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyCatalogAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public PolicyCatalogAdapter(

private PolicyCatalogHandler newHandlerWrapper(SecurityContext securityContext, String prefix) {
FeatureConfiguration.enforceFeatureEnabledOrThrow(
callContext, FeatureConfiguration.ENABLE_POLICY_STORE);
callContext.getRealmConfig(), FeatureConfiguration.ENABLE_POLICY_STORE);
validatePrincipal(securityContext);

return new PolicyCatalogHandler(
Expand Down