Skip to content

Commit

Permalink
Revert "Remove CallContext and its ThreadLocal usage" (#1000)
Browse files Browse the repository at this point in the history
* revert b84f462

* resolve conflicts

* autolint

* autolint

* ...not possible to automatically add a synthetic no-args constructor to an unproxyable bean class.

* fix

* fixed non-quarkus build issues

* fixed non-quarkus build issues

* autolint

* more di issues

* add more producers

* add another producer

* autolint

* change callcontext usage in FileIOFactoryTest

* stablize tests

* autolint

* fix a test

* refactor TableCleanupTaskHandlerTest

* another fix, still npe

* autolint

* only task cleanup is problematic

* autolint

* Stabilize more tests

* autolint

* Avoid propagating old callcontexts across TestServices instances

* testservices update

* autolint

* Revert "autolint"

This reverts commit 66a7f22.

* Revert "testservices update"

This reverts commit 897a5a1.

* changes to taskexecutorimpl

* autolint

---------

Co-authored-by: Dennis Huo <[email protected]>
  • Loading branch information
eric-maynard and dennishuo authored Feb 22, 2025
1 parent ebc559a commit ccf25df
Show file tree
Hide file tree
Showing 100 changed files with 4,318 additions and 3,169 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import java.nio.file.Path;
import java.time.Clock;
import org.apache.polaris.core.PolarisConfigurationStore;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory;
Expand All @@ -44,23 +42,16 @@
public class EclipseLinkPolarisMetaStoreManagerFactory
extends LocalPolarisMetaStoreManagerFactory<PolarisEclipseLinkStore> {

private final EclipseLinkConfiguration eclipseLinkConfiguration;
private final PolarisStorageIntegrationProvider storageIntegrationProvider;
@Inject EclipseLinkConfiguration eclipseLinkConfiguration;
@Inject PolarisStorageIntegrationProvider storageIntegrationProvider;

public EclipseLinkPolarisMetaStoreManagerFactory() {
this(null, null, null, null, null);
protected EclipseLinkPolarisMetaStoreManagerFactory() {
this(null);
}

@Inject
public EclipseLinkPolarisMetaStoreManagerFactory(
EclipseLinkConfiguration eclipseLinkConfiguration,
PolarisStorageIntegrationProvider storageIntegrationProvider,
PolarisConfigurationStore configurationStore,
PolarisDiagnostics diagnostics,
Clock clock) {
super(configurationStore, diagnostics, clock);
this.eclipseLinkConfiguration = eclipseLinkConfiguration;
this.storageIntegrationProvider = storageIntegrationProvider;
protected EclipseLinkPolarisMetaStoreManagerFactory(PolarisDiagnostics diagnostics) {
super(diagnostics);
}

@Override
Expand All @@ -80,8 +71,7 @@ protected PolarisMetaStoreSession createMetaStoreSession(
realmContext,
configurationFile(),
persistenceUnitName(),
secretsGenerator(realmContext, rootCredentialsSet),
diagnostics);
secretsGenerator(realmContext, rootCredentialsSet));
}

private String configurationFile() {
Expand Down
Loading

0 comments on commit ccf25df

Please sign in to comment.