From 4eb335855cd296523f2c6686c2955e4b41338a33 Mon Sep 17 00:00:00 2001 From: Dmitri Bourlatchkov Date: Mon, 13 Jul 2026 13:03:54 -0400 Subject: [PATCH] Move CatalogConfigEndpointContributor to `runtime/service` Following up on #4926: * `CatalogConfigEndpointContributor` has no use cases in `polaris-core`. * `CatalogConfigEndpointContributor` is effectively an SPI for the IRC implementation service code (it is not a "core" SPI) * No changes to existing module dependencies. --- .../catalog/semanticmodel/SemanticModelConfigEndpoints.java | 2 +- .../polaris/service/catalog/config/CatalogConfigHandler.java | 2 +- .../service/catalog/generic/GenericTableConfigEndpoints.java | 2 +- .../service/catalog/iceberg/IcebergRestConfigEndpoints.java | 2 +- .../service/catalog/iceberg/IcebergViewConfigEndpoints.java | 2 +- .../polaris/service/catalog/policy/PolicyConfigEndpoints.java | 2 +- .../service/catalog/spi}/CatalogConfigEndpointContributor.java | 2 +- .../java/org/apache/polaris/service/TestServices.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename {polaris-core/src/main/java/org/apache/polaris/core/rest => runtime/service/src/main/java/org/apache/polaris/service/catalog/spi}/CatalogConfigEndpointContributor.java (96%) diff --git a/extensions/semantic-models/src/main/java/org/apache/polaris/service/catalog/semanticmodel/SemanticModelConfigEndpoints.java b/extensions/semantic-models/src/main/java/org/apache/polaris/service/catalog/semanticmodel/SemanticModelConfigEndpoints.java index 8922a637e0..e69bf6c7b4 100644 --- a/extensions/semantic-models/src/main/java/org/apache/polaris/service/catalog/semanticmodel/SemanticModelConfigEndpoints.java +++ b/extensions/semantic-models/src/main/java/org/apache/polaris/service/catalog/semanticmodel/SemanticModelConfigEndpoints.java @@ -26,7 +26,7 @@ import org.apache.iceberg.rest.Endpoint; import org.apache.polaris.core.config.FeatureConfiguration; import org.apache.polaris.core.config.RealmConfig; -import org.apache.polaris.core.rest.CatalogConfigEndpointContributor; +import org.apache.polaris.service.catalog.spi.CatalogConfigEndpointContributor; @ApplicationScoped @Priority(500) diff --git a/runtime/service/src/main/java/org/apache/polaris/service/catalog/config/CatalogConfigHandler.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/config/CatalogConfigHandler.java index 587c895b4d..85de335d12 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/catalog/config/CatalogConfigHandler.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/config/CatalogConfigHandler.java @@ -40,9 +40,9 @@ import org.apache.polaris.core.persistence.resolver.Resolver; import org.apache.polaris.core.persistence.resolver.ResolverFactory; import org.apache.polaris.core.persistence.resolver.ResolverStatus; -import org.apache.polaris.core.rest.CatalogConfigEndpointContributor; import org.apache.polaris.core.rest.NamespaceUtils; import org.apache.polaris.service.catalog.CatalogPrefixParser; +import org.apache.polaris.service.catalog.spi.CatalogConfigEndpointContributor; @RequestScoped public class CatalogConfigHandler { diff --git a/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableConfigEndpoints.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableConfigEndpoints.java index 2d68c25e3e..0a38adae97 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableConfigEndpoints.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/generic/GenericTableConfigEndpoints.java @@ -26,8 +26,8 @@ import org.apache.iceberg.rest.Endpoint; import org.apache.polaris.core.config.FeatureConfiguration; import org.apache.polaris.core.config.RealmConfig; -import org.apache.polaris.core.rest.CatalogConfigEndpointContributor; import org.apache.polaris.core.rest.GenericTableEndpoints; +import org.apache.polaris.service.catalog.spi.CatalogConfigEndpointContributor; @ApplicationScoped @Priority(300) diff --git a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergRestConfigEndpoints.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergRestConfigEndpoints.java index f2da605c3a..a91a1e0b7e 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergRestConfigEndpoints.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergRestConfigEndpoints.java @@ -23,7 +23,7 @@ import jakarta.enterprise.context.ApplicationScoped; import java.util.Set; import org.apache.iceberg.rest.Endpoint; -import org.apache.polaris.core.rest.CatalogConfigEndpointContributor; +import org.apache.polaris.service.catalog.spi.CatalogConfigEndpointContributor; @ApplicationScoped @Priority(100) diff --git a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergViewConfigEndpoints.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergViewConfigEndpoints.java index aecf88d730..a8bd2d3cb9 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergViewConfigEndpoints.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergViewConfigEndpoints.java @@ -23,7 +23,7 @@ import jakarta.enterprise.context.ApplicationScoped; import java.util.Set; import org.apache.iceberg.rest.Endpoint; -import org.apache.polaris.core.rest.CatalogConfigEndpointContributor; +import org.apache.polaris.service.catalog.spi.CatalogConfigEndpointContributor; @ApplicationScoped @Priority(200) diff --git a/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyConfigEndpoints.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyConfigEndpoints.java index f17927a40d..067befac43 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyConfigEndpoints.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/policy/PolicyConfigEndpoints.java @@ -26,7 +26,7 @@ import org.apache.iceberg.rest.Endpoint; import org.apache.polaris.core.config.FeatureConfiguration; import org.apache.polaris.core.config.RealmConfig; -import org.apache.polaris.core.rest.CatalogConfigEndpointContributor; +import org.apache.polaris.service.catalog.spi.CatalogConfigEndpointContributor; @ApplicationScoped @Priority(400) diff --git a/polaris-core/src/main/java/org/apache/polaris/core/rest/CatalogConfigEndpointContributor.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/spi/CatalogConfigEndpointContributor.java similarity index 96% rename from polaris-core/src/main/java/org/apache/polaris/core/rest/CatalogConfigEndpointContributor.java rename to runtime/service/src/main/java/org/apache/polaris/service/catalog/spi/CatalogConfigEndpointContributor.java index 4e93f2656e..4ec43bd2e6 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/rest/CatalogConfigEndpointContributor.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/spi/CatalogConfigEndpointContributor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.polaris.core.rest; +package org.apache.polaris.service.catalog.spi; import java.util.Set; import org.apache.iceberg.rest.Endpoint; diff --git a/runtime/service/src/testFixtures/java/org/apache/polaris/service/TestServices.java b/runtime/service/src/testFixtures/java/org/apache/polaris/service/TestServices.java index 6f5203e8c0..53375902f8 100644 --- a/runtime/service/src/testFixtures/java/org/apache/polaris/service/TestServices.java +++ b/runtime/service/src/testFixtures/java/org/apache/polaris/service/TestServices.java @@ -64,7 +64,6 @@ import org.apache.polaris.core.persistence.resolver.ResolutionManifestFactoryImpl; import org.apache.polaris.core.persistence.resolver.Resolver; import org.apache.polaris.core.persistence.resolver.ResolverFactory; -import org.apache.polaris.core.rest.CatalogConfigEndpointContributor; import org.apache.polaris.core.secrets.UserSecretsManager; import org.apache.polaris.core.secrets.UserSecretsManagerFactory; import org.apache.polaris.core.storage.cache.StorageCredentialCache; @@ -100,6 +99,7 @@ import org.apache.polaris.service.catalog.io.MeasuredFileIOFactory; import org.apache.polaris.service.catalog.io.StorageAccessConfigProvider; import org.apache.polaris.service.catalog.policy.PolicyConfigEndpoints; +import org.apache.polaris.service.catalog.spi.CatalogConfigEndpointContributor; import org.apache.polaris.service.config.ReservedProperties; import org.apache.polaris.service.context.catalog.PolarisLocalCatalogFactory; import org.apache.polaris.service.credentials.DefaultPolarisCredentialManager;