diff --git a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java index be6598e149..8e9b7dcc08 100644 --- a/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java +++ b/edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java @@ -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; @@ -58,7 +57,7 @@ public String name() { } @Provider - public Vault createInMemVault(ServiceExtensionContext context) { + public Vault createInMemVault() { if (seedSecrets != null) { singleParticipantContextSupplier.get().map(ParticipantContext::getParticipantContextId) diff --git a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtensionTest.java b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtensionTest.java index acac3629e1..d36c126260 100644 --- a/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtensionTest.java +++ b/edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtensionTest.java @@ -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()); } } diff --git a/edc-extensions/agreements-bpns/bpns-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/bpns/store/SqlAgreementsBpnsStoreExtension.java b/edc-extensions/agreements-bpns/bpns-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/bpns/store/SqlAgreementsBpnsStoreExtension.java index ea0a2e1f57..061ab8235f 100644 --- a/edc-extensions/agreements-bpns/bpns-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/bpns/store/SqlAgreementsBpnsStoreExtension.java +++ b/edc-extensions/agreements-bpns/bpns-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/bpns/store/SqlAgreementsBpnsStoreExtension.java @@ -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; @@ -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()); } diff --git a/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/SqlAgreementsRetirementStoreExtension.java b/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/SqlAgreementsRetirementStoreExtension.java index 7d80f0f941..8e6c149628 100644 --- a/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/SqlAgreementsRetirementStoreExtension.java +++ b/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/SqlAgreementsRetirementStoreExtension.java @@ -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; @@ -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()); } diff --git a/edc-extensions/bpn-validation/business-partner-store-sql/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/store/SqlBusinessPartnerGroupStoreExtension.java b/edc-extensions/bpn-validation/business-partner-store-sql/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/store/SqlBusinessPartnerGroupStoreExtension.java index 4c92243875..0160b7de05 100644 --- a/edc-extensions/bpn-validation/business-partner-store-sql/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/store/SqlBusinessPartnerGroupStoreExtension.java +++ b/edc-extensions/bpn-validation/business-partner-store-sql/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/store/SqlBusinessPartnerGroupStoreExtension.java @@ -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; @@ -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()); } diff --git a/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceExtension.java b/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceExtension.java index cabadfaf82..ee2b1de5bd 100644 --- a/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceExtension.java +++ b/edc-extensions/dataplane/dataplane-token-refresh/token-refresh-core/src/main/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/core/DataPlaneTokenRefreshServiceExtension.java @@ -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; @@ -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), @@ -140,7 +138,7 @@ 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); @@ -148,12 +146,4 @@ private String getRefreshEndpointConfig(ServiceExtensionContext context, Monitor } 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(); - } } diff --git a/edc-extensions/dcp/cx-dcp/src/main/java/org/eclipse/tractusx/edc/iam/dcp/cx/CxDcpDefaultScopeExtension.java b/edc-extensions/dcp/cx-dcp/src/main/java/org/eclipse/tractusx/edc/iam/dcp/cx/CxDcpDefaultScopeExtension.java index ffd40d17da..3439038ff7 100644 --- a/edc-extensions/dcp/cx-dcp/src/main/java/org/eclipse/tractusx/edc/iam/dcp/cx/CxDcpDefaultScopeExtension.java +++ b/edc-extensions/dcp/cx-dcp/src/main/java/org/eclipse/tractusx/edc/iam/dcp/cx/CxDcpDefaultScopeExtension.java @@ -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> defaultScopes(ServiceExtensionContext context) { + private Map> defaultScopes() { var scopesByVersion = new HashMap>(); scopesByVersion.put(DSP_SCOPE_V_08, V08_DEFAULT_SCOPES); scopesByVersion.put(DSP_SCOPE_V_2025_1, DEFAULT_SCOPES); diff --git a/edc-extensions/dcp/tx-dcp-sts-div/src/main/java/org/eclipse/tractusx/edc/iam/dcp/sts/RemoteTokenServiceClientExtension.java b/edc-extensions/dcp/tx-dcp-sts-div/src/main/java/org/eclipse/tractusx/edc/iam/dcp/sts/RemoteTokenServiceClientExtension.java index 904bc160da..75fd503aac 100644 --- a/edc-extensions/dcp/tx-dcp-sts-div/src/main/java/org/eclipse/tractusx/edc/iam/dcp/sts/RemoteTokenServiceClientExtension.java +++ b/edc-extensions/dcp/tx-dcp-sts-div/src/main/java/org/eclipse/tractusx/edc/iam/dcp/sts/RemoteTokenServiceClientExtension.java @@ -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; @@ -71,7 +70,7 @@ public String name() { } @Provider - public SecureTokenService secureTokenService(ServiceExtensionContext context) { + public SecureTokenService secureTokenService() { return ofNullable(divUrlConfig) .map(PathUtils::removeTrailingSlash) .map(divUrl -> { diff --git a/edc-extensions/dcp/tx-dcp-sts-div/src/main/java/org/eclipse/tractusx/edc/iam/dcp/sts/StsClientConfigurationExtension.java b/edc-extensions/dcp/tx-dcp-sts-div/src/main/java/org/eclipse/tractusx/edc/iam/dcp/sts/StsClientConfigurationExtension.java index 7e4bf9e187..7d9e8961a6 100644 --- a/edc-extensions/dcp/tx-dcp-sts-div/src/main/java/org/eclipse/tractusx/edc/iam/dcp/sts/StsClientConfigurationExtension.java +++ b/edc-extensions/dcp/tx-dcp-sts-div/src/main/java/org/eclipse/tractusx/edc/iam/dcp/sts/StsClientConfigurationExtension.java @@ -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; /** @@ -54,7 +53,7 @@ public String name() { } @Provider - public StsRemoteClientConfiguration clientConfiguration(ServiceExtensionContext context) { + public StsRemoteClientConfiguration clientConfiguration() { return new StsRemoteClientConfiguration(PathUtils.removeTrailingSlash(tokenUrl), clientId, clientSecretAlias); } } diff --git a/edc-extensions/dcp/tx-dcp-sts-div/src/test/java/org/eclipse/tractusx/edc/iam/dcp/sts/RemoteTokenServiceClientExtensionTest.java b/edc-extensions/dcp/tx-dcp-sts-div/src/test/java/org/eclipse/tractusx/edc/iam/dcp/sts/RemoteTokenServiceClientExtensionTest.java index 1ec6ca98a0..8ce2ba4d33 100644 --- a/edc-extensions/dcp/tx-dcp-sts-div/src/test/java/org/eclipse/tractusx/edc/iam/dcp/sts/RemoteTokenServiceClientExtensionTest.java +++ b/edc-extensions/dcp/tx-dcp-sts-div/src/test/java/org/eclipse/tractusx/edc/iam/dcp/sts/RemoteTokenServiceClientExtensionTest.java @@ -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 @@ -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); } } diff --git a/edc-extensions/dcp/tx-dcp-sts-div/src/test/java/org/eclipse/tractusx/edc/iam/dcp/sts/StsClientConfigurationExtensionTest.java b/edc-extensions/dcp/tx-dcp-sts-div/src/test/java/org/eclipse/tractusx/edc/iam/dcp/sts/StsClientConfigurationExtensionTest.java index 8fe3e2e101..22326a93d9 100644 --- a/edc-extensions/dcp/tx-dcp-sts-div/src/test/java/org/eclipse/tractusx/edc/iam/dcp/sts/StsClientConfigurationExtensionTest.java +++ b/edc-extensions/dcp/tx-dcp-sts-div/src/test/java/org/eclipse/tractusx/edc/iam/dcp/sts/StsClientConfigurationExtensionTest.java @@ -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"); diff --git a/edc-extensions/tokenrefresh-handler/src/main/java/org/eclipse/tractusx/edc/common/tokenrefresh/TokenRefreshHandlerExtension.java b/edc-extensions/tokenrefresh-handler/src/main/java/org/eclipse/tractusx/edc/common/tokenrefresh/TokenRefreshHandlerExtension.java index 147a1ba04f..13637b6e58 100644 --- a/edc-extensions/tokenrefresh-handler/src/main/java/org/eclipse/tractusx/edc/common/tokenrefresh/TokenRefreshHandlerExtension.java +++ b/edc-extensions/tokenrefresh-handler/src/main/java/org/eclipse/tractusx/edc/common/tokenrefresh/TokenRefreshHandlerExtension.java @@ -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);