build: bump EDC to 0.6.4 (#259)

* build: bump EDC to 0.6.4 * refactor participant
eclipse-edc · May 14, 2024 · 90c18cb · 90c18cb
1 parent c98f5eb
commit 90c18cb
Show file tree

Hide file tree

Showing 25 changed files with 203 additions and 540 deletions.
diff --git a/advanced/advanced-01-open-telemetry/resources/start-transfer.json b/advanced/advanced-01-open-telemetry/resources/start-transfer.json
@@ -8,7 +8,5 @@
   "contractId": "{{contract-agreement-id}}",
   "assetId": "assetId",
   "protocol": "dataspace-protocol-http",
-  "dataDestination": {
-    "type": "HttpProxy"
-  }
+  "transferType": "HttpData-PULL"
 }
diff --git a/...dvanced-02-custom-runtime/src/main/java/org/eclipse/edc/sample/runtime/CustomRuntime.java b/...dvanced-02-custom-runtime/src/main/java/org/eclipse/edc/sample/runtime/CustomRuntime.java
@@ -17,12 +17,10 @@
 import org.eclipse.edc.boot.system.DefaultServiceExtensionContext;
 import org.eclipse.edc.boot.system.runtime.BaseRuntime;
 import org.eclipse.edc.spi.monitor.Monitor;
-import org.eclipse.edc.spi.system.ConfigurationExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
+import org.eclipse.edc.spi.system.configuration.Config;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 public class CustomRuntime extends BaseRuntime {
 
     /**
@@ -34,27 +32,22 @@ public static void main(String[] args) {
     }
 
     @Override
-    protected String getRuntimeName(ServiceExtensionContext context) {
-        return "CUSTOM-RUNTIME";
-    }
-
-    @Override
-    protected @NotNull ServiceExtensionContext createContext(Monitor monitor) {
+    protected @NotNull ServiceExtensionContext createContext(Monitor monitor, Config config) {
         //override the default service extension context with a super customized one
-        return new SuperCustomExtensionContext(monitor, loadConfigurationExtensions());
+        return new SuperCustomExtensionContext(monitor, config);
     }
 
     @Override
-    protected void shutdown() {
+    public void shutdown() {
         super.shutdown();
 
         //this is the custom part here:
         monitor.info(" CUSTOM RUNTIME SHUTDOWN ! ");
     }
 
     private static class SuperCustomExtensionContext extends DefaultServiceExtensionContext {
-        SuperCustomExtensionContext(Monitor monitor, List<ConfigurationExtension> configurationExtensions) {
-            super(monitor, configurationExtensions);
+        SuperCustomExtensionContext(Monitor monitor, Config config) {
+            super(monitor, config);
         }
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -47,13 +47,6 @@ allprojects {
         configDirectory.set(rootProject.file("resources"))
     }
 
-    // EdcRuntimeExtension uses this to determine the runtime classpath of the module to run.
-    tasks.register("printClasspath") {
-        doLast {
-            println(sourceSets["main"].runtimeClasspath.asPath)
-        }
-    }
-
     tasks.test {
         testLogging {
             showStandardStreams = true

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ format.version = "1.1"
 [versions]
 assertj = "3.25.3"
 awaitility = "4.2.1"
-edc = "0.6.0"
+edc = "0.6.4"
 jakarta-json = "2.0.1"
 junit-pioneer = "2.2.0"
 jupiter = "5.10.2"
@@ -49,6 +49,7 @@ edc-json-ld-lib = { module = "org.eclipse.edc:json-ld-lib", version.ref = "edc"
 edc-json-ld-spi = { module = "org.eclipse.edc:json-ld-spi", version.ref = "edc" }
 edc-junit = { module = "org.eclipse.edc:junit", version.ref = "edc" }
 edc-management-api = { module = "org.eclipse.edc:management-api", version.ref = "edc" }
+edc-management-api-test-fixtures = { module = "org.eclipse.edc:management-api-test-fixtures", version.ref = "edc" }
 edc-micrometer-core = { module = "org.eclipse.edc:micrometer-core", version.ref = "edc" }
 edc-monitor-jdk-logger = { module = "org.eclipse.edc:monitor-jdk-logger", version.ref = "edc" }
 edc-provision-aws-s3 = { module = "org.eclipse.edc:provision-aws-s3", version.ref = "edc" }

diff --git a/...tions/src/main/java/org/eclipse/edc/sample/extension/policy/PolicyFunctionsExtension.java b/...tions/src/main/java/org/eclipse/edc/sample/extension/policy/PolicyFunctionsExtension.java
@@ -21,10 +21,10 @@
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 
-import static org.eclipse.edc.connector.contract.spi.validation.ContractValidationService.NEGOTIATION_SCOPE;
+import static org.eclipse.edc.connector.controlplane.contract.spi.validation.ContractValidationService.NEGOTIATION_SCOPE;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_USE_ACTION_ATTRIBUTE;
 import static org.eclipse.edc.policy.engine.spi.PolicyEngine.ALL_SCOPES;
-import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
+import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE;
 
 public class PolicyFunctionsExtension implements ServiceExtension {
     private static final String LOCATION_CONSTRAINT_KEY = EDC_NAMESPACE + "location";

diff --git a/system-tests/build.gradle.kts b/system-tests/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
     testImplementation(libs.edc.json.ld.lib)
     testImplementation(libs.edc.json.ld.spi)
     testImplementation(libs.edc.control.plane.spi)
+    testImplementation(testFixtures(libs.edc.management.api.test.fixtures))
     testImplementation(libs.awaitility)
     testImplementation(libs.okhttp.mockwebserver)
     testImplementation(libs.restAssured)

diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/advanced/Advanced01openTelemetryTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/advanced/Advanced01openTelemetryTest.java
@@ -16,7 +16,6 @@
 package org.eclipse.edc.samples.advanced;
 
 import org.apache.http.HttpStatus;
-import org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -31,6 +30,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
+import static org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates.STARTED;
 import static org.eclipse.edc.samples.common.FileTransferCommon.getFileContentFromRelativePath;
 import static org.eclipse.edc.samples.common.FileTransferCommon.getFileFromRelativePath;
 import static org.eclipse.edc.samples.common.NegotiationCommon.createAsset;
@@ -75,7 +75,7 @@ void runSampleSteps()  {
         var contractNegotiationId = negotiateContract(NEGOTIATE_CONTRACT_FILE_PATH, catalogDatasetId);
         var contractAgreementId = getContractAgreementId(contractNegotiationId);
         var transferProcessId = startTransfer(getFileContentFromRelativePath(START_TRANSFER_FILE_PATH), contractAgreementId);
-        checkTransferStatus(transferProcessId, TransferProcessStates.STARTED);
+        checkTransferStatus(transferProcessId, STARTED);
         assertJaegerState();
     }
 

diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer02consumerPullTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer02consumerPullTest.java
@@ -16,7 +16,7 @@
 package org.eclipse.edc.samples.transfer;
 
 import org.apache.http.HttpStatus;
-import org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates;
+import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
 import org.eclipse.edc.samples.util.HttpRequestLoggerConsumer;

diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer03providerPushTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer03providerPushTest.java
@@ -15,7 +15,7 @@
 
 package org.eclipse.edc.samples.transfer;
 
-import org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates;
+import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
 import org.eclipse.edc.samples.util.HttpRequestLoggerConsumer;

diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer04eventConsumerTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer04eventConsumerTest.java
@@ -15,7 +15,7 @@
 
 package org.eclipse.edc.samples.transfer;
 
-import org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates;
+import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.junit.extensions.EdcRuntimeExtension;
 import org.eclipse.edc.samples.util.HttpRequestLoggerContainer;