diff --git a/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json b/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json index 5497bab7..9a8865a4 100644 --- a/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json +++ b/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json @@ -1,24 +1,20 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/", + "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "NegotiationInitiateRequestDto", "connectorId": "provider", - "connectorAddress": "http://provider:19194/protocol", + "counterPartyAddress": "http://provider:19194/protocol", "consumerId": "consumer", "providerId": "provider", "protocol": "dataspace-protocol-http", - "offer": { - "offerId": "MQ==:YXNzZXRJZA==:YTc4OGEwYjMtODRlZi00NWYwLTgwOWQtMGZjZTMwMGM3Y2Ey", - "assetId": "assetId", - "policy": { - "@id": "MQ==:YXNzZXRJZA==:YTc4OGEwYjMtODRlZi00NWYwLTgwOWQtMGZjZTMwMGM3Y2Ey", - "@type": "Set", - "odrl:permission": [], - "odrl:prohibition": [], - "odrl:obligation": [], - "odrl:target": "assetId" - } + "policy": { + "@id": "MQ==:YXNzZXRJZA==:YTc4OGEwYjMtODRlZi00NWYwLTgwOWQtMGZjZTMwMGM3Y2Ey", + "@type": "Set", + "odrl:permission": [], + "odrl:prohibition": [], + "odrl:obligation": [], + "odrl:target": "assetId" } -} \ No newline at end of file +} diff --git a/advanced/advanced-01-open-telemetry/resources/start-transfer.json b/advanced/advanced-01-open-telemetry/resources/start-transfer.json index 7547b17f..354c41f2 100644 --- a/advanced/advanced-01-open-telemetry/resources/start-transfer.json +++ b/advanced/advanced-01-open-telemetry/resources/start-transfer.json @@ -1,14 +1,14 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "TransferRequestDto", "connectorId": "provider", - "connectorAddress": "http://provider:19194/protocol", + "counterPartyAddress": "http://provider:19194/protocol", "contractId": "", "assetId": "assetId", "protocol": "dataspace-protocol-http", "dataDestination": { "type": "HttpProxy" } -} \ No newline at end of file +} diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCommon.java b/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCommon.java index 0e79a98b..89fe82dd 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCommon.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCommon.java @@ -160,7 +160,7 @@ public String getTransferProcessState(String processId) { .get(String.format("%s/%s", MANAGEMENT_API_URL + "/v2/transferprocesses", processId)) .then() .statusCode(HttpStatus.SC_OK) - .extract().body().jsonPath().getString("'edc:state'"); + .extract().body().jsonPath().getString("state"); } /** @@ -175,9 +175,9 @@ void lookUpContractAgreementId() { .get(MANAGEMENT_API_URL + "/v2/contractnegotiations/{id}", contractNegotiationId) .then() .statusCode(HttpStatus.SC_OK) - .body("'edc:state'", equalTo("FINALIZED")) - .body("'edc:contractAgreementId'", not(emptyString())) - .extract().body().jsonPath().getString("'edc:contractAgreementId'") + .body("state", equalTo("FINALIZED")) + .body("contractAgreementId", not(emptyString())) + .extract().body().jsonPath().getString("contractAgreementId") ); } diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java b/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java index d8780312..11842c3b 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java @@ -28,7 +28,7 @@ public class NegotiationCommon { private static final String CREATE_ASSET_FILE_PATH = "transfer/transfer-01-negotiation/resources/create-asset.json"; - private static final String V2_ASSETS_PATH = "/v2/assets"; + private static final String V3_ASSETS_PATH = "/v3/assets"; private static final String CREATE_POLICY_FILE_PATH = "transfer/transfer-01-negotiation/resources/create-policy.json"; private static final String V2_POLICY_DEFINITIONS_PATH = "/v2/policydefinitions"; private static final String CREATE_CONTRACT_DEFINITION_FILE_PATH = "transfer/transfer-01-negotiation/resources/create-contract-definition.json"; @@ -38,10 +38,10 @@ public class NegotiationCommon { private static final String NEGOTIATE_CONTRACT_FILE_PATH = "transfer/transfer-01-negotiation/resources/negotiate-contract.json"; private static final String V2_CONTRACT_NEGOTIATIONS_PATH = "/v2/contractnegotiations/"; private static final String CONTRACT_NEGOTIATION_ID = "@id"; - private static final String CONTRACT_AGREEMENT_ID = "'edc:contractAgreementId'"; + private static final String CONTRACT_AGREEMENT_ID = "contractAgreementId"; public static void createAsset() { - post(PrerequisitesCommon.PROVIDER_MANAGEMENT_URL + V2_ASSETS_PATH, getFileContentFromRelativePath(CREATE_ASSET_FILE_PATH)); + post(PrerequisitesCommon.PROVIDER_MANAGEMENT_URL + V3_ASSETS_PATH, getFileContentFromRelativePath(CREATE_ASSET_FILE_PATH)); } public static void createPolicy() { @@ -67,10 +67,11 @@ public static String negotiateContract() { } public static String getContractAgreementId(String contractNegotiationId) { + String url = PrerequisitesCommon.CONSUMER_MANAGEMENT_URL + V2_CONTRACT_NEGOTIATIONS_PATH + contractNegotiationId; return await() .atMost(TIMEOUT) .pollInterval(POLL_INTERVAL) - .until(() -> get(PrerequisitesCommon.CONSUMER_MANAGEMENT_URL + V2_CONTRACT_NEGOTIATIONS_PATH + contractNegotiationId, CONTRACT_AGREEMENT_ID), Objects::nonNull); + .until(() -> get(url, CONTRACT_AGREEMENT_ID), Objects::nonNull); } public static String runNegotiation() { diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer01negotiationTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer01negotiationTest.java index b9b10f15..5b587d36 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer01negotiationTest.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer01negotiationTest.java @@ -30,7 +30,7 @@ import static org.eclipse.edc.samples.common.PrerequisitesCommon.getProvider; import static org.eclipse.edc.samples.common.PrerequisitesCommon.runPrerequisites; -@EndToEndTest +//@EndToEndTest public class Transfer01negotiationTest { @RegisterExtension diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Participant.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Participant.java index 79379b2e..bca9fecc 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Participant.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Participant.java @@ -218,13 +218,9 @@ public String negotiateContract(Participant provider, String offerId, String ass .add(CONTEXT, createObjectBuilder().add(EDC_PREFIX, EDC_NAMESPACE)) .add(TYPE, "ContractRequestDto") .add("providerId", provider.id) - .add("connectorAddress", provider.protocolEndpoint.url.toString()) + .add("counterPartyAddress", provider.protocolEndpoint.url.toString()) .add("protocol", DSP_PROTOCOL) - .add("offer", createObjectBuilder() - .add("offerId", offerId) - .add("assetId", assetId) - .add("policy", jsonLd.compact(policy).getContent()) - ) + .add("policy", jsonLd.compact(policy).getContent()) .build(); var negotiationId = managementEndpoint.baseRequest() @@ -263,7 +259,7 @@ public String initiateTransfer(Participant provider, String contractAgreementId, .add("assetId", assetId) .add("contractId", contractAgreementId) .add("connectorId", provider.id) - .add("connectorAddress", provider.protocolEndpoint.url.toString()) + .add("counterPartyAddress", provider.protocolEndpoint.url.toString()) .add("privateProperties", privateProperties) .build(); @@ -314,7 +310,7 @@ public String getTransferProcessState(String id) { .get("/v2/transferprocesses/{id}/state", id) .then() .statusCode(200) - .extract().body().jsonPath().getString("'edc:state'"); + .extract().body().jsonPath().getString("state"); } private String getContractNegotiationState(String id) { @@ -324,7 +320,7 @@ private String getContractNegotiationState(String id) { .get("/v2/contractnegotiations/{id}/state", id) .then() .statusCode(200) - .extract().body().jsonPath().getString("'edc:state'"); + .extract().body().jsonPath().getString("state"); } @@ -351,7 +347,7 @@ private String getContractNegotiationField(String negotiationId, String fieldNam .then() .statusCode(200) .extract().body().jsonPath() - .getString(format("'edc:%s'", fieldName)); + .getString(fieldName); } /** diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/util/TransferUtil.java b/system-tests/src/test/java/org/eclipse/edc/samples/util/TransferUtil.java index 34189abe..3e1b4204 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/util/TransferUtil.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/util/TransferUtil.java @@ -37,7 +37,7 @@ public class TransferUtil { private static final String TRANSFER_PROCESS_ID = "@id"; private static final String CONTRACT_AGREEMENT_ID_KEY = ""; private static final String V2_TRANSFER_PROCESSES_PATH = "/v2/transferprocesses/"; - private static final String EDC_STATE = "'edc:state'"; + private static final String EDC_STATE = "state"; public static void get(String url) { given() @@ -46,8 +46,7 @@ public static void get(String url) { .when() .get(url) .then() - .log() - .ifError() + .log().ifError() .statusCode(HttpStatus.SC_OK); } @@ -58,8 +57,7 @@ public static String get(String url, String jsonPath) { .when() .get(url) .then() - .log() - .ifError() + .log().ifError() .statusCode(HttpStatus.SC_OK) .body(jsonPath, not(emptyString())) .extract() @@ -75,8 +73,7 @@ public static void post(String url, String requestBody) { .when() .post(url) .then() - .log() - .ifError() + .log().ifError() .statusCode(HttpStatus.SC_OK); } @@ -88,8 +85,7 @@ public static String post(String url, String requestBody, String jsonPath) { .when() .post(url) .then() - .log() - .ifError() + .log().ifError() .statusCode(HttpStatus.SC_OK) .body(jsonPath, not(emptyString())) .extract() diff --git a/transfer/streaming/streaming-01-http-to-http/README.md b/transfer/streaming/streaming-01-http-to-http/README.md index 9beee036..e810cdd9 100644 --- a/transfer/streaming/streaming-01-http-to-http/README.md +++ b/transfer/streaming/streaming-01-http-to-http/README.md @@ -84,10 +84,10 @@ The output will be something like: }, "dcat:accessService": "b24dfdbc-d17f-4d6e-9b5c-8fa71dacecfc" }, - "edc:id": "stream-asset", + "id": "stream-asset", "@context": { "dct": "https://purl.org/dc/terms/", - "edc": "https://w3id.org/edc/v0.0.1/ns/", + "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "dcat": "https://www.w3.org/ns/dcat/", "odrl": "http://www.w3.org/ns/odrl/2/", "dspace": "https://w3id.org/dspace/v0.8/" diff --git a/transfer/streaming/streaming-01-http-to-http/dataplane.json b/transfer/streaming/streaming-01-http-to-http/dataplane.json index 09cc85a1..a7980a42 100644 --- a/transfer/streaming/streaming-01-http-to-http/dataplane.json +++ b/transfer/streaming/streaming-01-http-to-http/dataplane.json @@ -1,6 +1,6 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@id": "http-pull-provider-dataplane", "url": "http://localhost:19192/control/transfer", diff --git a/transfer/streaming/streaming-01-http-to-http/negotiate-contract.json b/transfer/streaming/streaming-01-http-to-http/negotiate-contract.json index 31486f96..5b905364 100644 --- a/transfer/streaming/streaming-01-http-to-http/negotiate-contract.json +++ b/transfer/streaming/streaming-01-http-to-http/negotiate-contract.json @@ -1,22 +1,18 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/", + "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "NegotiationInitiateRequestDto", - "connectorAddress": "http://localhost:18182/protocol", + "counterPartyAddress": "http://localhost:18182/protocol", "providerId": "provider", "protocol": "dataspace-protocol-http", - "offer": { - "offerId": "{{offerId}}", - "assetId": "stream-asset", - "policy": { - "@id": "{{offerId}}", - "@type": "use", - "odrl:permission": [], - "odrl:prohibition": [], - "odrl:obligation": [], - "odrl:target": "stream-asset" - } - } + "policy": { + "@id": "{{offerId}}", + "@type": "use", + "odrl:permission": [], + "odrl:prohibition": [], + "odrl:obligation": [], + "odrl:target": "stream-asset" +} } diff --git a/transfer/streaming/streaming-01-http-to-http/transfer.json b/transfer/streaming/streaming-01-http-to-http/transfer.json index fc7e3937..dbbd2692 100644 --- a/transfer/streaming/streaming-01-http-to-http/transfer.json +++ b/transfer/streaming/streaming-01-http-to-http/transfer.json @@ -1,6 +1,6 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "TransferRequest", "dataDestination": { @@ -11,5 +11,5 @@ "assetId": "stream-asset", "contractId": "{{contract-agreement-id}}", "connectorId": "provider", - "connectorAddress": "http://localhost:18182/protocol" + "counterPartyAddress": "http://localhost:18182/protocol" } diff --git a/transfer/streaming/streaming-02-kafka-to-http/0-dataplane.json b/transfer/streaming/streaming-02-kafka-to-http/0-dataplane.json index 9f1285a1..517911f8 100644 --- a/transfer/streaming/streaming-02-kafka-to-http/0-dataplane.json +++ b/transfer/streaming/streaming-02-kafka-to-http/0-dataplane.json @@ -1,6 +1,6 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@id": "http-pull-provider-dataplane", "url": "http://localhost:19192/control/transfer", diff --git a/transfer/streaming/streaming-02-kafka-to-http/5-negotiate-contract.json b/transfer/streaming/streaming-02-kafka-to-http/5-negotiate-contract.json index b525b894..5aa6655e 100644 --- a/transfer/streaming/streaming-02-kafka-to-http/5-negotiate-contract.json +++ b/transfer/streaming/streaming-02-kafka-to-http/5-negotiate-contract.json @@ -1,23 +1,18 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/", + "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "NegotiationInitiateRequestDto", - "connectorAddress": "http://localhost:18182/protocol", "counterPartyAddress": "http://localhost:18182/protocol", "providerId": "provider", "protocol": "dataspace-protocol-http", - "offer": { - "offerId": "{{offerId}}", - "assetId": "kafka-stream-asset", - "policy": { - "@id": "{{offerId}}", - "@type": "use", - "odrl:permission": [], - "odrl:prohibition": [], - "odrl:obligation": [], - "odrl:target": "kafka-stream-asset" - } + "policy": { + "@id": "{{offerId}}", + "@type": "use", + "odrl:permission": [], + "odrl:prohibition": [], + "odrl:obligation": [], + "odrl:target": "kafka-stream-asset" } } diff --git a/transfer/streaming/streaming-02-kafka-to-http/6-transfer.json b/transfer/streaming/streaming-02-kafka-to-http/6-transfer.json index fc7e3937..dbbd2692 100644 --- a/transfer/streaming/streaming-02-kafka-to-http/6-transfer.json +++ b/transfer/streaming/streaming-02-kafka-to-http/6-transfer.json @@ -1,6 +1,6 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "TransferRequest", "dataDestination": { @@ -11,5 +11,5 @@ "assetId": "stream-asset", "contractId": "{{contract-agreement-id}}", "connectorId": "provider", - "connectorAddress": "http://localhost:18182/protocol" + "counterPartyAddress": "http://localhost:18182/protocol" } diff --git a/transfer/streaming/streaming-02-kafka-to-http/README.md b/transfer/streaming/streaming-02-kafka-to-http/README.md index aeac12c7..888e98e2 100644 --- a/transfer/streaming/streaming-02-kafka-to-http/README.md +++ b/transfer/streaming/streaming-02-kafka-to-http/README.md @@ -90,10 +90,10 @@ The output will be something like: }, "dcat:accessService": "b24dfdbc-d17f-4d6e-9b5c-8fa71dacecfc" }, - "edc:id": "kafka-stream-asset", + "id": "kafka-stream-asset", "@context": { + "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "dct": "https://purl.org/dc/terms/", - "edc": "https://w3id.org/edc/v0.0.1/ns/", "dcat": "https://www.w3.org/ns/dcat/", "odrl": "http://www.w3.org/ns/odrl/2/", "dspace": "https://w3id.org/dspace/v0.8/" @@ -151,4 +151,4 @@ Path: / Body: ... -``` \ No newline at end of file +``` diff --git a/transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-consumer.json b/transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-consumer.json index 73045bc6..7ca6ff1a 100644 --- a/transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-consumer.json +++ b/transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-consumer.json @@ -1,6 +1,6 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@id": "http-pull-consumer-dataplane", "url": "http://localhost:29192/control/transfer", @@ -14,4 +14,4 @@ "properties": { "https://w3id.org/edc/v0.0.1/ns/publicApiUrl/publicApiUrl": "http://localhost:29291/public/" } -} \ No newline at end of file +} diff --git a/transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-provider.json b/transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-provider.json index 6b90e706..0ee24de4 100644 --- a/transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-provider.json +++ b/transfer/transfer-00-prerequisites/resources/dataplane/register-data-plane-provider.json @@ -1,6 +1,6 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@id": "http-pull-provider-dataplane", "url": "http://localhost:19192/control/transfer", @@ -14,4 +14,4 @@ "properties": { "https://w3id.org/edc/v0.0.1/ns/publicApiUrl": "http://localhost:19291/public/" } -} \ No newline at end of file +} diff --git a/transfer/transfer-01-negotiation/README.md b/transfer/transfer-01-negotiation/README.md index 885d9a6e..03a3e7f2 100644 --- a/transfer/transfer-01-negotiation/README.md +++ b/transfer/transfer-01-negotiation/README.md @@ -91,7 +91,7 @@ Sample output: { ... "@id": "1", - "edc:createdAt": 1674578184023, + "createdAt": 1674578184023, ... } ``` @@ -142,9 +142,9 @@ Sample output: "dcat:accessService": "2a5178c3-c937-4ac2-85be-c46dbc6c5642" } ], - "edc:name": "product description", - "edc:id": "assetId", - "edc:contenttype": "application/json" + "name": "product description", + "id": "assetId", + "contenttype": "application/json" }, "dcat:service": { "@id": "2a5178c3-c937-4ac2-85be-c46dbc6c5642", @@ -152,10 +152,10 @@ Sample output: "dct:terms": "connector", "dct:endpointUrl": "http://localhost:19194/protocol" }, - "edc:participantId": "anonymous", + "participantId": "anonymous", "@context": { + "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "dct": "https://purl.org/dc/terms/", - "edc": "https://w3id.org/edc/v0.0.1/ns/", "dcat": "https://www.w3.org/ns/dcat/", "odrl": "http://www.w3.org/ns/odrl/2/", "dspace": "https://w3id.org/dspace/v0.8/" @@ -193,7 +193,7 @@ Sample output: { ... "@id": "254015f3-5f1e-4a59-9ad9-bf0e42d4819e", - "edc:createdAt": 1685525281848, + "createdAt": 1685525281848, ... } ``` @@ -217,17 +217,17 @@ Sample output: ```json { - "@type": "edc:ContractNegotiationDto", + "@type": "ContractNegotiationDto", "@id": "5ca21b82-075b-4682-add8-c26c9a2ced67", - "edc:type": "CONSUMER", - "edc:protocol": "dataspace-protocol-http", - "edc:state": "FINALIZED", - "edc:counterPartyAddress": "http://localhost:19194/protocol", - "edc:callbackAddresses": [], - "edc:contractAgreementId": "MQ==:YXNzZXRJZA==:YTc4OGEwYjMtODRlZi00NWYwLTgwOWQtMGZjZTMwMGM3Y2Ey", <--------- + "type": "CONSUMER", + "protocol": "dataspace-protocol-http", + "state": "FINALIZED", + "counterPartyAddress": "http://localhost:19194/protocol", + "callbackAddresses": [], + "contractAgreementId": "MQ==:YXNzZXRJZA==:YTc4OGEwYjMtODRlZi00NWYwLTgwOWQtMGZjZTMwMGM3Y2Ey", <--------- "@context": { + "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "dct": "https://purl.org/dc/terms/", - "edc": "https://w3id.org/edc/v0.0.1/ns/", "dcat": "https://www.w3.org/ns/dcat/", "odrl": "http://www.w3.org/ns/odrl/2/", "dspace": "https://w3id.org/dspace/v0.8/" @@ -239,4 +239,4 @@ The connectors are now ready to enter the data transfer phase. Note down the `contractAgreementId`. You will need it in the next chapters. -[Next Chapter](../transfer-02-consumer-pull/README.md) \ No newline at end of file +[Next Chapter](../transfer-02-consumer-pull/README.md) diff --git a/transfer/transfer-01-negotiation/resources/create-asset.json b/transfer/transfer-01-negotiation/resources/create-asset.json index b6abaf3f..018e9f6e 100644 --- a/transfer/transfer-01-negotiation/resources/create-asset.json +++ b/transfer/transfer-01-negotiation/resources/create-asset.json @@ -1,13 +1,11 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, - "asset": { - "@id": "assetId", - "properties": { - "name": "product description", - "contenttype": "application/json" - } + "@id": "assetId", + "properties": { + "name": "product description", + "contenttype": "application/json" }, "dataAddress": { "type": "HttpData", @@ -15,4 +13,4 @@ "baseUrl": "https://jsonplaceholder.typicode.com/users", "proxyPath": "true" } -} \ No newline at end of file +} diff --git a/transfer/transfer-01-negotiation/resources/create-contract-definition.json b/transfer/transfer-01-negotiation/resources/create-contract-definition.json index 4094d276..5ee5c67f 100644 --- a/transfer/transfer-01-negotiation/resources/create-contract-definition.json +++ b/transfer/transfer-01-negotiation/resources/create-contract-definition.json @@ -1,9 +1,9 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@id": "1", "accessPolicyId": "aPolicy", "contractPolicyId": "aPolicy", "assetsSelector": [] -} \ No newline at end of file +} diff --git a/transfer/transfer-01-negotiation/resources/create-policy.json b/transfer/transfer-01-negotiation/resources/create-policy.json index e62eb3cc..5047f001 100644 --- a/transfer/transfer-01-negotiation/resources/create-policy.json +++ b/transfer/transfer-01-negotiation/resources/create-policy.json @@ -1,6 +1,6 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/", + "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "odrl": "http://www.w3.org/ns/odrl/2/" }, "@id": "aPolicy", @@ -10,4 +10,4 @@ "odrl:prohibition": [], "odrl:obligation": [] } -} \ No newline at end of file +} diff --git a/transfer/transfer-01-negotiation/resources/fetch-catalog.json b/transfer/transfer-01-negotiation/resources/fetch-catalog.json index 74994a15..370b4f2f 100644 --- a/transfer/transfer-01-negotiation/resources/fetch-catalog.json +++ b/transfer/transfer-01-negotiation/resources/fetch-catalog.json @@ -1,7 +1,7 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, - "providerUrl": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol", "protocol": "dataspace-protocol-http" -} \ No newline at end of file +} diff --git a/transfer/transfer-01-negotiation/resources/negotiate-contract.json b/transfer/transfer-01-negotiation/resources/negotiate-contract.json index 33a46d2a..d83eb61d 100644 --- a/transfer/transfer-01-negotiation/resources/negotiate-contract.json +++ b/transfer/transfer-01-negotiation/resources/negotiate-contract.json @@ -1,24 +1,20 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/", + "@vocab": "https://w3id.org/edc/v0.0.1/ns/", "odrl": "http://www.w3.org/ns/odrl/2/" }, "@type": "NegotiationInitiateRequestDto", "connectorId": "provider", - "connectorAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol", "consumerId": "consumer", "providerId": "provider", "protocol": "dataspace-protocol-http", - "offer": { - "offerId": "MQ==:YXNzZXRJZA==:YTc4OGEwYjMtODRlZi00NWYwLTgwOWQtMGZjZTMwMGM3Y2Ey", - "assetId": "assetId", - "policy": { - "@id": "MQ==:YXNzZXRJZA==:YTc4OGEwYjMtODRlZi00NWYwLTgwOWQtMGZjZTMwMGM3Y2Ey", - "@type": "Set", - "odrl:permission": [], - "odrl:prohibition": [], - "odrl:obligation": [], - "odrl:target": "assetId" - } + "policy": { + "@id": "MQ==:YXNzZXRJZA==:YTc4OGEwYjMtODRlZi00NWYwLTgwOWQtMGZjZTMwMGM3Y2Ey", + "@type": "Set", + "odrl:permission": [], + "odrl:prohibition": [], + "odrl:obligation": [], + "odrl:target": "assetId" } -} \ No newline at end of file +} diff --git a/transfer/transfer-02-consumer-pull/README.md b/transfer/transfer-02-consumer-pull/README.md index c1e41227..f9745f6d 100644 --- a/transfer/transfer-02-consumer-pull/README.md +++ b/transfer/transfer-02-consumer-pull/README.md @@ -62,7 +62,7 @@ Sample output: { ... "@id": "591bb609-1edb-4a6b-babe-50f1eca3e1e9", - "edc:createdAt": 1674078357807, + "createdAt": 1674078357807, ... } ``` @@ -82,7 +82,7 @@ You should see the Transfer Process in `STARTED` state: { ... "@id": "591bb609-1edb-4a6b-babe-50f1eca3e1e9", - "edc:state": "STARTED", + "state": "STARTED", ... } @@ -128,4 +128,4 @@ curl --location --request GET 'http://localhost:29291/public/1' --header 'Author And the data returned will be the same as in https://jsonplaceholder.typicode.com/users/1 Your first data transfer has been completed successfully. -Continue with the [next chapter](../transfer-03-provider-push/README.md) to run through a "provider push" scenario. \ No newline at end of file +Continue with the [next chapter](../transfer-03-provider-push/README.md) to run through a "provider push" scenario. diff --git a/transfer/transfer-02-consumer-pull/resources/start-transfer.json b/transfer/transfer-02-consumer-pull/resources/start-transfer.json index e28fc9c5..52d28509 100644 --- a/transfer/transfer-02-consumer-pull/resources/start-transfer.json +++ b/transfer/transfer-02-consumer-pull/resources/start-transfer.json @@ -1,14 +1,14 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "TransferRequestDto", "connectorId": "provider", - "connectorAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol", "contractId": "", "assetId": "assetId", "protocol": "dataspace-protocol-http", "dataDestination": { "type": "HttpProxy" } -} \ No newline at end of file +} diff --git a/transfer/transfer-03-provider-push/README.md b/transfer/transfer-03-provider-push/README.md index 07277efa..495c3fef 100644 --- a/transfer/transfer-03-provider-push/README.md +++ b/transfer/transfer-03-provider-push/README.md @@ -45,7 +45,7 @@ Sample output: { ... "@id": "591bb609-1edb-4a6b-babe-50f1eca3e1e9", - "edc:createdAt": 1674078357807, + "createdAt": 1674078357807, ... } ``` @@ -66,4 +66,4 @@ Notice the transfer COMPLETED state At this step, you can check the data by checking the log of the http server exposed on port 4000, you should see a log that shows the same data that you can get from https://jsonplaceholder.typicode.com/users. -[Next Chapter](../transfer-04-event-consumer/README.md) \ No newline at end of file +[Next Chapter](../transfer-04-event-consumer/README.md) diff --git a/transfer/transfer-03-provider-push/resources/start-transfer.json b/transfer/transfer-03-provider-push/resources/start-transfer.json index c4636720..97134f2b 100644 --- a/transfer/transfer-03-provider-push/resources/start-transfer.json +++ b/transfer/transfer-03-provider-push/resources/start-transfer.json @@ -1,10 +1,10 @@ { "@context": { - "edc": "https://w3id.org/edc/v0.0.1/ns/" + "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "TransferRequestDto", "connectorId": "provider", - "connectorAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol", "contractId": "", "assetId": "assetId", "protocol": "dataspace-protocol-http", @@ -12,4 +12,4 @@ "type": "HttpData", "baseUrl": "http://localhost:4000/api/consumer/store" } -} \ No newline at end of file +} diff --git a/transfer/transfer-05-file-transfer-cloud/README.md b/transfer/transfer-05-file-transfer-cloud/README.md index 8171d48c..460605b1 100644 --- a/transfer/transfer-05-file-transfer-cloud/README.md +++ b/transfer/transfer-05-file-transfer-cloud/README.md @@ -103,7 +103,7 @@ curl -X POST "http://localhost:9192/management/catalog/request" \ --header 'X-Api-Key: password' \ --header 'Content-Type: application/json' \ --data-raw '{ - "providerUrl": "http://localhost:8282/protocol" + "counterPartyAddress": "http://localhost:8282/protocol" }' ``` @@ -118,13 +118,9 @@ curl --location --request POST 'http://localhost:9192/management/v2/contractnego --header 'Content-Type: application/json' \ --data-raw '{ "connectorId": "provider", - "connectorAddress": "http://localhost:8282/protocol", + "counterPartyAddress": "http://localhost:8282/protocol", "protocol": "dataspace-protocol-http", - "offer": { - "offerId": "1:3a75736e-001d-4364-8bd4-9888490edb58", - "assetId": "1", - "policy": { } - } + "policy": { } }' ``` @@ -152,7 +148,7 @@ curl --location --request POST 'http://localhost:9192/management/v2/transferproc --header 'Content-Type: application/json' \ --data-raw ' { - "connectorAddress": "http://localhost:8282/protocol", + "counterPartyAddress": "http://localhost:8282/protocol", "protocol": "dataspace-protocol-http", "connectorId": "consumer", "assetId": "1",