Skip to content

Commit 7071543

Browse files
authored
Remove unused polarisEventListener field from IcebergCatalogHandler (#3045)
it was added in c3f5001 but then its only usage was removed in d03c717
1 parent 7642d41 commit 7071543

File tree

5 files changed

+0
-15
lines changed

5 files changed

+0
-15
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
import org.apache.polaris.service.catalog.io.StorageAccessConfigProvider;
8585
import org.apache.polaris.service.config.ReservedProperties;
8686
import org.apache.polaris.service.context.catalog.CallContextCatalogFactory;
87-
import org.apache.polaris.service.events.listeners.PolarisEventListener;
8887
import org.apache.polaris.service.http.IcebergHttpUtil;
8988
import org.apache.polaris.service.http.IfNoneMatch;
9089
import org.apache.polaris.service.reporting.PolarisMetricsReporter;
@@ -149,7 +148,6 @@ public class IcebergCatalogAdapter
149148
private final ReservedProperties reservedProperties;
150149
private final CatalogHandlerUtils catalogHandlerUtils;
151150
private final Instance<ExternalCatalogFactory> externalCatalogFactories;
152-
private final PolarisEventListener polarisEventListener;
153151
private final StorageAccessConfigProvider storageAccessConfigProvider;
154152
private final PolarisMetricsReporter metricsReporter;
155153

@@ -168,7 +166,6 @@ public IcebergCatalogAdapter(
168166
ReservedProperties reservedProperties,
169167
CatalogHandlerUtils catalogHandlerUtils,
170168
@Any Instance<ExternalCatalogFactory> externalCatalogFactories,
171-
PolarisEventListener polarisEventListener,
172169
StorageAccessConfigProvider storageAccessConfigProvider,
173170
PolarisMetricsReporter metricsReporter) {
174171
this.diagnostics = diagnostics;
@@ -185,7 +182,6 @@ public IcebergCatalogAdapter(
185182
this.reservedProperties = reservedProperties;
186183
this.catalogHandlerUtils = catalogHandlerUtils;
187184
this.externalCatalogFactories = externalCatalogFactories;
188-
this.polarisEventListener = polarisEventListener;
189185
this.storageAccessConfigProvider = storageAccessConfigProvider;
190186
this.metricsReporter = metricsReporter;
191187
}
@@ -227,7 +223,6 @@ IcebergCatalogHandler newHandlerWrapper(SecurityContext securityContext, String
227223
reservedProperties,
228224
catalogHandlerUtils,
229225
externalCatalogFactories,
230-
polarisEventListener,
231226
storageAccessConfigProvider);
232227
}
233228

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@
109109
import org.apache.polaris.service.catalog.io.StorageAccessConfigProvider;
110110
import org.apache.polaris.service.config.ReservedProperties;
111111
import org.apache.polaris.service.context.catalog.CallContextCatalogFactory;
112-
import org.apache.polaris.service.events.listeners.PolarisEventListener;
113112
import org.apache.polaris.service.http.IcebergHttpUtil;
114113
import org.apache.polaris.service.http.IfNoneMatch;
115114
import org.apache.polaris.service.types.NotificationRequest;
@@ -138,7 +137,6 @@ public class IcebergCatalogHandler extends CatalogHandler implements AutoCloseab
138137
private final CallContextCatalogFactory catalogFactory;
139138
private final ReservedProperties reservedProperties;
140139
private final CatalogHandlerUtils catalogHandlerUtils;
141-
private final PolarisEventListener polarisEventListener;
142140
private final StorageAccessConfigProvider storageAccessConfigProvider;
143141

144142
// Catalog instance will be initialized after authorizing resolver successfully resolves
@@ -163,7 +161,6 @@ public IcebergCatalogHandler(
163161
ReservedProperties reservedProperties,
164162
CatalogHandlerUtils catalogHandlerUtils,
165163
Instance<ExternalCatalogFactory> externalCatalogFactories,
166-
PolarisEventListener polarisEventListener,
167164
StorageAccessConfigProvider storageAccessConfigProvider) {
168165
super(
169166
diagnostics,
@@ -178,7 +175,6 @@ public IcebergCatalogHandler(
178175
this.catalogFactory = catalogFactory;
179176
this.reservedProperties = reservedProperties;
180177
this.catalogHandlerUtils = catalogHandlerUtils;
181-
this.polarisEventListener = polarisEventListener;
182178
this.storageAccessConfigProvider = storageAccessConfigProvider;
183179
}
184180

runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerAuthzTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ private IcebergCatalogHandler newWrapper(
133133
reservedProperties,
134134
catalogHandlerUtils,
135135
emptyExternalCatalogFactory(),
136-
polarisEventListener,
137136
storageAccessConfigProvider);
138137
}
139138

@@ -273,7 +272,6 @@ public void testInsufficientPermissionsPriorToSecretRotation() {
273272
reservedProperties,
274273
catalogHandlerUtils,
275274
emptyExternalCatalogFactory(),
276-
polarisEventListener,
277275
storageAccessConfigProvider);
278276

279277
// a variety of actions are all disallowed because the principal's credentials must be rotated
@@ -311,7 +309,6 @@ public void testInsufficientPermissionsPriorToSecretRotation() {
311309
reservedProperties,
312310
catalogHandlerUtils,
313311
emptyExternalCatalogFactory(),
314-
polarisEventListener,
315312
storageAccessConfigProvider);
316313

317314
doTestSufficientPrivilegeSets(
@@ -1188,7 +1185,6 @@ public <T> T getConfig(PolarisConfiguration<T> config, CatalogEntity catalogEnti
11881185
reservedProperties,
11891186
catalogHandlerUtils,
11901187
emptyExternalCatalogFactory(),
1191-
polarisEventListener,
11921188
storageAccessConfigProvider);
11931189
}
11941190

runtime/service/src/test/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalogHandlerFineGrainedDisabledTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ private IcebergCatalogHandler newWrapper() {
7070
reservedProperties,
7171
catalogHandlerUtils,
7272
emptyExternalCatalogFactory(),
73-
polarisEventListener,
7473
storageAccessConfigProvider);
7574
}
7675

runtime/service/src/testFixtures/java/org/apache/polaris/service/TestServices.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ public String getAuthenticationScheme() {
319319
reservedProperties,
320320
catalogHandlerUtils,
321321
externalCatalogFactory,
322-
polarisEventListener,
323322
storageAccessConfigProvider,
324323
new DefaultMetricsReporter());
325324

0 commit comments

Comments
 (0)