Merge pull request #193 from jimmarino/feat/policy-target

feat: Remove unnecessary dataset id references
International-Data-Spaces-Association · Jan 25, 2024 · 3a2f88b · 3a2f88b
2 parents 058bddf + 049720e
commit 3a2f88b
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 11 deletions.
diff --git a/model/model.md b/model/model.md
@@ -66,8 +66,7 @@ A [Dataset](./terminology.md#dataset) is a [DCAT Dataset](https://www.w3.org/TR/
 An [Offer](./terminology.md#offer) is an [ODRL Offer](https://www.w3.org/TR/odrl-model/#policy-offer) with the following attributes:
 
 - An ODRL `uid` is represented as an "@id" that is a unique UUID. (ODRL PROFILE)
-- The [Offer](./terminology.md#offer) must be unique to a [Dataset](./terminology.md#dataset) since the target of the [Offer](./terminology.md#offer) is derived from its enclosing context.
-- The [Offer](./terminology.md#offer) must NOT include an explicit `target` attribute.
+- A `target` attribute that is the dataset id. 
 
 ## 2.2.4 Agreement
 

diff --git a/negotiation/contract.negotiation.binding.https.md b/negotiation/contract.negotiation.binding.https.md
@@ -81,7 +81,6 @@ Authorization: ...
   "@context": "https://w3id.org/dspace/v0.8/context.json",
   "@type": "dspace:ContractRequest"
   "dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
-  "dspace:dataset": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
   "dspace:offerId": "urn:uuid:2828282:3dd1add8-4d2d-569e-d634-8394a8836a88",
   "dspace:callbackAddress": "https://..."
 }
@@ -197,7 +196,6 @@ Authorization: ...
   "@context": "https://w3id.org/dspace/v0.8/context.json",
   "@type": "dspace:ContractOfferMessage"
   "dspace:providerPid": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3",
-  "dspace:dataset": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
   "dspace:offer": {
     "@type": "odrl:Offer",
     "@id": "...",

diff --git a/negotiation/contract.negotiation.protocol.md b/negotiation/contract.negotiation.protocol.md
@@ -46,7 +46,7 @@ The CN state machine is transitioned upon receipt and acknowledgement of a messa
 ### Notes
 
 - Concrete wire formats are defined by the protocol binding, e.g. HTTPS.
-- All [Policy](../model/terminology.md#policy) types ([Offer](../model/terminology.md#offer), [Agreement](../model/terminology.md#agreement)) must contain an unique identifier in the form of a URI. GUIDs can also be used in the form of URNs, for instance following the
+- All [Policy](../model/terminology.md#policy) types ([Offer](../model/terminology.md#offer), [Agreement](../model/terminology.md#agreement)) must contain a unique identifier in the form of a URI. GUIDs can also be used in the form of URNs, for instance following the
   pattern <urn:uuid:{GUID}>.
 - An [ODRL Agreement](https://www.w3.org/TR/odrl-vocab/#term-Agreement) must have a target property containing the [Dataset](../model/terminology.md#dataset) id.
 

diff --git a/negotiation/message/contract-offer-message_initial.json b/negotiation/message/contract-offer-message_initial.json
@@ -2,7 +2,6 @@
   "@context":  "https://w3id.org/dspace/v0.8/context.json",
   "@type": "dspace:ContractOfferMessage",
   "dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
-  "dspace:dataset": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
   "dspace:offer": {
     "@type": "odrl:Offer",
     "@id": "urn:uuid:d526561f-528e-4d5a-ae12-9a9dd9b7a518",

diff --git a/negotiation/message/contract-request-message_initial.json b/negotiation/message/contract-request-message_initial.json
@@ -1,7 +1,6 @@
 {
   "@context":  "https://w3id.org/dspace/v0.8/context.json",
   "@type": "dspace:ContractRequestMessage",
-  "dspace:dataset": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
   "dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
   "dspace:offer": {
     "@type": "odrl:Offer",

diff --git a/negotiation/message/diagram/contract-request-message_initial.png b/negotiation/message/diagram/contract-request-message_initial.png
diff --git a/negotiation/message/diagram/contract-request-message_initial.puml b/negotiation/message/diagram/contract-request-message_initial.puml
@@ -9,7 +9,6 @@ hide empty description
 class "dspace:ContractRequestMessage" {
     @context : "https://w3id.org/dspace/v0.8/context.json"
     @type : dspace:ContractRequestMessage
-    dspace:dataset : String
     dspace:consumerPid : String
     dspace:offer : odrl:Offer
     dspace:callbackAddress : String
@@ -23,4 +22,4 @@ class odrl:Offer {
 
 "dspace:ContractRequestMessage" "1" *-- "1" "odrl:Offer" : "dspace:offer"
 
-@enduml
+@enduml
diff --git a/releases/v0.8/negotiation/message/contract-offer-message_initial.json b/releases/v0.8/negotiation/message/contract-offer-message_initial.json
@@ -2,7 +2,6 @@
   "@context":  "https://w3id.org/dspace/v0.8/context.json",
   "@type": "dspace:ContractOfferMessage",
   "dspace:providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
-  "dspace:dataset": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
   "dspace:offer": {
     "@type": "odrl:Offer",
     "@id": "urn:uuid:d526561f-528e-4d5a-ae12-9a9dd9b7a518",

diff --git a/releases/v0.8/negotiation/message/contract-request-message_initial.json b/releases/v0.8/negotiation/message/contract-request-message_initial.json
@@ -1,7 +1,6 @@
 {
   "@context":  "https://w3id.org/dspace/v0.8/context.json",
   "@type": "dspace:ContractRequestMessage",
-  "dspace:dataset": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
   "dspace:consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
   "dspace:offer": {
     "@type": "odrl:Offer",