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 @@ -29,7 +29,6 @@
import org.eclipse.edc.spi.EdcException;
import org.eclipse.edc.spi.security.Vault;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;

import java.util.stream.Stream;

Expand Down Expand Up @@ -58,7 +57,7 @@ public String name() {
}

@Provider
public Vault createInMemVault(ServiceExtensionContext context) {
public Vault createInMemVault() {

if (seedSecrets != null) {
singleParticipantContextSupplier.get().map(ParticipantContext::getParticipantContextId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void createInMemVault_validString(String secret, ServiceExtensionContext context

var extension = factory.constructInstance(VaultSeedExtension.class);

extension.createInMemVault(context);
extension.createInMemVault();
verify(monitor, times(1)).debug(anyString());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.eclipse.edc.runtime.metamodel.annotation.Provider;
import org.eclipse.edc.runtime.metamodel.annotation.Setting;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.types.TypeManager;
import org.eclipse.edc.sql.QueryExecutor;
import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
Expand Down Expand Up @@ -60,7 +59,7 @@ public class SqlAgreementsBpnsStoreExtension implements ServiceExtension {
private SqlAgreementsBpnsStatements statements;

@Provider
public AgreementsBpnsStore sqlStore(ServiceExtensionContext context) {
public AgreementsBpnsStore sqlStore() {
return new SqlAgreementsBpnsStore(dataSourceRegistry, dataSourceName, transactionContext,
typeManager.getMapper(), queryExecutor, getStatements());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.eclipse.edc.runtime.metamodel.annotation.Provider;
import org.eclipse.edc.runtime.metamodel.annotation.Setting;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.types.TypeManager;
import org.eclipse.edc.sql.QueryExecutor;
import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
Expand Down Expand Up @@ -60,7 +59,7 @@ public class SqlAgreementsRetirementStoreExtension implements ServiceExtension {
private SqlAgreementsRetirementStatements statements;

@Provider
public AgreementsRetirementStore sqlStore(ServiceExtensionContext context) {
public AgreementsRetirementStore sqlStore() {
return new SqlAgreementsRetirementStore(dataSourceRegistry, dataSourceName, transactionContext,
typeManager.getMapper(), queryExecutor, getStatements());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.eclipse.edc.runtime.metamodel.annotation.Provider;
import org.eclipse.edc.runtime.metamodel.annotation.Setting;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.types.TypeManager;
import org.eclipse.edc.sql.QueryExecutor;
import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
Expand Down Expand Up @@ -55,7 +54,7 @@ public class SqlBusinessPartnerGroupStoreExtension implements ServiceExtension {
private BusinessPartnerGroupStatements statements;

@Provider
public BusinessPartnerStore sqlStore(ServiceExtensionContext context) {
public BusinessPartnerStore sqlStore() {
return new SqlBusinessPartnerStore(dataSourceRegistry, dataSourceName, transactionContext, typeManager.getMapper(), queryExecutor, getStatements());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@
import org.eclipse.edc.jwt.signer.spi.JwsSignerProvider;
import org.eclipse.edc.keys.spi.LocalPublicKeyService;
import org.eclipse.edc.participantcontext.single.spi.SingleParticipantContextSupplier;
import org.eclipse.edc.participantcontext.spi.types.ParticipantContext;
import org.eclipse.edc.runtime.metamodel.annotation.Extension;
import org.eclipse.edc.runtime.metamodel.annotation.Inject;
import org.eclipse.edc.runtime.metamodel.annotation.Provider;
import org.eclipse.edc.runtime.metamodel.annotation.Setting;
import org.eclipse.edc.spi.EdcException;
import org.eclipse.edc.spi.monitor.Monitor;
import org.eclipse.edc.spi.security.Vault;
import org.eclipse.edc.spi.system.Hostname;
Expand Down Expand Up @@ -130,7 +128,7 @@ public DataPlaneTokenRefreshService createRefreshTokenService(ServiceExtensionCo
private DataPlaneTokenRefreshServiceImpl getTokenRefreshService(ServiceExtensionContext context) {
if (tokenRefreshService == null) {
var monitor = context.getMonitor().withPrefix("DataPlane Token Refresh");
var refreshEndpoint = getRefreshEndpointConfig(context, monitor);
var refreshEndpoint = getRefreshEndpointConfig(monitor);
monitor.debug("Token refresh endpoint: %s".formatted(refreshEndpoint));
monitor.debug("Token refresh time tolerance: %d s".formatted(tokenExpiryToleranceSeconds));
tokenRefreshService = new DataPlaneTokenRefreshServiceImpl(clock, tokenValidationService, didPkResolver, localPublicKeyService, accessTokenDataStore, new JwtGenerationService(jwsSignerProvider),
Expand All @@ -140,20 +138,12 @@ private DataPlaneTokenRefreshServiceImpl getTokenRefreshService(ServiceExtension
return tokenRefreshService;
}

private String getRefreshEndpointConfig(ServiceExtensionContext context, Monitor monitor) {
private String getRefreshEndpointConfig(Monitor monitor) {
var refreshEndpoint = refreshEndpointConfig;
if (refreshEndpoint == null) {
refreshEndpoint = "http://%s:%d%s".formatted(hostname.get(), webPort, webPath);
monitor.warning("Config property '%s' was not specified, the default '%s' will be used.".formatted(REFRESH_ENDPOINT_PROPERTY, refreshEndpoint));
}
return refreshEndpoint;
}

private String getOwnDid(ServiceExtensionContext context) {
return participantContextSupplier.get().map(ParticipantContext::getIdentity).onFailure(f -> {
var message = "This connector is not configured properly, cannot continue. Error is: %s".formatted(f.getFailureDetail());
monitor.severe(message);
throw new EdcException(message);
}).getContent();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ public String name() {

@Override
public void initialize(ServiceExtensionContext context) {
var defaultScopes = defaultScopes(context);
var defaultScopes = defaultScopes();
policyEngine.registerPostValidator(RequestCatalogPolicyContext.class, new DefaultScopeExtractor<>(defaultScopes));
policyEngine.registerPostValidator(RequestContractNegotiationPolicyContext.class, new DefaultScopeExtractor<>(defaultScopes));
policyEngine.registerPostValidator(RequestTransferProcessPolicyContext.class, new DefaultScopeExtractor<>(defaultScopes));
}

private Map<String, Set<String>> defaultScopes(ServiceExtensionContext context) {
private Map<String, Set<String>> defaultScopes() {
var scopesByVersion = new HashMap<String, Set<String>>();
scopesByVersion.put(DSP_SCOPE_V_08, V08_DEFAULT_SCOPES);
scopesByVersion.put(DSP_SCOPE_V_2025_1, DEFAULT_SCOPES);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.eclipse.edc.spi.monitor.Monitor;
import org.eclipse.edc.spi.security.Vault;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.types.TypeManager;
import org.eclipse.tractusx.edc.core.utils.PathUtils;
import org.eclipse.tractusx.edc.iam.dcp.sts.div.DivSecureTokenService;
Expand Down Expand Up @@ -71,7 +70,7 @@ public String name() {
}

@Provider
public SecureTokenService secureTokenService(ServiceExtensionContext context) {
public SecureTokenService secureTokenService() {
return ofNullable(divUrlConfig)
.map(PathUtils::removeTrailingSlash)
.map(divUrl -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.eclipse.edc.runtime.metamodel.annotation.Provider;
import org.eclipse.edc.runtime.metamodel.annotation.Setting;
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.tractusx.edc.core.utils.PathUtils;

/**
Expand Down Expand Up @@ -54,7 +53,7 @@ public String name() {
}

@Provider
public StsRemoteClientConfiguration clientConfiguration(ServiceExtensionContext context) {
public StsRemoteClientConfiguration clientConfiguration() {
return new StsRemoteClientConfiguration(PathUtils.removeTrailingSlash(tokenUrl), clientId, clientSecretAlias);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void initialize(ServiceExtensionContext context, ObjectFactory factory) {
when(context.getConfig()).thenReturn(config);

var extension = factory.constructInstance(RemoteTokenServiceClientExtension.class);
assertThat(extension.secureTokenService(context)).isInstanceOf(DivSecureTokenService.class);
assertThat(extension.secureTokenService()).isInstanceOf(DivSecureTokenService.class);
}

@Test
Expand All @@ -58,7 +58,7 @@ void initialize_whenUrlIsMissing_fallsBackToRemoteSts(ServiceExtensionContext co

var extension = f.constructInstance(RemoteTokenServiceClientExtension.class);

assertThat(extension.secureTokenService(context))
assertThat(extension.secureTokenService())
.isInstanceOf(RemoteSecureTokenService.class);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void setup(ServiceExtensionContext context) {

@Test
void initialize(ServiceExtensionContext context, StsClientConfigurationExtension extension) {
assertThat(extension.clientConfiguration(context)).satisfies(stsConfig -> {
assertThat(extension.clientConfiguration()).satisfies(stsConfig -> {
assertThat(stsConfig.clientId()).isEqualTo("clientId");
assertThat(stsConfig.clientSecretAlias()).isEqualTo("clientSecretAlias");
assertThat(stsConfig.tokenUrl()).isEqualTo("url");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ public String name() {

@Provider
public TokenRefreshHandler createTokenRefreshHander(ServiceExtensionContext context) {
return new TokenRefreshHandlerImpl(edrStore, httpClient, getOwnDid(context), context.getMonitor(),
return new TokenRefreshHandlerImpl(edrStore, httpClient, getOwnDid(), context.getMonitor(),
secureTokenService, typeManager.getMapper(), participantContextSupplier);
}

private String getOwnDid(ServiceExtensionContext context) {
private String getOwnDid() {
return participantContextSupplier.get().map(ParticipantContext::getIdentity).onFailure(f -> {
var message = "This connector is not configured properly, cannot continue. Error is: %s".formatted(f.getFailureDetail());
monitor.withPrefix(getClass().getSimpleName()).severe(message);
Expand Down
Loading