diff --git a/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/domain/DataFlowPrepareMessage.java b/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/domain/DataFlowPrepareMessage.java index 5a634a91d7e..d6e3d000816 100644 --- a/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/domain/DataFlowPrepareMessage.java +++ b/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/domain/DataFlowPrepareMessage.java @@ -23,7 +23,7 @@ public final class DataFlowPrepareMessage { private String participantId; private String counterPartyId; private String dataspaceContext; - private String processId; + private String dataFlowId; private String agreementId; private String datasetId; private URI callbackAddress; @@ -51,8 +51,8 @@ public String getDataspaceContext() { return dataspaceContext; } - public String getProcessId() { - return processId; + public String getDataFlowId() { + return dataFlowId; } public String getAgreementId() { @@ -119,8 +119,8 @@ public Builder dataspaceContext(String dataspaceContext) { return this; } - public Builder processId(String processId) { - instance.processId = processId; + public Builder dataFlowId(String processId) { + instance.dataFlowId = processId; return this; } diff --git a/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/domain/DataFlowStartMessage.java b/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/domain/DataFlowStartMessage.java index 6252db1b52e..29ed64a505b 100644 --- a/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/domain/DataFlowStartMessage.java +++ b/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/domain/DataFlowStartMessage.java @@ -26,7 +26,7 @@ public final class DataFlowStartMessage { private String participantId; private String counterPartyId; private String dataspaceContext; - private String processId; + private String dataFlowId; private String agreementId; private String datasetId; private URI callbackAddress; @@ -56,8 +56,8 @@ public String getDataspaceContext() { return dataspaceContext; } - public String getProcessId() { - return processId; + public String getDataFlowId() { + return dataFlowId; } public String getAgreementId() { @@ -128,8 +128,8 @@ public Builder dataspaceContext(String dataspaceContext) { return this; } - public Builder processId(String processId) { - instance.processId = processId; + public Builder dataFlowId(String processId) { + instance.dataFlowId = processId; return this; } diff --git a/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/logic/DataPlaneSignalingFlowController.java b/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/logic/DataPlaneSignalingFlowController.java index b4cd0f1a92c..e66b47f15d9 100644 --- a/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/logic/DataPlaneSignalingFlowController.java +++ b/data-protocols/data-plane-signaling/data-plane-signaling-core/src/main/java/org/eclipse/edc/signaling/logic/DataPlaneSignalingFlowController.java @@ -88,7 +88,7 @@ public StatusResult prepare(TransferProcess transferProcess, P .participantId(policy.getAssignee()) .counterPartyId(policy.getAssigner()) .dataspaceContext(transferProcess.getProtocol()) - .processId(transferProcess.getId()) + .dataFlowId(transferProcess.getId()) .agreementId(transferProcess.getContractId()) .datasetId(transferProcess.getAssetId()) .profile(transferProcess.getTransferType()) @@ -122,7 +122,7 @@ public StatusResult prepare(TransferProcess transferProcess, P .participantId(policy.getAssigner()) .counterPartyId(policy.getAssignee()) .dataspaceContext(transferProcess.getProtocol()) - .processId(transferProcess.getId()) + .dataFlowId(transferProcess.getId()) .agreementId(transferProcess.getContractId()) .datasetId(transferProcess.getAssetId()) .profile(transferProcess.getTransferType()) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e05d1113d24..8dc854f6c0a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ atomikos = "6.0.1" awaitility = "4.2.2" bouncyCastle-jdk18on = "1.84" cloudEvents = "5.0.0" -dataplane-sdk = "1.0.0" +dataplane-sdk = "1.1.0" edc = "0.19.0-SNAPSHOT" failsafe = "3.3.2" h2 = "2.4.240" @@ -113,7 +113,7 @@ nats = { module = "io.nats:jnats", version = "2.26.2" } dcp-tck = { module = "org.eclipse.dataspacetck.dcp:dcp-tck", version = "1.0.2" } dsp-tck = { module = "org.eclipse.dataspacetck.dsp:dsp-tck", version = "1.0.1" } -dps-tck = { module = "org.eclipse.dataspacetck.dps:dps-tck", version = "1.2.0" } +dps-tck = { module = "org.eclipse.dataspacetck.dps:dps-tck", version = "1.3.0" } [bundles] jackson = ["jackson-annotations", "jackson-databind"]