feat: introduce TxParticipant + E2E tests fix (#968)

* feat: introduce TxParticipant + E2E tests fix

* chore: cleanup stub url

* chore: dependencies file

* chore: javadocs

* pr suggestions

core/edr-core/src/main/java/org/eclipse/tractusx/edc/edr/core/manager/EdrManagerImpl.java

@@ -247,7 +247,6 @@ private StatusResult<Void> fireTransferProcess(EndpointDataReferenceEntry entry)
 
         var transferRequest = TransferRequest.Builder.newInstance()
                 .assetId(dataRequest.getAssetId())
-                .connectorId(dataRequest.getConnectorId())
                 .contractId(dataRequest.getContractId())
                 .protocol(dataRequest.getProtocol())
                 .counterPartyAddress(dataRequest.getConnectorAddress())

edc-controlplane/edc-runtime-memory/src/test/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtensionTest.java

@@ -30,7 +30,6 @@
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -43,7 +42,7 @@ class VaultSeedExtensionTest {
 
     @BeforeEach
     void setup(ServiceExtensionContext context, ObjectFactory factory) {
-        this.context = spy(context);
+        this.context = context;
         monitor = mock(Monitor.class);
         context.registerService(Monitor.class, monitor);
         context.registerService(Vault.class, new InMemoryVault(monitor));
@@ -56,7 +55,7 @@ void name() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"key1:", "key1:value1", "key1:value1;", ";key1:value1", ";sdf;key1:value1"})
+    @ValueSource(strings = { "key1:", "key1:value1", "key1:value1;", ";key1:value1", ";sdf;key1:value1" })
     void createInMemVault_validString(String secret) {
         when(context.getSetting(eq(VaultSeedExtension.VAULT_MEMORY_SECRETS_PROPERTY), eq(null))).thenReturn(secret);
         extension.createInMemVault(context);

edc-dataplane/edc-dataplane-base/build.gradle.kts

@@ -38,7 +38,8 @@ dependencies {
     runtimeOnly(libs.edc.dpf.core)
     runtimeOnly(libs.edc.controlplane.apiclient)
 
-    runtimeOnly(libs.edc.dpf.api)
+    runtimeOnly(libs.edc.dpf.api.control)
+    runtimeOnly(libs.edc.dpf.api.public)
     runtimeOnly(libs.edc.core.connector)
     runtimeOnly(libs.edc.boot)
 

edc-extensions/data-encryption/src/test/java/org/eclipse/tractusx/edc/data/encryption/TxEncryptorExtensionTest.java

@@ -35,7 +35,6 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.startsWith;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -49,7 +48,7 @@ class TxEncryptorExtensionTest {
     @BeforeEach
     void setup(ObjectFactory factory, ServiceExtensionContext c) {
         c.registerService(Monitor.class, monitor);
-        context = spy(c);
+        context = c;
         when(context.getSetting(ENCRYPTION_KEY_ALIAS, null)).thenReturn("test-key");
         extension = factory.constructInstance(TxEncryptorExtension.class);
     }
@@ -76,7 +75,7 @@ void createEncryptor_withPropertyEqualsAes() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {CACHING_ENABLED, CACHING_SECONDS})
+    @ValueSource(strings = { CACHING_ENABLED, CACHING_SECONDS })
     void verifyDeprecationWarnings(String deprecatedSetting) {
         when(context.getSetting(eq(deprecatedSetting), any())).thenReturn("doesn't matter");
         extension.createEncryptor(context);

edc-extensions/edr/edr-cache-sql/src/test/java/org/eclipse/tractusx/edc/edr/store/sql/SqlEndpointDataReferenceCacheExtensionTest.java

@@ -29,7 +29,6 @@
 import static org.eclipse.tractusx.edc.edr.store.sql.SqlEndpointDataReferenceCacheExtension.DEFAULT_DATASOURCE_NAME;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -42,7 +41,7 @@ public class SqlEndpointDataReferenceCacheExtensionTest {
 
     @BeforeEach
     void setUp(ObjectFactory factory, ServiceExtensionContext context) {
-        this.context = spy(context);
+        this.context = context;
         context.registerService(TypeManager.class, new TypeManager());
         context.registerService(DataSourceRegistry.class, mock(DataSourceRegistry.class));
         extension = factory.constructInstance(SqlEndpointDataReferenceCacheExtension.class);

edc-extensions/edr/edr-callback/src/main/java/org/eclipse/tractusx/edc/callback/ContractNegotiationCallback.java

@@ -54,7 +54,6 @@ private Result<Void> initiateTransfer(ContractNegotiationFinalized negotiationFi
                 .id(UUID.randomUUID().toString())
                 .assetId(negotiationFinalized.getContractAgreement().getAssetId())
                 .contractId(negotiationFinalized.getContractAgreement().getId())
-                .connectorId(negotiationFinalized.getCounterPartyId())
                 .counterPartyAddress(negotiationFinalized.getCounterPartyAddress())
                 .protocol(negotiationFinalized.getProtocol())
                 .dataDestination(DATA_DESTINATION)

edc-extensions/edr/edr-callback/src/main/java/org/eclipse/tractusx/edc/callback/TransferProcessLocalCallback.java

@@ -95,7 +95,9 @@ private Result<Void> storeEdr(EndpointDataReference edr) {
                 if (contractNegotiation != null) {
                     contractNegotiationId = contractNegotiation.getId();
                 } else {
-                    monitor.warning(format("Contract negotiation for agreement with id: %s is missing.", transferProcess.getContractId()));
+                    var msg = format("Contract negotiation for agreement with id: %s is missing.", transferProcess.getContractId());
+                    monitor.warning(msg);
+                    return Result.failure(msg);
                 }
                 var expirationTime = extractExpirationTime(edr);
 
@@ -106,7 +108,7 @@ private Result<Void> storeEdr(EndpointDataReference edr) {
                         .transferProcessId(transferProcess.getId())
                         .assetId(transferProcess.getDataRequest().getAssetId())
                         .agreementId(transferProcess.getDataRequest().getContractId())
-                        .providerId(transferProcess.getDataRequest().getConnectorId())
+                        .providerId(contractNegotiation.getCounterPartyId())
                         .state(EndpointDataReferenceEntryStates.NEGOTIATED.code())
                         .expirationTimestamp(expirationTime.getContent())
                         .contractNegotiationId(contractNegotiationId)

edc-extensions/edr/edr-callback/src/test/java/org/eclipse/tractusx/edc/callback/ContractNegotiationCallbackTest.java

@@ -63,6 +63,16 @@ public class ContractNegotiationCallbackTest {
 
     ContractNegotiationCallback callback;
 
+    private static <T extends ContractNegotiationEvent, B extends ContractNegotiationEvent.Builder<T, B>> B baseBuilder(B builder) {
+        var callbacks = List.of(CallbackAddress.Builder.newInstance().uri("http://local").events(Set.of("test")).build());
+        return builder
+                .contractNegotiationId("id")
+                .protocol("test")
+                .callbackAddresses(callbacks)
+                .counterPartyAddress("addr")
+                .counterPartyId("provider");
+    }
+
     @BeforeEach
     void setup() {
         callback = new ContractNegotiationCallback(transferProcessService, monitor);
@@ -92,7 +102,6 @@ void invoke_shouldStartTransferProcess() {
             assertThat(tp.getContractId()).isEqualTo(event.getContractAgreement().getId());
             assertThat(tp.getAssetId()).isEqualTo(event.getContractAgreement().getAssetId());
             assertThat(tp.getCounterPartyAddress()).isEqualTo(event.getCounterPartyAddress());
-            assertThat(tp.getConnectorId()).isEqualTo(event.getCounterPartyId());
             assertThat(tp.getProtocol()).isEqualTo(event.getProtocol());
             assertThat(tp.getDataDestination()).usingRecursiveComparison().isEqualTo(DATA_DESTINATION);
         });
@@ -140,16 +149,6 @@ void invoke_whenFinalized() {
         verify(transferProcessService).initiateTransfer(any(TransferRequest.class));
     }
 
-    private static <T extends ContractNegotiationEvent, B extends ContractNegotiationEvent.Builder<T, B>> B baseBuilder(B builder) {
-        var callbacks = List.of(CallbackAddress.Builder.newInstance().uri("http://local").events(Set.of("test")).build());
-        return builder
-                .contractNegotiationId("id")
-                .protocol("test")
-                .callbackAddresses(callbacks)
-                .counterPartyAddress("addr")
-                .counterPartyId("provider");
-    }
-
     private static class EventInstances implements ArgumentsProvider {
 
         @Override

edc-extensions/edr/edr-callback/src/test/java/org/eclipse/tractusx/edc/callback/TransferProcessLocalCallbackTest.java

@@ -14,6 +14,7 @@
 
 package org.eclipse.tractusx.edc.callback;
 
+import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
 import org.eclipse.edc.connector.spi.contractagreement.ContractAgreementService;
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessCompleted;
 import org.eclipse.edc.connector.transfer.spi.event.TransferProcessDeprovisioned;
@@ -108,11 +109,20 @@ void invoke_shouldStoreTheEdrInCache_whenDataAddressIsPresent() {
         var edrEntry = EndpointDataReferenceEntry.Builder.newInstance()
                 .agreementId(contractId)
                 .transferProcessId(transferProcessId)
-                .assetId(assetId).build();
+                .assetId(assetId)
+                .build();
+
+        var negotiation = ContractNegotiation.Builder.newInstance()
+                .id(contractId)
+                .counterPartyId("providerId")
+                .counterPartyAddress("http://test")
+                .protocol("protocol")
+                .build();
 
         when(transformerRegistry.transform(any(DataAddress.class), eq(EndpointDataReference.class))).thenReturn(Result.success(edr));
         when(transferProcessStore.findForCorrelationId(edr.getId())).thenReturn(transferProcess);
         when(transferProcessStore.findById(transferProcessId)).thenReturn(transferProcess);
+        when(agreementService.findNegotiation(contractId)).thenReturn(negotiation);
         when(edrCache.queryForEntries(any())).thenReturn(Stream.of(edrEntry));
 
 

edc-extensions/postgresql-migration/src/main/java/org/eclipse/tractusx/edc/postgresql/migration/AbstractPostgresqlMigrationExtension.java

@@ -24,6 +24,7 @@
 import org.eclipse.edc.spi.persistence.EdcPersistenceException;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.sql.DriverManagerConnectionFactory;
 import org.eclipse.edc.sql.datasource.ConnectionFactoryDataSource;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.MigrationVersion;
@@ -32,7 +33,7 @@
 import java.util.Properties;
 
 abstract class AbstractPostgresqlMigrationExtension implements ServiceExtension {
-    
+
     private static final String EDC_DATASOURCE_PREFIX = "edc.datasource";
     private static final String MIGRATION_LOCATION_BASE =
             String.format("classpath:%s", AbstractPostgresqlMigrationExtension.class.getPackageName().replace(".", "/"));
@@ -50,12 +51,10 @@ public String name() {
         return "Postgresql schema migration for subsystem " + getSubsystemName();
     }
 
-    protected abstract String getSubsystemName();
-
     @Override
     public void initialize(final ServiceExtensionContext context) {
         var config = context.getConfig();
-        
+
         var subSystemName = Objects.requireNonNull(getSubsystemName());
         var enabled = config.getBoolean(MIGRATION_ENABLED_TEMPLATE.formatted(subSystemName), Boolean.valueOf(DEFAULT_MIGRATION_ENABLED_TEMPLATE));
 
@@ -77,8 +76,8 @@ public void initialize(final ServiceExtensionContext context) {
         var jdbcProperties = new Properties();
         jdbcProperties.putAll(datasourceConfig.getRelativeEntries());
 
-        var driverManagerConnectionFactory = new DriverManagerConnectionFactory(jdbcUrl, jdbcProperties);
-        var dataSource = new ConnectionFactoryDataSource(driverManagerConnectionFactory);
+        var driverManagerConnectionFactory = new DriverManagerConnectionFactory();
+        var dataSource = new ConnectionFactoryDataSource(driverManagerConnectionFactory, jdbcUrl, jdbcProperties);
 
         var flyway =
                 Flyway.configure()
@@ -102,4 +101,6 @@ public void initialize(final ServiceExtensionContext context) {
         }
     }
 
+    protected abstract String getSubsystemName();
+
 }

edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/policy/V0_0_4__Add_Private_Properties.sql

@@ -0,0 +1,15 @@
+--
+--  Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+--
+--  This program and the accompanying materials are made available under the
+--  terms of the Apache License, Version 2.0 which is available at
+--  https://www.apache.org/licenses/LICENSE-2.0
+--
+--  SPDX-License-Identifier: Apache-2.0
+--
+--  Contributors:
+--       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+--
+
+-- add columns
+ALTER TABLE edc_policydefinitions ADD COLUMN private_properties JSON;

edc-extensions/postgresql-migration/src/main/resources/org/eclipse/tractusx/edc/postgresql/migration/transferprocess/V0_0_12__Alter_TransferProcess_AddTransferType.sql

@@ -0,0 +1,15 @@
+--
+--  Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+--
+--  This program and the accompanying materials are made available under the
+--  terms of the Apache License, Version 2.0 which is available at
+--  https://www.apache.org/licenses/LICENSE-2.0
+--
+--  SPDX-License-Identifier: Apache-2.0
+--
+--  Contributors:
+--       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+--
+
+-- add column
+ALTER TABLE edc_transfer_process ADD COLUMN transfer_type VARCHAR;

edc-extensions/ssi/ssi-identity-core/src/main/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityService.java

@@ -19,6 +19,7 @@
 import org.eclipse.edc.spi.iam.IdentityService;
 import org.eclipse.edc.spi.iam.TokenParameters;
 import org.eclipse.edc.spi.iam.TokenRepresentation;
+import org.eclipse.edc.spi.iam.VerificationContext;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.tractusx.edc.iam.ssi.spi.SsiCredentialClient;
 
@@ -39,7 +40,7 @@ public Result<TokenRepresentation> obtainClientCredentials(TokenParameters param
     }
 
     @Override
-    public Result<ClaimToken> verifyJwtToken(TokenRepresentation tokenRepresentation, String audience) {
+    public Result<ClaimToken> verifyJwtToken(TokenRepresentation tokenRepresentation, VerificationContext verificationContext) {
         return tokenValidationService.validate(tokenRepresentation);
     }
 }

edc-extensions/ssi/ssi-identity-core/src/test/java/org/eclipse/tractusx/edc/iam/ssi/identity/SsiIdentityServiceExtensionTest.java

@@ -28,7 +28,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.tractusx.edc.iam.ssi.identity.SsiIdentityServiceExtension.ENDPOINT_AUDIENCE;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -41,7 +40,7 @@ public class SsiIdentityServiceExtensionTest {
 
     @BeforeEach
     void setup(ObjectFactory factory, ServiceExtensionContext context) {
-        this.context = spy(context);
+        this.context = context;
         context.registerService(SsiCredentialClient.class, mock(SsiCredentialClient.class));
         extension = factory.constructInstance(SsiIdentityServiceExtension.class);
     }

edc-extensions/ssi/ssi-miw-credential-client/src/test/java/org/eclipse/tractusx/edc/iam/ssi/miw/SsiMiwConfigurationExtensionTest.java

@@ -31,7 +31,6 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -44,7 +43,7 @@ public class SsiMiwConfigurationExtensionTest {
 
     @BeforeEach
     void setup(ObjectFactory factory, ServiceExtensionContext context) {
-        this.context = spy(context);
+        this.context = context;
         extension = factory.constructInstance(SsiMiwConfigurationExtension.class);
     }