Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -149,7 +148,6 @@ public class IcebergCatalogAdapter
private final ReservedProperties reservedProperties;
private final CatalogHandlerUtils catalogHandlerUtils;
private final Instance<ExternalCatalogFactory> externalCatalogFactories;
private final PolarisEventListener polarisEventListener;
private final StorageAccessConfigProvider storageAccessConfigProvider;
private final PolarisMetricsReporter metricsReporter;

Expand All @@ -168,7 +166,6 @@ public IcebergCatalogAdapter(
ReservedProperties reservedProperties,
CatalogHandlerUtils catalogHandlerUtils,
@Any Instance<ExternalCatalogFactory> externalCatalogFactories,
PolarisEventListener polarisEventListener,
StorageAccessConfigProvider storageAccessConfigProvider,
PolarisMetricsReporter metricsReporter) {
this.diagnostics = diagnostics;
Expand All @@ -185,7 +182,6 @@ public IcebergCatalogAdapter(
this.reservedProperties = reservedProperties;
this.catalogHandlerUtils = catalogHandlerUtils;
this.externalCatalogFactories = externalCatalogFactories;
this.polarisEventListener = polarisEventListener;
this.storageAccessConfigProvider = storageAccessConfigProvider;
this.metricsReporter = metricsReporter;
}
Expand Down Expand Up @@ -227,7 +223,6 @@ IcebergCatalogHandler newHandlerWrapper(SecurityContext securityContext, String
reservedProperties,
catalogHandlerUtils,
externalCatalogFactories,
polarisEventListener,
storageAccessConfigProvider);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand All @@ -163,7 +161,6 @@ public IcebergCatalogHandler(
ReservedProperties reservedProperties,
CatalogHandlerUtils catalogHandlerUtils,
Instance<ExternalCatalogFactory> externalCatalogFactories,
PolarisEventListener polarisEventListener,
StorageAccessConfigProvider storageAccessConfigProvider) {
super(
diagnostics,
Expand All @@ -178,7 +175,6 @@ public IcebergCatalogHandler(
this.catalogFactory = catalogFactory;
this.reservedProperties = reservedProperties;
this.catalogHandlerUtils = catalogHandlerUtils;
this.polarisEventListener = polarisEventListener;
this.storageAccessConfigProvider = storageAccessConfigProvider;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ private IcebergCatalogHandler newWrapper(
reservedProperties,
catalogHandlerUtils,
emptyExternalCatalogFactory(),
polarisEventListener,
storageAccessConfigProvider);
}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -311,7 +309,6 @@ public void testInsufficientPermissionsPriorToSecretRotation() {
reservedProperties,
catalogHandlerUtils,
emptyExternalCatalogFactory(),
polarisEventListener,
storageAccessConfigProvider);

doTestSufficientPrivilegeSets(
Expand Down Expand Up @@ -1188,7 +1185,6 @@ public <T> T getConfig(PolarisConfiguration<T> config, CatalogEntity catalogEnti
reservedProperties,
catalogHandlerUtils,
emptyExternalCatalogFactory(),
polarisEventListener,
storageAccessConfigProvider);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ private IcebergCatalogHandler newWrapper() {
reservedProperties,
catalogHandlerUtils,
emptyExternalCatalogFactory(),
polarisEventListener,
storageAccessConfigProvider);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@ public String getAuthenticationScheme() {
reservedProperties,
catalogHandlerUtils,
externalCatalogFactory,
polarisEventListener,
storageAccessConfigProvider,
new DefaultMetricsReporter());

Expand Down