feat(tests): removes lombok from edc-tests module

Author: wolf4ood

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/BackendServiceBackendAPI.java

@@ -20,48 +20,72 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
+
 import org.eclipse.tractusx.edc.tests.util.DatabaseCleaner;
 import org.eclipse.tractusx.edc.tests.util.S3Client;
 
-@RequiredArgsConstructor
+
 public class Connector {
 
-  @NonNull @Getter private final String name;
+    private final String name;
+
+    private final Environment environment;
+
+    private final DataManagementAPI dataManagementAPI;
+
+    private final BackendServiceBackendAPI backendServiceBackendAPI;
+
+    private final DatabaseCleaner databaseCleaner;
+
+
+    private final S3Client s3Client;
+
+    public Connector(String name, Environment environment) {
+        this.name = name;
+        this.environment = environment;
+        dataManagementAPI = loadDataManagementAPI();
+        backendServiceBackendAPI = loadBackendServiceBackendAPI();
+        databaseCleaner = loadDatabaseCleaner();
+        s3Client = createS3Client();
+    }
 
-  @Getter @NonNull private final Environment environment;
+    public BackendServiceBackendAPI getBackendServiceBackendAPI() {
+        return backendServiceBackendAPI;
+    }
 
-  @Getter(lazy = true)
-  private final DataManagementAPI dataManagementAPI = loadDataManagementAPI();
+    public DatabaseCleaner getDatabaseCleaner() {
+        return databaseCleaner;
+    }
 
-  @Getter(lazy = true)
-  private final BackendServiceBackendAPI backendServiceBackendAPI = loadBackendServiceBackendAPI();
+    public DataManagementAPI getDataManagementAPI() {
+        return dataManagementAPI;
+    }
 
-  @Getter(lazy = true)
-  private final DatabaseCleaner databaseCleaner = loadDatabaseCleaner();
+    public Environment getEnvironment() {
+        return environment;
+    }
 
-  @Getter(lazy = true)
-  private final S3Client s3Client = createS3Client();
+    public S3Client getS3Client() {
+        return s3Client;
+    }
 
-  private DataManagementAPI loadDataManagementAPI() {
-    return new DataManagementAPI(
-        environment.getDataManagementUrl(), environment.getDataManagementAuthKey());
-  }
+    private DataManagementAPI loadDataManagementAPI() {
+        return new DataManagementAPI(
+                environment.getDataManagementUrl(), environment.getDataManagementAuthKey());
+    }
 
-  private DatabaseCleaner loadDatabaseCleaner() {
-    return new DatabaseCleaner(
-        environment.getDatabaseUrl(),
-        environment.getDatabaseUser(),
-        environment.getDatabasePassword());
-  }
+    private DatabaseCleaner loadDatabaseCleaner() {
+        return new DatabaseCleaner(
+                environment.getDatabaseUrl(),
+                environment.getDatabaseUser(),
+                environment.getDatabasePassword());
+    }
 
-  private BackendServiceBackendAPI loadBackendServiceBackendAPI() {
-    return new BackendServiceBackendAPI(environment.getBackendServiceBackendApiUrl());
-  }
+    private BackendServiceBackendAPI loadBackendServiceBackendAPI() {
+        return new BackendServiceBackendAPI(environment.getBackendServiceBackendApiUrl());
+    }
 
-  private S3Client createS3Client() {
-    return new S3Client(environment);
-  }
+    private S3Client createS3Client() {
+        return new S3Client(environment);
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Connector.java

@@ -20,24 +20,25 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import lombok.NonNull;
-import lombok.experimental.UtilityClass;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
 
-@UtilityClass
 public class ConnectorFactory {
-  private static final Map<String, Connector> CONNECTOR_CACHE = new HashMap<>();
+    private static final Map<String, Connector> CONNECTOR_CACHE = new ConcurrentHashMap<>();
 
-  public static Connector byName(@NonNull final String name) {
-    return CONNECTOR_CACHE.computeIfAbsent(
-        name.toUpperCase(Locale.ROOT), k -> createConnector(name));
-  }
+    public static Connector byName(String name) {
+        Objects.requireNonNull(name);
+        return CONNECTOR_CACHE.computeIfAbsent(
+                name.toUpperCase(Locale.ROOT), k -> createConnector(name));
+    }
 
-  private static Connector createConnector(@NonNull final String name) {
-    final Environment environment = Environment.byName(name);
+    private static Connector createConnector(String name) {
+        Objects.requireNonNull(name);
+        Environment environment = Environment.byName(name);
 
-    return new Connector(name, environment);
-  }
+        return new Connector(name, environment);
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ConnectorFactory.java

@@ -20,19 +20,16 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
 public final class Constants {
-  public static final String DATA_MANAGEMENT_URL = "DATA_MANAGEMENT_URL";
-  public static final String DATA_MANAGEMENT_API_AUTH_KEY = "DATA_MANAGEMENT_API_AUTH_KEY";
-  public static final String IDS_URL = "IDS_URL";
-  public static final String DATA_PLANE_URL = "DATA_PLANE_URL";
-  public static final String BACKEND_SERVICE_BACKEND_API_URL = "BACKEND_SERVICE_BACKEND_API_URL";
-  public static final String DATABASE_URL = "DATABASE_URL";
-  public static final String DATABASE_USER = "DATABASE_USER";
-  public static final String DATABASE_PASSWORD = "DATABASE_PASSWORD";
-  public static final String EDC_AWS_ENDPOINT_OVERRIDE = "EDC_AWS_ENDPOINT_OVERRIDE";
-  public static final String AWS_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID";
-  public static final String AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY";
+    public static final String DATA_MANAGEMENT_URL = "DATA_MANAGEMENT_URL";
+    public static final String DATA_MANAGEMENT_API_AUTH_KEY = "DATA_MANAGEMENT_API_AUTH_KEY";
+    public static final String IDS_URL = "IDS_URL";
+    public static final String DATA_PLANE_URL = "DATA_PLANE_URL";
+    public static final String BACKEND_SERVICE_BACKEND_API_URL = "BACKEND_SERVICE_BACKEND_API_URL";
+    public static final String DATABASE_URL = "DATABASE_URL";
+    public static final String DATABASE_USER = "DATABASE_USER";
+    public static final String DATABASE_PASSWORD = "DATABASE_PASSWORD";
+    public static final String EDC_AWS_ENDPOINT_OVERRIDE = "EDC_AWS_ENDPOINT_OVERRIDE";
+    public static final String AWS_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID";
+    public static final String AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY";
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Constants.java

@@ -22,64 +22,66 @@
 
 import com.google.gson.Gson;
 import io.cucumber.datatable.DataTable;
-import java.io.IOException;
-import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.eclipse.edc.spi.system.health.HealthStatus;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.junit.jupiter.api.Assertions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Map;
 
-@Slf4j
 public class ControlPlaneAdapterSteps {
 
-  private EndpointDataReference endpointDataReference;
+    private static final Logger log = LoggerFactory.getLogger(ControlPlaneAdapterSteps.class);
+    private EndpointDataReference endpointDataReference;
 
-  /*
-   * TODO: see of EndToEndTransfer.feature
-   * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
-   * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
-   */
+    /*
+     * TODO: see of EndToEndTransfer.feature
+     * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
+     * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
+     */
 
-  // @When("'{connector}' gets a request endpoint from '{connector}'")
-  public void getEndPointFromGetRequest(Connector consumer, Connector receiver, DataTable table)
-      throws IOException {
+    // @When("'{connector}' gets a request endpoint from '{connector}'")
+    public void getEndPointFromGetRequest(Connector consumer, Connector receiver, DataTable table)
+            throws IOException {
 
-    final DataManagementAPI dataManagementAPI = consumer.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+        DataManagementAPI dataManagementAPI = consumer.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-    for (Map<String, String> map : table.asMaps()) {
-      final String assetId = map.get("asset id");
+        for (Map<String, String> map : table.asMaps()) {
+            String assetId = map.get("asset id");
 
-      endpointDataReference = dataManagementAPI.getEdcEndpoint(assetId, receiverIdsUrl);
+            endpointDataReference = dataManagementAPI.getEdcEndpoint(assetId, receiverIdsUrl);
 
-      log.debug("endpointDataReference in controlplane" + endpointDataReference.toString());
+            log.debug("endpointDataReference in controlplane" + endpointDataReference.toString());
+        }
     }
-  }
 
-  /*
-   * TODO: see EndToEndTransfer.feature
-   * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
-   * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
-   */
+    /*
+     * TODO: see EndToEndTransfer.feature
+     * the current Bussinnes test is not running,  because of a possible rare condition in the CI pipeline
+     * regarding the contract validity: see https://github.com/eclipse-edc/Connector/issues/2514
+     */
 
-  // @Then("'{connector}' asks for the asset from the endpoint")
-  public void receiveEndpoint(Connector consumer) throws IOException {
+    // @Then("'{connector}' asks for the asset from the endpoint")
+    public void receiveEndpoint(Connector consumer) throws IOException {
 
-    var requestUrl = endpointDataReference.getEndpoint();
-    var key = endpointDataReference.getAuthKey();
-    var value = endpointDataReference.getAuthCode();
-    var httpClient = HttpClientBuilder.create().build();
-    var get = new HttpGet(requestUrl);
-    get.addHeader(key, value);
-    final CloseableHttpResponse response = httpClient.execute(get);
-    var bytes = response.getEntity().getContent().readAllBytes();
-    var result = new String(bytes);
-    var resultTransformed = new Gson().fromJson(result, HealthStatus.class);
+        var requestUrl = endpointDataReference.getEndpoint();
+        var key = endpointDataReference.getAuthKey();
+        var value = endpointDataReference.getAuthCode();
+        var httpClient = HttpClientBuilder.create().build();
+        var get = new HttpGet(requestUrl);
+        get.addHeader(key, value);
+        CloseableHttpResponse response = httpClient.execute(get);
+        var bytes = response.getEntity().getContent().readAllBytes();
+        var result = new String(bytes);
+        var resultTransformed = new Gson().fromJson(result, HealthStatus.class);
 
-    Assertions.assertTrue(resultTransformed.isHealthy());
-    Assertions.assertFalse(resultTransformed.getComponentResults().isEmpty());
-  }
+        Assertions.assertTrue(resultTransformed.isHealthy());
+        Assertions.assertFalse(resultTransformed.getComponentResults().isEmpty());
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/ControlPlaneAdapterSteps.java

@@ -20,6 +20,9 @@
 
 package org.eclipse.tractusx.edc.tests;
 
+import java.util.Locale;
+import java.util.Objects;
+
 import static org.eclipse.tractusx.edc.tests.Constants.AWS_ACCESS_KEY_ID;
 import static org.eclipse.tractusx.edc.tests.Constants.AWS_SECRET_ACCESS_KEY;
 import static org.eclipse.tractusx.edc.tests.Constants.BACKEND_SERVICE_BACKEND_API_URL;
@@ -32,45 +35,165 @@
 import static org.eclipse.tractusx.edc.tests.Constants.EDC_AWS_ENDPOINT_OVERRIDE;
 import static org.eclipse.tractusx.edc.tests.Constants.IDS_URL;
 
-import java.util.Locale;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.ToString;
-
-@Builder(access = AccessLevel.PRIVATE)
-@Getter
-@ToString
 public class Environment {
-  @NonNull private final String dataManagementAuthKey;
-  @NonNull private final String dataManagementUrl;
-  @NonNull private final String idsUrl;
-  @NonNull private final String dataPlaneUrl;
-  @NonNull private final String backendServiceBackendApiUrl;
-  @NonNull private final String databaseUrl;
-  @NonNull private final String databaseUser;
-  @NonNull private final String databasePassword;
-  @NonNull private final String awsEndpointOverride;
-  @NonNull private final String awsAccessKey;
-  @NonNull private final String awsSecretAccessKey;
-
-  public static Environment byName(String name) {
-    name = name.toUpperCase(Locale.ROOT);
-
-    return Environment.builder()
-        .dataManagementUrl(System.getenv(String.join("_", name, DATA_MANAGEMENT_URL)))
-        .dataManagementAuthKey(System.getenv(String.join("_", name, DATA_MANAGEMENT_API_AUTH_KEY)))
-        .idsUrl(System.getenv(String.join("_", name, IDS_URL)))
-        .dataPlaneUrl(System.getenv(String.join("_", name, DATA_PLANE_URL)))
-        .backendServiceBackendApiUrl(
-            System.getenv(String.join("_", name, BACKEND_SERVICE_BACKEND_API_URL)))
-        .databaseUrl(System.getenv(String.join("_", name, DATABASE_URL)))
-        .databaseUser(System.getenv(String.join("_", name, DATABASE_USER)))
-        .databasePassword(System.getenv(String.join("_", name, DATABASE_PASSWORD)))
-        .awsEndpointOverride(System.getenv(EDC_AWS_ENDPOINT_OVERRIDE))
-        .awsAccessKey(System.getenv(String.join("_", name, AWS_ACCESS_KEY_ID)))
-        .awsSecretAccessKey(System.getenv(String.join("_", name, AWS_SECRET_ACCESS_KEY)))
-        .build();
-  }
+
+    private String awsEndpointOverride;
+    private String awsAccessKey;
+    private String awsSecretAccessKey;
+    private String dataManagementAuthKey;
+    private String dataManagementUrl;
+    private String idsUrl;
+    private String dataPlaneUrl;
+    private String backendServiceBackendApiUrl;
+    private String databaseUrl;
+    private String databaseUser;
+    private String databasePassword;
+
+    private Environment() {
+
+    }
+
+
+    public static Environment byName(String name) {
+        var upperName = name.toUpperCase(Locale.ROOT);
+
+        return Environment.Builder.newInstance()
+                .dataManagementUrl(System.getenv(String.join("_", upperName, DATA_MANAGEMENT_URL)))
+                .dataManagementAuthKey(System.getenv(String.join("_", upperName, DATA_MANAGEMENT_API_AUTH_KEY)))
+                .idsUrl(System.getenv(String.join("_", upperName, IDS_URL)))
+                .dataPlaneUrl(System.getenv(String.join("_", upperName, DATA_PLANE_URL)))
+                .backendServiceBackendApiUrl(
+                        System.getenv(String.join("_", upperName, BACKEND_SERVICE_BACKEND_API_URL)))
+                .databaseUrl(System.getenv(String.join("_", upperName, DATABASE_URL)))
+                .databaseUser(System.getenv(String.join("_", upperName, DATABASE_USER)))
+                .databasePassword(System.getenv(String.join("_", upperName, DATABASE_PASSWORD)))
+                .awsEndpointOverride(System.getenv(EDC_AWS_ENDPOINT_OVERRIDE))
+                .awsAccessKey(System.getenv(String.join("_", upperName, AWS_ACCESS_KEY_ID)))
+                .awsSecretAccessKey(System.getenv(String.join("_", upperName, AWS_SECRET_ACCESS_KEY)))
+                .build();
+    }
+
+    public String getIdsUrl() {
+        return idsUrl;
+    }
+
+    public String getAwsEndpointOverride() {
+        return awsEndpointOverride;
+    }
+
+    public String getAwsSecretAccessKey() {
+        return awsSecretAccessKey;
+    }
+
+    public String getAwsAccessKey() {
+        return awsAccessKey;
+    }
+
+    public String getBackendServiceBackendApiUrl() {
+        return backendServiceBackendApiUrl;
+    }
+
+    public String getDatabasePassword() {
+        return databasePassword;
+    }
+
+    public String getDatabaseUrl() {
+        return databaseUrl;
+    }
+
+    public String getDatabaseUser() {
+        return databaseUser;
+    }
+
+    public String getDataManagementAuthKey() {
+        return dataManagementAuthKey;
+    }
+
+    public String getDataManagementUrl() {
+        return dataManagementUrl;
+    }
+
+    private static class Builder {
+
+
+        private final Environment environment;
+
+        private Builder() {
+            environment = new Environment();
+        }
+
+        public static Builder newInstance() {
+            return new Builder();
+        }
+
+        public Builder awsEndpointOverride(String val) {
+            environment.awsEndpointOverride = val;
+            return this;
+        }
+
+        public Builder awsAccessKey(String val) {
+            environment.awsAccessKey = val;
+            return this;
+        }
+
+        public Builder awsSecretAccessKey(String val) {
+            environment.awsSecretAccessKey = val;
+            return this;
+        }
+
+        public Builder dataManagementAuthKey(String val) {
+            environment.dataManagementAuthKey = val;
+            return this;
+        }
+
+        public Builder dataManagementUrl(String val) {
+            environment.dataManagementUrl = val;
+            return this;
+        }
+
+        public Builder idsUrl(String val) {
+            environment.idsUrl = val;
+            return this;
+        }
+
+        public Builder dataPlaneUrl(String val) {
+            environment.dataPlaneUrl = val;
+            return this;
+        }
+
+        public Builder backendServiceBackendApiUrl(String val) {
+            environment.backendServiceBackendApiUrl = val;
+            return this;
+        }
+
+        public Builder databaseUrl(String val) {
+            environment.databaseUrl = val;
+            return this;
+        }
+
+        public Builder databaseUser(String val) {
+            environment.databaseUser = val;
+            return this;
+        }
+
+        public Builder databasePassword(String val) {
+            environment.databasePassword = val;
+            return this;
+        }
+
+        public Environment build() {
+            Objects.requireNonNull(environment.awsAccessKey);
+            Objects.requireNonNull(environment.awsEndpointOverride);
+            Objects.requireNonNull(environment.awsSecretAccessKey);
+            Objects.requireNonNull(environment.backendServiceBackendApiUrl);
+            Objects.requireNonNull(environment.databaseUrl);
+            Objects.requireNonNull(environment.databasePassword);
+            Objects.requireNonNull(environment.databaseUser);
+            Objects.requireNonNull(environment.dataManagementUrl);
+            Objects.requireNonNull(environment.dataPlaneUrl);
+            Objects.requireNonNull(environment.dataManagementAuthKey);
+            Objects.requireNonNull(environment.idsUrl);
+            return environment;
+        }
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/DataManagementAPI.java

@@ -4,96 +4,99 @@
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
+import org.eclipse.tractusx.edc.tests.data.Asset;
+import org.eclipse.tractusx.edc.tests.data.ContractNegotiation;
+import org.eclipse.tractusx.edc.tests.data.DataAddress;
+import org.eclipse.tractusx.edc.tests.data.HttpProxySinkDataAddress;
+import org.eclipse.tractusx.edc.tests.data.HttpProxySourceDataAddress;
+import org.eclipse.tractusx.edc.tests.data.Transfer;
+import org.junit.jupiter.api.Assertions;
+
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-import org.awaitility.Awaitility;
-import org.eclipse.tractusx.edc.tests.data.*;
-import org.junit.jupiter.api.Assertions;
 
 import static org.awaitility.Awaitility.await;
 
-@Slf4j
 public class HttpProxyTransferSteps {
 
-  private static final String ID = "id";
-  private static final String DESCRIPTION = "description";
-  private static final String BASE_URL = "baseUrl";
-  private static final String ASSET_ID = "asset id";
-  private static final String RECEIVER_HTTP_ENDPOINT = "receiverHttpEndpoint";
-
-  @Given("'{connector}' has a http proxy assets")
-  public void hasAssets(Connector connector, DataTable table) throws Exception {
-    final DataManagementAPI api = connector.getDataManagementAPI();
-
-    for (var map : table.asMaps()) {
-      final String id = map.get(ID);
-      final String description = map.get(DESCRIPTION);
-      final String baseUrl = map.get(BASE_URL);
-
-      var oauth2Provision =
-          Arrays.stream(Oauth2DataAddressFields.values())
-                  .map(it -> it.text)
-                  .anyMatch(map::containsKey)
-              ? new HttpProxySourceDataAddress.Oauth2Provision(
-                  map.get(Oauth2DataAddressFields.TOKEN_URL.text),
-                  map.get(Oauth2DataAddressFields.CLIENT_ID.text),
-                  map.get(Oauth2DataAddressFields.CLIENT_SECRET.text),
-                  map.get(Oauth2DataAddressFields.SCOPE.text))
-              : null;
-
-      final DataAddress address = new HttpProxySourceDataAddress(baseUrl, oauth2Provision);
-      final Asset asset = new Asset(id, description, address);
-
-      api.createAsset(asset);
+    private static final String ID = "id";
+    private static final String DESCRIPTION = "description";
+    private static final String BASE_URL = "baseUrl";
+    private static final String ASSET_ID = "asset id";
+    private static final String RECEIVER_HTTP_ENDPOINT = "receiverHttpEndpoint";
+
+    @Given("'{connector}' has a http proxy assets")
+    public void hasAssets(Connector connector, DataTable table) throws Exception {
+        DataManagementAPI api = connector.getDataManagementAPI();
+
+        for (var map : table.asMaps()) {
+            String id = map.get(ID);
+            String description = map.get(DESCRIPTION);
+            String baseUrl = map.get(BASE_URL);
+
+            var oauth2Provision =
+                    Arrays.stream(Oauth2DataAddressFields.values())
+                            .map(it -> it.text)
+                            .anyMatch(map::containsKey)
+                            ? new HttpProxySourceDataAddress.Oauth2Provision(
+                            map.get(Oauth2DataAddressFields.TOKEN_URL.text),
+                            map.get(Oauth2DataAddressFields.CLIENT_ID.text),
+                            map.get(Oauth2DataAddressFields.CLIENT_SECRET.text),
+                            map.get(Oauth2DataAddressFields.SCOPE.text))
+                            : null;
+
+            DataAddress address = new HttpProxySourceDataAddress(baseUrl, oauth2Provision);
+            Asset asset = new Asset(id, description, address);
+
+            api.createAsset(asset);
+        }
     }
-  }
-
-  @When("'{connector}' initiates HttpProxy transfer from '{connector}'")
-  public void sokratesInitiateHttpProxyTransferProcessFromPlato(
-      Connector consumer, Connector provider, DataTable dataTable) throws IOException {
-    final DataManagementAPI api = consumer.getDataManagementAPI();
-    final String receiverUrl = provider.getEnvironment().getIdsUrl() + "/data";
-
-    final List<ContractNegotiation> negotiation = api.getNegotiations();
-    final String agreementId = negotiation.get(0).getAgreementId();
-    final DataAddress dataAddress = new HttpProxySinkDataAddress();
-
-    for (var map : dataTable.asMaps()) {
-      final String assetId = map.get(ASSET_ID);
-      final String receiverHttpEndpoint = map.get(RECEIVER_HTTP_ENDPOINT);
-      final Transfer transfer =
-          api.initiateTransferProcess(
-              receiverUrl, agreementId, assetId, dataAddress, receiverHttpEndpoint);
-
-      transfer.waitUntilComplete(api);
+
+    @When("'{connector}' initiates HttpProxy transfer from '{connector}'")
+    public void sokratesInitiateHttpProxyTransferProcessFromPlato(
+            Connector consumer, Connector provider, DataTable dataTable) throws IOException {
+        DataManagementAPI api = consumer.getDataManagementAPI();
+        String receiverUrl = provider.getEnvironment().getIdsUrl() + "/data";
+
+        List<ContractNegotiation> negotiation = api.getNegotiations();
+        String agreementId = negotiation.get(0).getAgreementId();
+        DataAddress dataAddress = new HttpProxySinkDataAddress();
+
+        for (var map : dataTable.asMaps()) {
+            String assetId = map.get(ASSET_ID);
+            String receiverHttpEndpoint = map.get(RECEIVER_HTTP_ENDPOINT);
+            Transfer transfer =
+                    api.initiateTransferProcess(
+                            receiverUrl, agreementId, assetId, dataAddress, receiverHttpEndpoint);
+
+            transfer.waitUntilComplete(api);
+        }
     }
-  }
-
-  @Then("the backend application of '{connector}' has received data")
-  public void theBackendApplicationOfSocratesHasReceivedData(Connector consumer) {
-    final BackendServiceBackendAPI api = consumer.getBackendServiceBackendAPI();
-    await()
-            .atMost(Duration.ofSeconds(20))
-            .pollInterval(Duration.ofSeconds(1))
-            .untilAsserted(() ->{
-              final List<String> transferredData = api.list("/");
-              Assertions.assertNotEquals(0, transferredData.size());
-            });
-  }
-
-  private enum Oauth2DataAddressFields {
-    TOKEN_URL("oauth2 token url"),
-    CLIENT_ID("oauth2 client id"),
-    CLIENT_SECRET("oauth2 client secret"),
-    SCOPE("oauth2 scope");
-
-    private final String text;
-
-    Oauth2DataAddressFields(String text) {
-      this.text = text;
+
+    @Then("the backend application of '{connector}' has received data")
+    public void theBackendApplicationOfSocratesHasReceivedData(Connector consumer) {
+        BackendServiceBackendAPI api = consumer.getBackendServiceBackendAPI();
+        await()
+                .atMost(Duration.ofSeconds(20))
+                .pollInterval(Duration.ofSeconds(1))
+                .untilAsserted(() -> {
+                    List<String> transferredData = api.list("/");
+                    Assertions.assertNotEquals(0, transferredData.size());
+                });
+    }
+
+    private enum Oauth2DataAddressFields {
+        TOKEN_URL("oauth2 token url"),
+        CLIENT_ID("oauth2 client id"),
+        CLIENT_SECRET("oauth2 client secret"),
+        SCOPE("oauth2 scope");
+
+        private final String text;
+
+        Oauth2DataAddressFields(String text) {
+            this.text = text;
+        }
     }
-  }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/Environment.java

@@ -23,72 +23,73 @@
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
 import org.eclipse.tractusx.edc.tests.data.ContractNegotiation;
 import org.eclipse.tractusx.edc.tests.data.ContractNegotiationState;
 import org.eclipse.tractusx.edc.tests.data.Negotiation;
 import org.eclipse.tractusx.edc.tests.data.Permission;
 import org.eclipse.tractusx.edc.tests.data.Policy;
 import org.junit.jupiter.api.Assertions;
 
-@Slf4j
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
 public class NegotiationSteps {
 
-  private static final String DEFINITION_ID = "definition id";
-  private static final String ASSET_ID = "asset id";
 
-  private ContractNegotiation lastInitiatedNegotiation;
+    private static final String DEFINITION_ID = "definition id";
+    private static final String ASSET_ID = "asset id";
 
-  @When("'{connector}' sends '{connector}' an offer without constraints")
-  public void sendAnOfferWithoutConstraints(Connector sender, Connector receiver, DataTable table)
-      throws IOException {
+    private ContractNegotiation lastInitiatedNegotiation;
 
-    final DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+    @When("'{connector}' sends '{connector}' an offer without constraints")
+    public void sendAnOfferWithoutConstraints(Connector sender, Connector receiver, DataTable table)
+            throws IOException {
 
-    for (Map<String, String> map : table.asMaps()) {
-      final String definitionId = map.get(DEFINITION_ID);
-      final String assetId = map.get(ASSET_ID);
+        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-      final Permission permission = new Permission("USE", null, new ArrayList<>());
-      final Policy policy = new Policy("foo", List.of(permission));
+        for (Map<String, String> map : table.asMaps()) {
+            String definitionId = map.get(DEFINITION_ID);
+            String assetId = map.get(ASSET_ID);
 
-      final Negotiation negotiation =
-          dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
+            Permission permission = new Permission("USE", new ArrayList<>(), null);
+            Policy policy = new Policy("foo", List.of(permission));
 
-      // wait for negotiation to complete
-      negotiation.waitUntilComplete(dataManagementAPI);
+            Negotiation negotiation =
+                    dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
 
-      lastInitiatedNegotiation = dataManagementAPI.getNegotiation(negotiation.getId());
+            // wait for negotiation to complete
+            negotiation.waitUntilComplete(dataManagementAPI);
+
+            lastInitiatedNegotiation = dataManagementAPI.getNegotiation(negotiation.getId());
+        }
     }
-  }
 
-  @When("'{connector}' successfully negotiation a contract agreement with '{connector}'")
-  public void sokratesSuccessfullyNegotiationAContractAgreementPlatoFor(
-      Connector consumer, Connector provider, DataTable table) throws IOException {
-    final DataManagementAPI api = consumer.getDataManagementAPI();
+    @When("'{connector}' successfully negotiation a contract agreement with '{connector}'")
+    public void sokratesSuccessfullyNegotiationAContractAgreementPlatoFor(
+            Connector consumer, Connector provider, DataTable table) throws IOException {
+        DataManagementAPI api = consumer.getDataManagementAPI();
 
-    final Map<String, String> map = table.asMap();
-    final String definitionId = map.get(DEFINITION_ID);
-    final String assetId = map.get(ASSET_ID);
+        Map<String, String> map = table.asMap();
+        String definitionId = map.get(DEFINITION_ID);
+        String assetId = map.get(ASSET_ID);
 
-    // as default always the "allow all" policy is used. So we can assume this here, too.
-    final Permission permission = new Permission("USE", null, new ArrayList<>());
-    final Policy policy = new Policy("policy-id", List.of(permission));
+        // as default always the "allow all" policy is used. So we can assume this here, too.
+        Permission permission = new Permission("USE", new ArrayList<>(), null);
+        Policy policy = new Policy("policy-id", List.of(permission));
 
-    final String receiverUrl = provider.getEnvironment().getIdsUrl();
-    final Negotiation negotiation =
-        api.initiateNegotiation(receiverUrl, assetId, definitionId, policy);
+        String receiverUrl = provider.getEnvironment().getIdsUrl();
+        Negotiation negotiation =
+                api.initiateNegotiation(receiverUrl, assetId, definitionId, policy);
 
-    negotiation.waitUntilComplete(api);
-  }
+        negotiation.waitUntilComplete(api);
+    }
 
-  @Then("the negotiation is declined")
-  public void assertLastNegotiationDeclined() {
-    Assertions.assertEquals(ContractNegotiationState.DECLINED, lastInitiatedNegotiation.getState());
-  }
+    @Then("the negotiation is declined")
+    public void assertLastNegotiationDeclined() {
+        Assertions.assertEquals(ContractNegotiationState.DECLINED, lastInitiatedNegotiation.getState());
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/HttpProxyTransferSteps.java

@@ -20,45 +20,54 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toList;
-
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.en.Given;
+import org.eclipse.tractusx.edc.tests.data.BusinessPartnerNumberConstraint;
+import org.eclipse.tractusx.edc.tests.data.Constraint;
+import org.eclipse.tractusx.edc.tests.data.OrConstraint;
+import org.eclipse.tractusx.edc.tests.data.PayMeConstraint;
+import org.eclipse.tractusx.edc.tests.data.Permission;
+import org.eclipse.tractusx.edc.tests.data.Policy;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.eclipse.tractusx.edc.tests.data.*;
+
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.toList;
 
 public class PolicyStepDefs {
 
-  @Given("'{connector}' has the following policies")
-  public void hasPolicies(Connector connector, DataTable table) throws Exception {
-    var api = connector.getDataManagementAPI();
-    var policies = table.asMaps().stream().map(this::parseRow).collect(toList());
+    @Given("'{connector}' has the following policies")
+    public void hasPolicies(Connector connector, DataTable table) throws Exception {
+        var api = connector.getDataManagementAPI();
+        var policies = table.asMaps().stream().map(this::parseRow).collect(toList());
 
-    for (var policy : policies) api.createPolicy(policy);
-  }
+        for (var policy : policies) {
+            api.createPolicy(policy);
+        }
+    }
 
-  private Policy parseRow(Map<String, String> row) {
-    var id = row.get("id");
-    var action = row.get("action");
-    var constraints = new ArrayList<Constraint>();
+    private Policy parseRow(Map<String, String> row) {
+        var id = row.get("id");
+        var action = row.get("action");
+        var constraints = new ArrayList<Constraint>();
 
-    var businessPartnerNumber = row.get("businessPartnerNumber");
-    if (businessPartnerNumber != null && !businessPartnerNumber.isBlank()) {
-      var bpnConstraints =
-          stream(businessPartnerNumber.split(","))
-              .map(BusinessPartnerNumberConstraint::new)
-              .collect(toList());
-      constraints.add(new OrConstraint(bpnConstraints));
-    }
+        var businessPartnerNumber = row.get("businessPartnerNumber");
+        if (businessPartnerNumber != null && !businessPartnerNumber.isBlank()) {
+            var bpnConstraints =
+                    stream(businessPartnerNumber.split(","))
+                            .map(BusinessPartnerNumberConstraint::new)
+                            .collect(toList());
+            constraints.add(new OrConstraint(bpnConstraints));
+        }
 
-    var payMe = row.get("payMe");
-    if (payMe != null && !payMe.isBlank())
-      constraints.add(new PayMeConstraint(Double.parseDouble(payMe)));
+        var payMe = row.get("payMe");
+        if (payMe != null && !payMe.isBlank()) {
+            constraints.add(new PayMeConstraint(Double.parseDouble(payMe)));
+        }
 
-    var permission = new Permission(action, null, constraints);
-    return new Policy(id, List.of(permission));
-  }
+        var permission = new Permission(action, constraints, null);
+        return new Policy(id, List.of(permission));
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/NegotiationSteps.java

@@ -19,21 +19,10 @@
 
 package org.eclipse.tractusx.edc.tests;
 
-import static org.awaitility.Awaitility.await;
-import static org.junit.jupiter.api.Assertions.fail;
-
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.AfterAll;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import org.eclipse.tractusx.edc.tests.data.Asset;
 import org.eclipse.tractusx.edc.tests.data.DataAddress;
 import org.eclipse.tractusx.edc.tests.data.Negotiation;
@@ -45,135 +34,145 @@
 import org.eclipse.tractusx.edc.tests.util.Timeouts;
 import org.junit.jupiter.api.Assertions;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class S3FileTransferStepsDefs {
 
-  @Given("'{connector}' has an empty storage bucket called {string}")
-  public void hasEmptyStorageBucket(Connector connector, String bucketName) {
-    S3Client s3 = connector.getS3Client();
+    private static final String COMPLETION_MARKER = ".complete";
+    private File fileToTransfer;
+    private String assetId;
+    private String agreementId;
 
-    s3.createBucket(bucketName);
+    @AfterAll
+    public static void bucketsCleanup() {
+        S3Client s3 = new S3Client(Environment.byName("Sokrates"));
+        s3.deleteAllBuckets();
+    }
 
-    Assertions.assertTrue(s3.listBuckets().contains(bucketName));
-    Assertions.assertEquals(0, s3.listBucketContent(bucketName).size());
-  }
+    @Given("'{connector}' has an empty storage bucket called {string}")
+    public void hasEmptyStorageBucket(Connector connector, String bucketName) {
+        S3Client s3 = connector.getS3Client();
 
-  private File fileToTransfer;
+        s3.createBucket(bucketName);
 
-  @Given("'{connector}' has a storage bucket called {string} with the file called {string}")
-  public void hasAStorageBucketWithTheFile(Connector connector, String bucketName, String fileName)
-      throws IOException {
+        Assertions.assertTrue(s3.listBuckets().contains(bucketName));
+        Assertions.assertEquals(0, s3.listBucketContent(bucketName).size());
+    }
 
-    S3Client s3 = connector.getS3Client();
-    s3.createBucket(bucketName);
-    fileToTransfer = s3.uploadFile(bucketName, fileName);
+    @Given("'{connector}' has a storage bucket called {string} with the file called {string}")
+    public void hasAStorageBucketWithTheFile(Connector connector, String bucketName, String fileName)
+            throws IOException {
 
-    Set<String> bucketContent = s3.listBucketContent(bucketName);
+        S3Client s3 = connector.getS3Client();
+        s3.createBucket(bucketName);
+        fileToTransfer = s3.uploadFile(bucketName, fileName);
 
-    Assertions.assertEquals(1, bucketContent.size());
-    Assertions.assertTrue(bucketContent.contains(fileName));
-  }
+        Set<String> bucketContent = s3.listBucketContent(bucketName);
 
-  @Given("'{connector}' has the following S3 assets")
-  public void hasAssets(Connector connector, DataTable table) {
-    final DataManagementAPI api = connector.getDataManagementAPI();
+        Assertions.assertEquals(1, bucketContent.size());
+        Assertions.assertTrue(bucketContent.contains(fileName));
+    }
 
-    parseDataTable(table)
-        .forEach(
-            asset -> {
-              try {
-                api.createAsset(asset);
-              } catch (IOException e) {
-                fail(e.getMessage());
-              }
-            });
-  }
+    @Given("'{connector}' has the following S3 assets")
+    public void hasAssets(Connector connector, DataTable table) {
+        DataManagementAPI api = connector.getDataManagementAPI();
+
+        parseDataTable(table)
+                .forEach(
+                        asset -> {
+                            try {
+                                api.createAsset(asset);
+                            } catch (IOException e) {
+                                fail(e.getMessage());
+                            }
+                        });
+    }
 
-  private String assetId;
-  private String agreementId;
+    @Then("'{connector}' negotiates the contract successfully with '{connector}'")
+    public void negotiateContract(Connector sender, Connector receiver, DataTable dataTable)
+            throws IOException {
 
-  @Then("'{connector}' negotiates the contract successfully with '{connector}'")
-  public void negotiateContract(Connector sender, Connector receiver, DataTable dataTable)
-      throws IOException {
+        String definitionId = dataTable.asMaps().get(0).get("contract offer id");
+        assetId = dataTable.asMaps().get(0).get("asset id");
+        String policyId = dataTable.asMaps().get(0).get("policy id");
 
-    String definitionId = dataTable.asMaps().get(0).get("contract offer id");
-    assetId = dataTable.asMaps().get(0).get("asset id");
-    String policyId = dataTable.asMaps().get(0).get("policy id");
+        Policy policy =
+                new Policy(policyId, List.of(new Permission("USE", new ArrayList<>(), null)));
 
-    final Policy policy =
-        new Policy(policyId, List.of(new Permission("USE", null, new ArrayList<>())));
+        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-    final DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+        Negotiation negotiation =
+                dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
+        negotiation.waitUntilComplete(dataManagementAPI);
 
-    final Negotiation negotiation =
-        dataManagementAPI.initiateNegotiation(receiverIdsUrl, definitionId, assetId, policy);
-    negotiation.waitUntilComplete(dataManagementAPI);
+        agreementId = dataManagementAPI.getNegotiation(negotiation.getId()).getAgreementId();
+    }
 
-    agreementId = dataManagementAPI.getNegotiation(negotiation.getId()).getAgreementId();
-  }
+    @Then("'{connector}' initiate S3 transfer process from '{connector}'")
+    public void initiateTransferProcess(Connector sender, Connector receiver, DataTable dataTable)
+            throws IOException {
+        DataAddress dataAddress = createDataAddress(dataTable.asMaps().get(0));
 
-  @Then("'{connector}' initiate S3 transfer process from '{connector}'")
-  public void initiateTransferProcess(Connector sender, Connector receiver, DataTable dataTable)
-      throws IOException {
-    DataAddress dataAddress = createDataAddress(dataTable.asMaps().get(0));
+        DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
+        String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
 
-    final DataManagementAPI dataManagementAPI = sender.getDataManagementAPI();
-    final String receiverIdsUrl = receiver.getEnvironment().getIdsUrl() + "/data";
+        Transfer transferProcess =
+                dataManagementAPI.initiateTransferProcess(
+                        receiverIdsUrl, agreementId, assetId, dataAddress);
+        transferProcess.waitUntilComplete(dataManagementAPI);
 
-    final Transfer transferProcess =
-        dataManagementAPI.initiateTransferProcess(
-            receiverIdsUrl, agreementId, assetId, dataAddress);
-    transferProcess.waitUntilComplete(dataManagementAPI);
+        Assertions.assertNotNull(transferProcess.getId());
+    }
 
-    Assertions.assertNotNull(transferProcess.getId());
-  }
+    @Then("'{connector}' has a storage bucket called {string} with transferred file called {string}")
+    public void consumerHasAStorageBucketWithFileTransferred(
+            Connector connector, String bucketName, String fileName) throws IOException {
+        S3Client s3 = connector.getS3Client();
+        await()
+                .pollDelay(Duration.ofMillis(500))
+                .atMost(Timeouts.FILE_TRANSFER)
+                .until(() -> isFilePresent(s3, bucketName, fileName + COMPLETION_MARKER));
+
+        Set<String> bucketContent = s3.listBucketContent(bucketName);
+
+        Assertions.assertEquals(2, bucketContent.size());
+        Assertions.assertTrue(bucketContent.contains(fileName));
+        Assertions.assertArrayEquals(
+                Files.readAllBytes(fileToTransfer.toPath()),
+                Files.readAllBytes(s3.downloadFile(bucketName, fileName).toPath()));
+    }
 
-  private static final String COMPLETION_MARKER = ".complete";
+    private boolean isFilePresent(S3Client s3, String bucketName, String fileName) {
+        return s3.listBucketContent(bucketName).contains(fileName);
+    }
 
-  @Then("'{connector}' has a storage bucket called {string} with transferred file called {string}")
-  public void consumerHasAStorageBucketWithFileTransferred(
-      Connector connector, String bucketName, String fileName) throws IOException {
-    S3Client s3 = connector.getS3Client();
-    await()
-        .pollDelay(Duration.ofMillis(500))
-        .atMost(Timeouts.FILE_TRANSFER)
-        .until(() -> isFilePresent(s3, bucketName, fileName + COMPLETION_MARKER));
+    private List<Asset> parseDataTable(DataTable table) {
+        List<Asset> assetsWithDataAddresses = new ArrayList<>();
 
-    Set<String> bucketContent = s3.listBucketContent(bucketName);
+        for (Map<String, String> map : table.asMaps()) {
+            String id = map.get("id");
+            String description = map.get("description");
+            assetsWithDataAddresses.add(new Asset(id, description, createDataAddress(map)));
+        }
 
-    Assertions.assertEquals(2, bucketContent.size());
-    Assertions.assertTrue(bucketContent.contains(fileName));
-    Assertions.assertArrayEquals(
-        Files.readAllBytes(fileToTransfer.toPath()),
-        Files.readAllBytes(s3.downloadFile(bucketName, fileName).toPath()));
-  }
-
-  private boolean isFilePresent(S3Client s3, String bucketName, String fileName) {
-    return s3.listBucketContent(bucketName).contains(fileName);
-  }
-
-  private List<Asset> parseDataTable(DataTable table) {
-    final List<Asset> assetsWithDataAddresses = new ArrayList<>();
-
-    for (Map<String, String> map : table.asMaps()) {
-      String id = map.get("id");
-      String description = map.get("description");
-      assetsWithDataAddresses.add(new Asset(id, description, createDataAddress(map)));
+        return assetsWithDataAddresses;
     }
 
-    return assetsWithDataAddresses;
-  }
-
-  private DataAddress createDataAddress(Map<String, String> map) {
-    final String bucketName = map.get("data_address_s3_bucket_name");
-    final String region = map.get("data_address_s3_region");
-    final String keyName = map.get("data_address_s3_key_name");
-    return new S3DataAddress(bucketName, region, keyName);
-  }
-
-  @AfterAll
-  public static void bucketsCleanup() {
-    S3Client s3 = new S3Client(Environment.byName("Sokrates"));
-    s3.deleteAllBuckets();
-  }
+    private DataAddress createDataAddress(Map<String, String> map) {
+        String bucketName = map.get("data_address_s3_bucket_name");
+        String region = map.get("data_address_s3_region");
+        String keyName = map.get("data_address_s3_key_name");
+        return new S3DataAddress(bucketName, region, keyName);
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/PolicyStepDefs.java

@@ -19,14 +19,28 @@
  */
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class Asset {
-  @NonNull String Id;
+    private final String id;
+    private final String description;
+    private final DataAddress dataAddress;
 
-  @NonNull String description;
+    public Asset(String id, String description, DataAddress dataAddress) {
+        this.id = Objects.requireNonNull(id);
+        this.description = Objects.requireNonNull(description);
+        this.dataAddress = Objects.requireNonNull(dataAddress);
+    }
 
-  @NonNull DataAddress dataAddress;
+    public String getId() {
+        return id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public DataAddress getDataAddress() {
+        return dataAddress;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/S3FileTransferStepsDefs.java

@@ -1,10 +1,16 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class BusinessPartnerNumberConstraint implements Constraint {
 
-  @NonNull String businessPartnerNumber;
+    private final String businessPartnerNumber;
+
+    public BusinessPartnerNumberConstraint(String businessPartnerNumber) {
+        this.businessPartnerNumber = Objects.requireNonNull(businessPartnerNumber);
+    }
+
+    public String getBusinessPartnerNumber() {
+        return businessPartnerNumber;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Asset.java

@@ -20,17 +20,42 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class ContractDefinition {
 
-  @NonNull String id;
+    private final String id;
+
+    private final String contractPolicyId;
+    private final String acccessPolicyId;
+
+    private final List<String> assetIds;
+    private final Long validity;
+
+    public ContractDefinition(String id, String contractPolicyId, String acccessPolicyId, List<String> assetIds, Long validity) {
+        this.id = Objects.requireNonNull(id);
+        this.contractPolicyId = Objects.requireNonNull(contractPolicyId);
+        this.acccessPolicyId = Objects.requireNonNull(acccessPolicyId);
+        this.assetIds = assetIds;
+        this.validity = validity;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getContractPolicyId() {
+        return contractPolicyId;
+    }
+
+    public String getAcccessPolicyId() {
+        return acccessPolicyId;
+    }
+
+    public List<String> getAssetIds() {
+        return assetIds;
+    }
 
-  @NonNull String contractPolicyId;
-  @NonNull String acccessPolicyId;
 
-  List<String> assetIds;
-  Long validity;
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/BusinessPartnerNumberConstraint.java

@@ -20,12 +20,29 @@
 
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class ContractNegotiation {
-  @NonNull String id;
-  String agreementId;
-  @NonNull ContractNegotiationState state;
+    private final String id;
+    private final ContractNegotiationState state;
+    private final String agreementId;
+
+
+    public ContractNegotiation(String id, ContractNegotiationState state, String agreementId) {
+        this.id = Objects.requireNonNull(id);
+        this.state = Objects.requireNonNull(state);
+        this.agreementId = agreementId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public ContractNegotiationState getState() {
+        return state;
+    }
+
+    public String getAgreementId() {
+        return agreementId;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractDefinition.java

@@ -19,12 +19,28 @@
  */
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class ContractOffer {
-  @NonNull String id;
-  Policy policy;
-  String assetId;
+    private final String id;
+    private final Policy policy;
+    private final String assetId;
+
+    public ContractOffer(String id, Policy policy, String assetId) {
+        this.id = Objects.requireNonNull(id);
+        this.policy = policy;
+        this.assetId = assetId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public Policy getPolicy() {
+        return policy;
+    }
+
+    public String getAssetId() {
+        return assetId;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractNegotiation.java

@@ -1,18 +1,52 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class HttpProxySourceDataAddress implements DataAddress {
-  @NonNull String baseUrl;
-  Oauth2Provision oauth2Provision;
-
-  @Value
-  public static class Oauth2Provision {
-    @NonNull String tokenUrl;
-    @NonNull String clientId;
-    @NonNull String clientSecret;
-    String scope;
-  }
+    private final String baseUrl;
+    private final Oauth2Provision oauth2Provision;
+
+    public HttpProxySourceDataAddress(String baseUrl, Oauth2Provision oauth2Provision) {
+        this.baseUrl = Objects.requireNonNull(baseUrl);
+        this.oauth2Provision = oauth2Provision;
+    }
+
+    public String getBaseUrl() {
+        return baseUrl;
+    }
+
+    public Oauth2Provision getOauth2Provision() {
+        return oauth2Provision;
+    }
+
+    public static class Oauth2Provision {
+        private final String tokenUrl;
+        private final String clientId;
+        private final String clientSecret;
+        private final String scope;
+
+        public Oauth2Provision(String tokenUrl, String clientId, String clientSecret, String scope) {
+            this.tokenUrl = Objects.requireNonNull(tokenUrl);
+            this.clientId = Objects.requireNonNull(clientId);
+            this.clientSecret = Objects.requireNonNull(clientSecret);
+            this.scope = scope;
+        }
+
+        public String getTokenUrl() {
+            return tokenUrl;
+        }
+
+        public String getScope() {
+            return scope;
+        }
+
+        public String getClientId() {
+            return clientId;
+        }
+
+        public String getClientSecret() {
+            return clientSecret;
+        }
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/ContractOffer.java

@@ -1,34 +1,43 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import static org.awaitility.Awaitility.await;
+import org.eclipse.tractusx.edc.tests.DataManagementAPI;
+import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
-import groovyjarjarantlr4.v4.runtime.misc.NotNull;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.Objects;
 import java.util.stream.Stream;
-import lombok.Value;
-import org.eclipse.tractusx.edc.tests.DataManagementAPI;
-import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
-@Value
+import static org.awaitility.Awaitility.await;
+
+
 public class Negotiation {
 
-  @NotNull String id;
-
-  public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
-    await()
-        .pollDelay(Duration.ofMillis(2000))
-        .atMost(Timeouts.CONTRACT_NEGOTIATION)
-        .until(() -> isComplete(dataManagementAPI));
-  }
-
-  public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
-    var negotiation = dataManagementAPI.getNegotiation(id);
-    return negotiation != null
-        && Stream.of(
-                ContractNegotiationState.ERROR,
-                ContractNegotiationState.CONFIRMED,
-                ContractNegotiationState.DECLINED)
-            .anyMatch((l) -> l.equals(negotiation.getState()));
-  }
+
+    private final String id;
+
+    public Negotiation(String id) {
+        this.id = Objects.requireNonNull(id);
+    }
+
+    public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
+        await()
+                .pollDelay(Duration.ofMillis(2000))
+                .atMost(Timeouts.CONTRACT_NEGOTIATION)
+                .until(() -> isComplete(dataManagementAPI));
+    }
+
+    public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
+        var negotiation = dataManagementAPI.getNegotiation(id);
+        return negotiation != null
+                && Stream.of(
+                        ContractNegotiationState.ERROR,
+                        ContractNegotiationState.CONFIRMED,
+                        ContractNegotiationState.DECLINED)
+                .anyMatch((l) -> l.equals(negotiation.getState()));
+    }
+
+    public String getId() {
+        return id;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/HttpProxySourceDataAddress.java

@@ -1,11 +1,18 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class OrConstraint implements Constraint {
 
-  @NonNull List<? extends Constraint> constraints;
+    private final List<? extends Constraint> constraints;
+
+    public OrConstraint(List<? extends Constraint> constraints) {
+        this.constraints = Objects.requireNonNull(constraints);
+    }
+
+    public List<? extends Constraint> getConstraints() {
+        return constraints;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Negotiation.java

@@ -20,13 +20,19 @@
 
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.Value;
-
 /**
  * The PayMe constraint should be used when no constraint validation/enforcement in the EDC is
  * intended.
  */
-@Value
+
 public class PayMeConstraint implements Constraint {
-  double amount;
+    private final double amount;
+
+    public PayMeConstraint(double amount) {
+        this.amount = amount;
+    }
+
+    public double getAmount() {
+        return amount;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/OrConstraint.java

@@ -20,13 +20,30 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class Permission {
-  @NonNull String action;
-  String target;
+    private final String action;
+    private final List<Constraint> constraints;
+    private final String target;
+
+
+    public Permission(String action, List<Constraint> constraints, String target) {
+        this.action = Objects.requireNonNull(action);
+        this.constraints = Objects.requireNonNull(constraints);
+        this.target = target;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public List<Constraint> getConstraints() {
+        return constraints;
+    }
 
-  @NonNull List<Constraint> constraints;
+    public String getTarget() {
+        return target;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/PayMeConstraint.java

@@ -21,11 +21,23 @@
 package org.eclipse.tractusx.edc.tests.data;
 
 import java.util.List;
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
+
 
-@Value
 public class Policy {
-  String id;
-  @NonNull List<Permission> Permission;
+    private final String id;
+    private final List<Permission> Permission;
+
+    public Policy(String id, List<Permission> permission) {
+        this.id = id;
+        Permission = Objects.requireNonNull(permission);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public List<Permission> getPermission() {
+        return Permission;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Permission.java

@@ -1,12 +1,28 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class S3DataAddress implements DataAddress {
 
-  @NonNull String bucketName;
-  @NonNull String region;
-  @NonNull String keyName;
+    private final String bucketName;
+    private final String region;
+    private final String keyName;
+
+    public S3DataAddress(String bucketName, String region, String keyName) {
+        this.bucketName = Objects.requireNonNull(bucketName);
+        this.region = Objects.requireNonNull(region);
+        this.keyName = Objects.requireNonNull(keyName);
+    }
+
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public String getKeyName() {
+        return keyName;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Policy.java

@@ -1,31 +1,41 @@
 package org.eclipse.tractusx.edc.tests.data;
 
-import static org.awaitility.Awaitility.await;
+import org.eclipse.tractusx.edc.tests.DataManagementAPI;
+import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
 import java.io.IOException;
 import java.time.Duration;
-import lombok.Value;
-import org.eclipse.tractusx.edc.tests.DataManagementAPI;
-import org.eclipse.tractusx.edc.tests.util.Timeouts;
 
-@Value
+import static org.awaitility.Awaitility.await;
+
+
 public class Transfer {
 
-  String id;
+    private final String id;
+
+    public Transfer(String id) {
+        this.id = id;
+    }
+
+    public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
+        await()
+                .pollDelay(Duration.ofMillis(2000))
+                .atMost(Timeouts.FILE_TRANSFER)
+                .until(() -> isComplete(dataManagementAPI));
+    }
 
-  public void waitUntilComplete(DataManagementAPI dataManagementAPI) {
-    await()
-        .pollDelay(Duration.ofMillis(2000))
-        .atMost(Timeouts.FILE_TRANSFER)
-        .until(() -> isComplete(dataManagementAPI));
-  }
+    public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
+        var transferProcess = dataManagementAPI.getTransferProcess(id);
+        if (transferProcess == null) {
+            return false;
+        }
 
-  public boolean isComplete(DataManagementAPI dataManagementAPI) throws IOException {
-    var transferProcess = dataManagementAPI.getTransferProcess(id);
-    if (transferProcess == null) return false;
+        var state = transferProcess.getState();
 
-    var state = transferProcess.getState();
+        return state == TransferProcessState.COMPLETED || state == TransferProcessState.ERROR;
+    }
 
-    return state == TransferProcessState.COMPLETED || state == TransferProcessState.ERROR;
-  }
+    public String getId() {
+        return id;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/S3DataAddress.java

@@ -19,11 +19,22 @@
 
 package org.eclipse.tractusx.edc.tests.data;
 
-import lombok.NonNull;
-import lombok.Value;
+import java.util.Objects;
 
-@Value
 public class TransferProcess {
-  @NonNull String id;
-  @NonNull TransferProcessState state;
+    private final String id;
+    private final TransferProcessState state;
+
+    public TransferProcess(String id, TransferProcessState state) {
+        this.id = Objects.requireNonNull(id);
+        this.state = Objects.requireNonNull(state);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public TransferProcessState getState() {
+        return state;
+    }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/Transfer.java

@@ -24,28 +24,33 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
-import lombok.RequiredArgsConstructor;
 
-@RequiredArgsConstructor
+
 public class DatabaseCleaner {
 
-  private static final String SQL =
-      "DELETE FROM edc_contract_negotiation;\n"
-          + "DELETE FROM edc_contract_agreement;\n"
-          + "DELETE FROM edc_transfer_process;\n"
-          + "DELETE FROM edc_contract_definitions;\n"
-          + "DELETE FROM edc_policydefinitions;\n"
-          + "DELETE FROM edc_asset;\n"
-          + "DELETE FROM edc_lease;";
-
-  private final String url;
-  private final String user;
-  private final String password;
-
-  public void run() throws SQLException {
-    try (Connection con = DriverManager.getConnection(url, user, password)) {
-      Statement st = con.createStatement();
-      st.executeUpdate(SQL);
+    private static final String SQL =
+            "DELETE FROM edc_contract_negotiation;\n"
+                    + "DELETE FROM edc_contract_agreement;\n"
+                    + "DELETE FROM edc_transfer_process;\n"
+                    + "DELETE FROM edc_contract_definitions;\n"
+                    + "DELETE FROM edc_policydefinitions;\n"
+                    + "DELETE FROM edc_asset;\n"
+                    + "DELETE FROM edc_lease;";
+
+    private final String url;
+    private final String user;
+    private final String password;
+
+    public DatabaseCleaner(String url, String user, String password) {
+        this.url = url;
+        this.user = user;
+        this.password = password;
+    }
+
+    public void run() throws SQLException {
+        try (Connection con = DriverManager.getConnection(url, user, password)) {
+            Statement st = con.createStatement();
+            st.executeUpdate(SQL);
+        }
     }
-  }
 }

edc-tests/cucumber/src/test/java/org/eclipse/tractusx/edc/tests/data/TransferProcess.java

@@ -19,16 +19,10 @@
 
 package org.eclipse.tractusx.edc.tests.util;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
+import org.eclipse.tractusx.edc.tests.BackendServiceBackendAPI;
 import org.eclipse.tractusx.edc.tests.Environment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.core.ResponseBytes;
@@ -45,80 +39,89 @@
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.S3Object;
 
-@Slf4j
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+
 public class S3Client {
+    private static final Logger log = LoggerFactory.getLogger(BackendServiceBackendAPI.class);
+    private final software.amazon.awssdk.services.s3.S3Client s3;
+
+    public S3Client(Environment environment) {
+
+        s3 =
+                software.amazon.awssdk.services.s3.S3Client.builder()
+                        .region(Region.US_EAST_1)
+                        .forcePathStyle(true)
+                        .endpointOverride(URI.create(environment.getAwsEndpointOverride()))
+                        .credentialsProvider(
+                                StaticCredentialsProvider.create(
+                                        AwsBasicCredentials.create(
+                                                environment.getAwsAccessKey(), environment.getAwsSecretAccessKey())))
+                        .build();
+    }
+
+    public void createBucket(String bucketName) {
+        try {
+            s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
+        } catch (BucketAlreadyOwnedByYouException e) {
+            log.info("'{}' bucket already owned - skipped bucket creation", bucketName);
+        }
+    }
+
+    public File uploadFile(String bucketName, String fileName) throws IOException {
+        File tempFile = File.createTempFile(fileName, null);
+        Files.write(
+                tempFile.toPath(), "Will fail if the file has no content".getBytes(StandardCharsets.UTF_8));
+
+        s3.putObject(
+                PutObjectRequest.builder().bucket(bucketName).key(fileName).build(),
+                RequestBody.fromFile(tempFile));
+
+        return tempFile;
+    }
+
+    public List<String> listBuckets() {
+        return s3.listBuckets().buckets().stream().map(Bucket::name).collect(Collectors.toList());
+    }
+
+    public Set<String> listBucketContent(String bucketName) {
+        return s3
+                .listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
+                .contents()
+                .stream()
+                .map(S3Object::key)
+                .collect(Collectors.toSet());
+    }
+
+    public File downloadFile(String bucketName, String fileName) throws IOException {
+        ResponseBytes<GetObjectResponse> objectAsBytes =
+                s3.getObjectAsBytes(GetObjectRequest.builder().bucket(bucketName).key(fileName).build());
+
+        return Files.write(File.createTempFile(fileName, null).toPath(), objectAsBytes.asByteArray())
+                .toFile();
+    }
+
+    public void deleteAllBuckets() {
+        List<Bucket> buckets = s3.listBuckets().buckets();
+        buckets.forEach(this::clearBucket);
+        buckets.forEach(
+                bucket -> s3.deleteBucket(DeleteBucketRequest.builder().bucket(bucket.name()).build()));
+    }
 
-  private final software.amazon.awssdk.services.s3.S3Client s3;
-
-  public S3Client(Environment environment) {
-
-    s3 =
-        software.amazon.awssdk.services.s3.S3Client.builder()
-            .region(Region.US_EAST_1)
-            .forcePathStyle(true)
-            .endpointOverride(URI.create(environment.getAwsEndpointOverride()))
-            .credentialsProvider(
-                StaticCredentialsProvider.create(
-                    AwsBasicCredentials.create(
-                        environment.getAwsAccessKey(), environment.getAwsSecretAccessKey())))
-            .build();
-  }
-
-  public void createBucket(String bucketName) {
-    try {
-      s3.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
-    } catch (BucketAlreadyOwnedByYouException e) {
-      log.info("'{}' bucket already owned - skipped bucket creation", bucketName);
+    private void clearBucket(Bucket bucket) {
+        String bucketName = bucket.name();
+        s3.listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
+                .contents()
+                .forEach(
+                        s3Object ->
+                                s3.deleteObject(
+                                        DeleteObjectRequest.builder().bucket(bucketName).key(s3Object.key()).build()));
     }
-  }
-
-  public File uploadFile(String bucketName, String fileName) throws IOException {
-    File tempFile = File.createTempFile(fileName, null);
-    Files.write(
-        tempFile.toPath(), "Will fail if the file has no content".getBytes(StandardCharsets.UTF_8));
-
-    s3.putObject(
-        PutObjectRequest.builder().bucket(bucketName).key(fileName).build(),
-        RequestBody.fromFile(tempFile));
-
-    return tempFile;
-  }
-
-  public List<String> listBuckets() {
-    return s3.listBuckets().buckets().stream().map(Bucket::name).collect(Collectors.toList());
-  }
-
-  public Set<String> listBucketContent(String bucketName) {
-    return s3
-        .listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
-        .contents()
-        .stream()
-        .map(S3Object::key)
-        .collect(Collectors.toSet());
-  }
-
-  public File downloadFile(String bucketName, String fileName) throws IOException {
-    ResponseBytes<GetObjectResponse> objectAsBytes =
-        s3.getObjectAsBytes(GetObjectRequest.builder().bucket(bucketName).key(fileName).build());
-
-    return Files.write(File.createTempFile(fileName, null).toPath(), objectAsBytes.asByteArray())
-        .toFile();
-  }
-
-  public void deleteAllBuckets() {
-    List<Bucket> buckets = s3.listBuckets().buckets();
-    buckets.forEach(this::clearBucket);
-    buckets.forEach(
-        bucket -> s3.deleteBucket(DeleteBucketRequest.builder().bucket(bucket.name()).build()));
-  }
-
-  private void clearBucket(Bucket bucket) {
-    String bucketName = bucket.name();
-    s3.listObjects(ListObjectsRequest.builder().bucket(bucketName).build())
-        .contents()
-        .forEach(
-            s3Object ->
-                s3.deleteObject(
-                    DeleteObjectRequest.builder().bucket(bucketName).key(s3Object.key()).build()));
-  }
 }