Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove checksum from ContractNegotiation and correlating messages #99

Merged
merged 3 commits into from
May 15, 2023
Merged

fix: remove checksum from ContractNegotiation and correlating messages #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e65d5d
refactor: remove checksum from ContractNegotiation
juliapampus May 10, 2023
a4c0d7b
refactor: remove checksum from contract offer and event message
juliapampus May 12, 2023
6be0d8a
fix: remove non-existent property from contract-negotiation-shape
juliapampus May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions negotiation/contract.negotiation.binding.https.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ Authorization: ...
"@type": "odrl:Offer",
"@id": "...",
"target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88"
},
"dspace:checksum": "..."
}
}
```

Expand Down Expand Up @@ -207,8 +206,7 @@ Authorization: ...
"@type": "odrl:Offer",
"@id": "...",
"target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88"
},
"dspace:checksum": "..."
}
}
```

Expand All @@ -235,8 +233,7 @@ Authorization: ...
"@type": "odrl:Agreement",
"@id": "e8dc8655-44c2-46ef-b701-4cffdc2faa44"
}
},
"dspace:checksum": "..."
}
}
```

Expand Down
3 changes: 1 addition & 2 deletions negotiation/message/contract-negotiation-event-message.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"@context": "https://w3id.org/dspace/v0.8/context.json",
"@type": "dspace:ContractNegotiationEventMessage",
"dspace:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
"dspace:eventType": "ACCEPTED",
"dspace:checksum": "1ad23hs6"
"dspace:eventType": "ACCEPTED"
}
3 changes: 1 addition & 2 deletions negotiation/message/contract-negotiation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
"@id": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3",
"@type": "dspace:ContractNegotiation",
"dspace:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3",
"dspace:state": "REQUESTED",
"dspace:checksum": "..."
"dspace:state": "REQUESTED"
}
1 change: 0 additions & 1 deletion negotiation/message/contract-offer-message.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
"@id": "...",
"target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88"
},
"dspace:checksum": "...",
"dspace:callbackAddress": "https://......"
}
Binary file modified negotiation/message/diagram/contract-negotiation-event-message.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion negotiation/message/diagram/contract-negotiation-event-message.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class "dspace:ContractNegotiationEventMessage" {
@type : "dspace:ContractNegotiationEventMessage"
dspace:processId : String
dspace:eventType : dspace:NegotiationEvent
dspace:checksum : String
}

enum dspace:NegotiationEvent {
Expand Down
Binary file modified negotiation/message/diagram/contract-offer-message.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion negotiation/message/diagram/contract-offer-message.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class "dspace:ContractOfferMessage" {
dspace:processId : String
dspace:offer : odrl:Offer
dspace:callbackAddress : String
dspace:checksum: String
}

class odrl:Offer {
Expand Down
4 changes: 0 additions & 4 deletions negotiation/message/schema/contract-negotiation-event-message-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
"dspace:FINALIZED"
],
"required": true
},
"dspace:checksum": {
"type": "string",
"required": true
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions negotiation/message/schema/contract-offer-message-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
"dspace:callbackAddress": {
"type" : "string",
"required": true
},
"dspace:checksum": {
"type" : "string",
"required": true
}
}
}
Expand Down
11 changes: 0 additions & 11 deletions negotiation/message/shape/contract-negotiation-event-message-shape.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,4 @@ shapes:ContractNegotiationEventMessageShape
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-negotiation-event-message-shape.ttl> (ContractNegotiationEventMessageShape): An dspace:eventType property must point from an dspace:ContractNegotiationEventMessage to exactly one dspace:NegotiationEvent."@en ;
] ;

sh:property [
a sh:PropertyShape ;
sh:path dspace:checksum ;
sh:datatype xsd:string ;
sh:maxCount 1 ;
sh:minCount 1 ;
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-negotiation-event-message-shape.ttl> (ContractNegotiationEventMessageShape): An dspace:checksum property must point from an dspace:ContractNegotiationEventMessage to exactly one xsd:string."@en ;
] ;

.
10 changes: 0 additions & 10 deletions negotiation/message/shape/contract-negotiation-shape.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,4 @@ shapes:ContractNegotiationShape
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-negotiation-shape.ttl> (ContractNegotiationShape): An dspace:processId property must point from an dspace:ContractNegotiation to exactly one xsd:string field."@en ;
] ;

sh:property [
a sh:PropertyShape ;
sh:path dspace:negotiationId ;
sh:datatype xsd:string ;
sh:maxCount 1 ;
sh:minCount 1 ;
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-negotiation-event-message-shape.ttl> (ContractNegotiationShape): An dspace:checksum property must point from an dspace:negotiationId to exactly one xsd:string field."@en ;
] ;

.
10 changes: 0 additions & 10 deletions negotiation/message/shape/contract-offer-message-shape.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,4 @@ shapes:ContractOfferMessageShape
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-offer-message-shape.ttl> (ContractOfferMessageShape): A dspace:callbackAddress property must point to exactly one xsd:string value."@en ;
] ;

sh:property [
a sh:PropertyShape ;
sh:path dspace:checksum ;
sh:datatype xsd:string ;
sh:maxCount 1 ;
sh:minCount 1 ;
sh:severity sh:Violation ;
sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-offer-message-shape.ttl> (ContractOfferMessageShape): A dspace:checksum property must point to exactly one xsd:string value."@en ;
] ;
.