build: bump EDC to 0.6.4

eclipse-edc · May 13, 2024 · ccd45fb · ccd45fb
1 parent 1af902d
commit ccd45fb
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 23 deletions.
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"

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/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.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/.../java/org/eclipse/edc/samples/transfer/streaming/http/HttpStreamingDataSourceFactory.java b/.../java/org/eclipse/edc/samples/transfer/streaming/http/HttpStreamingDataSourceFactory.java
@@ -14,9 +14,9 @@
 
 package org.eclipse.edc.samples.transfer.streaming.http;
 
+import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcess;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSource;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.DataSourceFactory;
-import org.eclipse.edc.connector.transfer.spi.types.TransferProcess;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.types.domain.transfer.DataFlowStartMessage;
 import org.jetbrains.annotations.NotNull;
@@ -31,8 +31,8 @@
 public class HttpStreamingDataSourceFactory implements DataSourceFactory {
 
     @Override
-    public boolean canHandle(DataFlowStartMessage dataFlowStartMessage) {
-        return dataFlowStartMessage.getSourceDataAddress().getType().equals("HttpStreaming");
+    public String supportedType() {
+        return "HttpStreaming";
     }
 
     @Override

diff --git a/.../streaming-03-runtime/src/main/java/org/eclipse/edc/samples/streaming/KafkaExtension.java b/.../streaming-03-runtime/src/main/java/org/eclipse/edc/samples/streaming/KafkaExtension.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.edc.samples.streaming;
 
-import org.eclipse.edc.connector.transfer.spi.flow.DataFlowManager;
+import org.eclipse.edc.connector.controlplane.transfer.spi.flow.DataFlowManager;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;

diff --git a/...ntime/src/main/java/org/eclipse/edc/samples/streaming/KafkaToKafkaDataFlowController.java b/...ntime/src/main/java/org/eclipse/edc/samples/streaming/KafkaToKafkaDataFlowController.java
@@ -14,14 +14,14 @@
 
 package org.eclipse.edc.samples.streaming;
 
-import org.eclipse.edc.connector.transfer.spi.flow.DataFlowController;
-import org.eclipse.edc.connector.transfer.spi.types.DataFlowResponse;
-import org.eclipse.edc.connector.transfer.spi.types.TransferProcess;
+import org.eclipse.edc.connector.controlplane.asset.spi.domain.Asset;
+import org.eclipse.edc.connector.controlplane.transfer.spi.flow.DataFlowController;
+import org.eclipse.edc.connector.controlplane.transfer.spi.types.DataFlowResponse;
+import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcess;
 import org.eclipse.edc.dataaddress.kafka.spi.KafkaDataAddressSchema;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.spi.response.StatusResult;
 import org.eclipse.edc.spi.types.domain.DataAddress;
-import org.eclipse.edc.spi.types.domain.asset.Asset;
 import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...c/main/java/org/eclipse/edc/sample/extension/listener/TransferProcessStartedListener.java b/...c/main/java/org/eclipse/edc/sample/extension/listener/TransferProcessStartedListener.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.sample.extension.listener;
 
-import org.eclipse.edc.connector.transfer.spi.observe.TransferProcessListener;
-import org.eclipse.edc.connector.transfer.spi.types.TransferProcess;
+import org.eclipse.edc.connector.controlplane.transfer.spi.observe.TransferProcessListener;
+import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcess;
 import org.eclipse.edc.spi.monitor.Monitor;
 
 public class TransferProcessStartedListener implements TransferProcessListener {

diff --git a/...va/org/eclipse/edc/sample/extension/listener/TransferProcessStartedListenerExtension.java b/...va/org/eclipse/edc/sample/extension/listener/TransferProcessStartedListenerExtension.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.edc.sample.extension.listener;
 
-import org.eclipse.edc.connector.transfer.spi.observe.TransferProcessObservable;
+import org.eclipse.edc.connector.controlplane.transfer.spi.observe.TransferProcessObservable;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;