fix: add mising dependencies for provider and consumer in Sample03 an…

…d update the format of json files for the same sample
FraunhoferISST · Oct 10, 2023 · c6670dd · c6670dd
1 parent cd92e2f
commit c6670dd
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 43 deletions.
diff --git a/transfer/transfer-04-open-telemetry/contractoffer.json b/transfer/transfer-04-open-telemetry/contractoffer.json
@@ -1,43 +1,24 @@
 {
+  "@context": {
+    "edc": "https://w3id.org/edc/v0.0.1/ns/",
+    "odrl": "http://www.w3.org/ns/odrl/2/"
+  },
+  "@type": "NegotiationInitiateRequestDto",
   "connectorId": "provider",
+  "consumerId": "consumer",
+  "providerId": "provider",
   "connectorAddress": "http://provider:8282/protocol",
   "protocol": "dataspace-protocol-http",
   "offer": {
-    "offerId": "1:3a75736e-001d-4364-8bd4-9888490edb58",
+    "offerId": "1:test-document:3a75736e-001d-4364-8bd4-9888490edb58",
     "assetId": "test-document",
     "policy": {
-      "uid": "956e172f-2de1-4501-8881-057a57fd0e69",
-      "permissions": [
-        {
-          "edctype": "dataspaceconnector:permission",
-          "uid": null,
-          "target": "test-document",
-          "action": {
-            "type": "USE",
-            "includedIn": null,
-            "constraint": null
-          },
-          "assignee": null,
-          "assigner": null,
-          "constraints": [],
-          "duties": []
-        }
-      ],
-      "prohibitions": [],
-      "obligations": [],
-      "extensibleProperties": {},
-      "inheritsFrom": null,
-      "assigner": null,
-      "assignee": null,
-      "target": null,
-      "@type": {
-        "@policytype": "set"
-      }
-    },
-    "asset": {
-      "properties": {
-        "asset:prop:id": "test-document"
-      }
+      "@id": "1:test-document:956e172f-2de1-4501-8881-057a57fd0e69",
+      "@type": "set",
+      "odrl:permission": [],
+      "odrl:prohibition": [],
+      "odrl:obligation": [],
+      "odrl:target": "test-document"
     }
   }
 }
diff --git a/transfer/transfer-04-open-telemetry/filetransfer.json b/transfer/transfer-04-open-telemetry/filetransfer.json
@@ -1,16 +1,17 @@
 {
-  "protocol": "dataspace-protocol-http",
-  "assetId": "test-document",
-  "contractId": "{agreement ID}",
+  "@context": {
+    "edc": "https://w3id.org/edc/v0.0.1/ns/"
+  },
+  "@type": "TransferRequestDto",
   "dataDestination": {
+    "type": "File",
     "path": "/samples/output-file.txt",
-    "keyName": "keyName",
-    "type": "File"
-  },
-  "transferType": {
-    "contentType": "application/octet-stream",
-    "isFinite": true
+    "keyName": "keyName"
   },
+  "protocol": "dataspace-protocol-http",
+  "assetId": "test-document",
+  "contractId": "{agreement ID}",
+  "connectorId": "consumer",
   "connectorAddress": "http://provider:8282/protocol",
-  "connectorId": "consumer"
+  "privateProperties": {}
 }
diff --git a/transfer/transfer-04-open-telemetry/open-telemetry-consumer/build.gradle.kts b/transfer/transfer-04-open-telemetry/open-telemetry-consumer/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {
 
     implementation(libs.edc.auth.tokenbased)
     implementation(libs.edc.management.api)
+    implementation(libs.edc.data.plane.selector.core)
 
     implementation(libs.edc.dsp)
     runtimeOnly(libs.edc.jersey.micrometer)

diff --git a/transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts b/transfer/transfer-04-open-telemetry/open-telemetry-provider/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {
 
     implementation(libs.edc.auth.tokenbased)
     implementation(libs.edc.management.api)
+    implementation(libs.edc.control.plane.api.client)
 
     implementation(libs.edc.dsp)