Skip to content

Commit b84f462

Browse files
authored
Remove CallContext and its ThreadLocal usage (#589)
1 parent 0a2f9df commit b84f462

File tree

96 files changed

+3714
-4472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3714
-4472
lines changed

extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import jakarta.enterprise.context.ApplicationScoped;
2424
import jakarta.inject.Inject;
2525
import java.nio.file.Path;
26+
import java.time.Clock;
27+
import org.apache.polaris.core.PolarisConfigurationStore;
2628
import org.apache.polaris.core.PolarisDiagnostics;
2729
import org.apache.polaris.core.context.RealmContext;
2830
import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory;
@@ -40,8 +42,24 @@
4042
public class EclipseLinkPolarisMetaStoreManagerFactory
4143
extends LocalPolarisMetaStoreManagerFactory<PolarisEclipseLinkStore> {
4244

43-
@Inject EclipseLinkConfiguration eclipseLinkConfiguration;
44-
@Inject PolarisStorageIntegrationProvider storageIntegrationProvider;
45+
private final EclipseLinkConfiguration eclipseLinkConfiguration;
46+
private final PolarisStorageIntegrationProvider storageIntegrationProvider;
47+
48+
public EclipseLinkPolarisMetaStoreManagerFactory() {
49+
this(null, null, null, null, null);
50+
}
51+
52+
@Inject
53+
public EclipseLinkPolarisMetaStoreManagerFactory(
54+
EclipseLinkConfiguration eclipseLinkConfiguration,
55+
PolarisStorageIntegrationProvider storageIntegrationProvider,
56+
PolarisConfigurationStore configurationStore,
57+
PolarisDiagnostics diagnostics,
58+
Clock clock) {
59+
super(configurationStore, diagnostics, clock);
60+
this.eclipseLinkConfiguration = eclipseLinkConfiguration;
61+
this.storageIntegrationProvider = storageIntegrationProvider;
62+
}
4563

4664
@Override
4765
protected PolarisEclipseLinkStore createBackingStore(@Nonnull PolarisDiagnostics diagnostics) {
@@ -50,14 +68,17 @@ protected PolarisEclipseLinkStore createBackingStore(@Nonnull PolarisDiagnostics
5068

5169
@Override
5270
protected PolarisMetaStoreSession createMetaStoreSession(
53-
@Nonnull PolarisEclipseLinkStore store, @Nonnull RealmContext realmContext) {
71+
@Nonnull PolarisEclipseLinkStore store,
72+
@Nonnull RealmContext realmContext,
73+
@Nonnull PolarisDiagnostics diagnostics) {
5474
return new PolarisEclipseLinkMetaStoreSessionImpl(
5575
store,
5676
storageIntegrationProvider,
5777
realmContext,
5878
configurationFile(),
5979
persistenceUnitName(),
60-
secretsGenerator(realmContext));
80+
secretsGenerator(realmContext),
81+
diagnostics);
6182
}
6283

6384
private String configurationFile() {

0 commit comments

Comments
 (0)