diff --git a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogAdapter.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogAdapter.java index 352d1a81cc..1101ccbee5 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogAdapter.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogAdapter.java @@ -84,7 +84,6 @@ import org.apache.polaris.service.catalog.io.StorageAccessConfigProvider; import org.apache.polaris.service.config.ReservedProperties; import org.apache.polaris.service.context.catalog.CallContextCatalogFactory; -import org.apache.polaris.service.events.listeners.PolarisEventListener; import org.apache.polaris.service.http.IcebergHttpUtil; import org.apache.polaris.service.http.IfNoneMatch; import org.apache.polaris.service.reporting.PolarisMetricsReporter; @@ -149,7 +148,6 @@ public class IcebergCatalogAdapter private final ReservedProperties reservedProperties; private final CatalogHandlerUtils catalogHandlerUtils; private final Instance externalCatalogFactories; - private final PolarisEventListener polarisEventListener; private final StorageAccessConfigProvider storageAccessConfigProvider; private final PolarisMetricsReporter metricsReporter; @@ -168,7 +166,6 @@ public IcebergCatalogAdapter( ReservedProperties reservedProperties, CatalogHandlerUtils catalogHandlerUtils, @Any Instance externalCatalogFactories, - PolarisEventListener polarisEventListener, StorageAccessConfigProvider storageAccessConfigProvider, PolarisMetricsReporter metricsReporter) { this.diagnostics = diagnostics; @@ -185,7 +182,6 @@ public IcebergCatalogAdapter( this.reservedProperties = reservedProperties; this.catalogHandlerUtils = catalogHandlerUtils; this.externalCatalogFactories = externalCatalogFactories; - this.polarisEventListener = polarisEventListener; this.storageAccessConfigProvider = storageAccessConfigProvider; this.metricsReporter = metricsReporter; } @@ -227,7 +223,6 @@ IcebergCatalogHandler newHandlerWrapper(SecurityContext securityContext, String reservedProperties, catalogHandlerUtils, externalCatalogFactories, - polarisEventListener, storageAccessConfigProvider); } diff --git a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java index d2e48d2cc0..4f4ab0d1dc 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandler.java @@ -109,7 +109,6 @@ import org.apache.polaris.service.catalog.io.StorageAccessConfigProvider; import org.apache.polaris.service.config.ReservedProperties; import org.apache.polaris.service.context.catalog.CallContextCatalogFactory; -import org.apache.polaris.service.events.listeners.PolarisEventListener; import org.apache.polaris.service.http.IcebergHttpUtil; import org.apache.polaris.service.http.IfNoneMatch; import org.apache.polaris.service.types.NotificationRequest; @@ -138,7 +137,6 @@ public class IcebergCatalogHandler extends CatalogHandler implements AutoCloseab private final CallContextCatalogFactory catalogFactory; private final ReservedProperties reservedProperties; private final CatalogHandlerUtils catalogHandlerUtils; - private final PolarisEventListener polarisEventListener; private final StorageAccessConfigProvider storageAccessConfigProvider; // Catalog instance will be initialized after authorizing resolver successfully resolves @@ -163,7 +161,6 @@ public IcebergCatalogHandler( ReservedProperties reservedProperties, CatalogHandlerUtils catalogHandlerUtils, Instance externalCatalogFactories, - PolarisEventListener polarisEventListener, StorageAccessConfigProvider storageAccessConfigProvider) { super( diagnostics, @@ -178,7 +175,6 @@ public IcebergCatalogHandler( this.catalogFactory = catalogFactory; this.reservedProperties = reservedProperties; this.catalogHandlerUtils = catalogHandlerUtils; - this.polarisEventListener = polarisEventListener; this.storageAccessConfigProvider = storageAccessConfigProvider; } diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerAuthzTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerAuthzTest.java index 34118d6a71..0370575215 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerAuthzTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerAuthzTest.java @@ -133,7 +133,6 @@ private IcebergCatalogHandler newWrapper( reservedProperties, catalogHandlerUtils, emptyExternalCatalogFactory(), - polarisEventListener, storageAccessConfigProvider); } @@ -273,7 +272,6 @@ public void testInsufficientPermissionsPriorToSecretRotation() { reservedProperties, catalogHandlerUtils, emptyExternalCatalogFactory(), - polarisEventListener, storageAccessConfigProvider); // a variety of actions are all disallowed because the principal's credentials must be rotated @@ -311,7 +309,6 @@ public void testInsufficientPermissionsPriorToSecretRotation() { reservedProperties, catalogHandlerUtils, emptyExternalCatalogFactory(), - polarisEventListener, storageAccessConfigProvider); doTestSufficientPrivilegeSets( @@ -1188,7 +1185,6 @@ public T getConfig(PolarisConfiguration config, CatalogEntity catalogEnti reservedProperties, catalogHandlerUtils, emptyExternalCatalogFactory(), - polarisEventListener, storageAccessConfigProvider); } diff --git a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerFineGrainedDisabledTest.java b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerFineGrainedDisabledTest.java index 0b4fcc910e..cc59fb0880 100644 --- a/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerFineGrainedDisabledTest.java +++ b/runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerFineGrainedDisabledTest.java @@ -70,7 +70,6 @@ private IcebergCatalogHandler newWrapper() { reservedProperties, catalogHandlerUtils, emptyExternalCatalogFactory(), - polarisEventListener, storageAccessConfigProvider); } 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 4c910ffbd6..3d40493f8a 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 @@ -319,7 +319,6 @@ public String getAuthenticationScheme() { reservedProperties, catalogHandlerUtils, externalCatalogFactory, - polarisEventListener, storageAccessConfigProvider, new DefaultMetricsReporter());