fix: revert not discussed changes

catalog/catalog.binding.https.md

@@ -50,7 +50,7 @@ request.
 
 #### 2.3.2 OK (200) Response
 
-If the request is successful, the catalog service must return a response body containing a [CatalogMessage](./message/catalog.message.json) which is a profiled DCAT Catalog type
+If the request is successful, the catalog service must return a response body containing a [Catalog](./message/catalog.json) which is a profiled DCAT Catalog type
 described by the [Catalog Protocol Specification](catalog.protocol.md).
 
 ## 3 Technical Considerations

catalog/images/catalog-error-message.puml

@@ -10,16 +10,7 @@ class "ids:CatalogErrorMessage" {
     @context : "https://w3id.org/idsa/v5/context.json"
     @type : "ids:CatalogErrorMessage"
     ids:code : String
-    ids:reason : ids:RejectionReason
+    ids:reason : Array
 }
 
-
-enum ids:RejectionReason {
-    "ids:COUNTER_OFFER_NOT_ALLOWED"
-    "ids:BAD_PARAMETERS"
-    "..."
-}
-
-"ids:CatalogErrorMessage" "1" *-- "0..1" "ids:RejectionReason" : "ids:rejectionReason"
-
 @enduml

catalog/images/catalog-request-message.puml

@@ -9,15 +9,7 @@ hide empty description
 class "ids:CatalogRequestMessage" {
     @context : "https://w3id.org/idsa/v5/context.json"
     @type : ids:CatalogRequestMessage
-    ids:filter : ids:Filter
+    ids:filter : Object
 }
 
-class ids:Filter {
-    @type : "ids:Filter",
-    @id: String
-    ...
-}
-
-"ids:CatalogRequestMessage" "1" *-- "0..n" "ids:Filter" : "ids:filter"
-
 @enduml

catalog/message/catalog-error-message.json

@@ -1,8 +1,8 @@
 {
   "@context":  "https://w3id.org/idsa/v5/context.json",
   "@type": "ids:CatalogErrorMessage",
-  "ids:code": "http://example.org/CATALOG_NOT_AVAILABLE",
-  "ids:reasons": [
+  "ids:code": "123:A",
+  "ids:reason": [
     { "@value": "Catalog not provisioned for this requester.", "@language": "en" },
     { "some": "other reason"}
   ]

negotiation/contract.negotiation.protocol.md

@@ -199,7 +199,7 @@ without providing an explanation. Nevertheless, the sender may provide a descrip
 
 **Example**: [NegotiationError](./message/contract-negotiation-error.json)
 
-**Schema**: [ContractNegotiationErrorShape](../schemas/contract-negotiation-error-shape.ttl) and the [ContractNegotiationErrorMessage JSON Schema](../schemas/contract-negotiation-error-message-schema.json)
+**Schema**: [ContractNegotiationErrorShape](../schemas/contract-negotiation-error-shape.ttl) and the [ContractNegotiationErrorMessage JSON Schema](../schemas/contract-negotiation-error-schema.json)
 
 #### Description
 

negotiation/message/contract-negotiation-error.json

@@ -2,7 +2,11 @@
   "@context":  "https://w3id.org/idsa/v5/context.json",
   "@type": "ids:ContractNegotiationError",
   "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
-  "ids:rejectionReason": "ids:BAD_PARAMETERS",
+  "ids:code": "...",
+  "ids:reason": [
+    { "@value": "Catalog not provisioned for this requester.", "@language": "en" },
+    { "some": "other reason"}
+  ],
   "dct:description": [
     { "@language": "en", "@value": "The parsing of the input parameters failed." },
     { "@language": "de", "@value": "Das Lesen der Eingabeparameter schlug fehl." }

negotiation/message/contract-negotiation-error.puml

@@ -10,22 +10,16 @@ class "ids:ContractNegotiationError" {
     @context : "https://w3id.org/idsa/v5/context.json"
     @type : "ids:ContractNegotiationError"
     ids:processId : String
-    ids:rejectionReason : ids:RejectionReason
+    ids:code : String
+    ids:reason : Array
     dct:description : MultilanguageProperty
 }
 
-enum ids:RejectionReason {
-    "ids:COUNTER_OFFER_NOT_ALLOWED"
-    "ids:BAD_PARAMETERS"
-    "..."
-}
-
 class "MultilanguageProperty" {
     @language : BCP47 Language-Tag
     @value: String
 }
 
-"ids:ContractNegotiationError" "1" *-- "0..1" "ids:RejectionReason" : "ids:rejectionReason"
 "ids:ContractNegotiationError" "1" *-- "*" "MultilanguageProperty" : "dct:description"
 
 @enduml

negotiation/message/contract-negotiation-termination-message.json

@@ -2,11 +2,9 @@
   "@context":  "https://w3id.org/idsa/v5/context.json",
   "@type": "ids:ContractNegotiationTerminationMessage",
   "ids:processId": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
-  "ids:code": {
-    "@id": "http://example.org/CONTRACT_NOT_ACCEPTABLE"
-  },
+  "ids:code": "...",
   "ids:reason": [
-    { 
+    {
       "@value": "License model does not fit.",
       "@language": "en"
     },

negotiation/message/contract-negotiation-termination-message.puml

@@ -10,20 +10,8 @@ class "ids:ContractNegotiationTerminationMessage" {
     @context : "https://w3id.org/idsa/v5/context.json"
     @type : "ids:ContractNegotiationTerminationMessage"
     ids:processId : String
-    ids:code : ids:TerminationCode
-    ids:reason : ids:Reason
+    ids:code : Object
+    ids:reason : Array
 }
 
-enum ids:TerminationCode {
-    ...
-}
-
-class "ids:Reason" {
-    @type : "ids:Reason"
-    ...
-}
-
-"ids:ContractNegotiationTerminationMessage" "1" *-- "1" "ids:TerminationCode" : "ids:code"
-"ids:ContractNegotiationTerminationMessage" "1" *-- "*" "ids:Reason" : "ids:reason"
-
 @enduml

negotiation/message/contract-negotiation.json

@@ -3,5 +3,6 @@
     "@id": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3",
     "@type": "ids:ContractNegotiation",
     "ids:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3",
-    "ids:negotiationId": "urn:uuid:dcbf434c-eacf-4582-9a02-8394a8836a88"
+    "ids:state": "CONSUMER_REQUESTED",
+    "ids:checksum": "..."
   }

negotiation/message/contract-negotiation.puml

@@ -10,8 +10,20 @@ class "ids:ContractNegotiation" {
     @context : "https://w3id.org/idsa/v5/context.json"
     @type : "ids:ContractNegotiation"
     ids:processId : String
-    ids:negotiationId : String
+    ids:state : ids:ContractNegotiationState
 }
 
+enum ids:ContractNegotiationState {
+    "ids:CONSUMER_REQUESTED"
+    "ids:PROVIDER_OFFERED"
+    "ids:CONSUMER_AGREED"
+    "ids:PROVIDER_AGREED"
+    "ids:CONSUMER_VERIFIED"
+    "ids:PROVIDER_FINALIZED"
+    "ids:TERMINATED"
+    "..."
+}
+
+"ids:ContractNegotiation" "1" *-- "1" "ids:ContractNegotiationState" : "ids:contractNegotiationState"
 
 @enduml

negotiation/message/contract-request-message.json

@@ -2,11 +2,11 @@
   "@context":  "https://w3id.org/idsa/v5/context.json",
   "@id": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3",
   "@type": "ids:ContractRequestMessage",
+  "ids:dataSet": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
   "ids:processId": "urn:uuid:dcbf434c-eacf-4582-9a02-f8dd50120fd3",
   "ids:offer": {
     "@type": "odrl:Offer",
     "@id": "urn:uuid:2828282:3dd1add8-4d2d-569e-d634-8394a8836a89",
-
     "odrl:target": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
     ...
   },

negotiation/message/contract-request-message.puml

@@ -9,6 +9,7 @@ hide empty description
 class "ids:ContractRequestMessage" {
     @context : "https://w3id.org/idsa/v5/context.json"
     @type : ids:ContractRequestMessage
+    ids:dataSet : String
     ids:processId : String
     ids:offer : odrl:Offer
     ids:callbackAddress : xsd:anyURI

schemas/contract-negotiation-error-schema.json

@@ -26,24 +26,13 @@
 					"type": "string",
 					"required": true
 				},
-				"ids:rejectionReason": {
-					"anyOf": [ 
-						{
-							"type": "string",
-							"enum": [
-								"ids:COUNTER_OFFER_NOT_ALLOWED",
-								"ids:BAD_PARAMETERS"
-							]
-						},
-						{
-							"type": "string",
-							"pattern": "ids:[A-Z_]"
-						},
-						{
-							"type": "string",
-							"pattern": "https?:\/\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)"
-						}
-					]
+				"ids:reason": {
+					"type": "array",
+					"minItems": 1,
+					"items": {
+
+					},
+					"required": false
 				},
 				"dct:description": {
 					"type": "array",

schemas/contract-negotiation-error-shape.ttl

@@ -30,20 +30,11 @@ shapes:ContractNegotiationErrorShape
 	rdfs:subClassOf ids:ContractNegotiationMessageShape ; # TODO: Is a ContractNegotiationError really a Message?
 	sh:targetClass ids:ContractNegotiationError ;
 
-	sh:property [
-		a sh:PropertyShape ;
-		sh:path ids:rejectionReason ;
-		sh:class ids:RejectionReason ;
-		sh:maxCount 1 ;
-		sh:severity sh:Violation ;
-		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-negotiation-error-shape.ttl> (ContractNegotiationErrorShape): An ids:rejectionReason property must point from an ids:ContractNegotiationError to zero or one ids:RejectionReason."@en ;
-	] ;
-
 	sh:property [
 		a sh:PropertyShape ;
 		sh:path dct:description ;
 		sh:datatype rdf:langString ;
 		sh:severity sh:Violation ;
 		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-negotiation-error-shape.ttl> (ContractNegotiationErrorShape): A dct:description property must point from an ids:ContractNegotiationError to zero or more rdf:langString values."@en ;
-	] 
+	]
 .

schemas/contract-negotiation-termination-message-schema.json

@@ -27,31 +27,15 @@
 					"required": true
 				},
 				"ids:code": {
-					"type": "object",
-					"properties": {
-						"@id": {
-							"anyOf": [
-								{
-									"type": "string",
-									"enum": [
-
-									]
-								},
-								{
-									"type": "string"
-								}
-							]
-						},
-						"required": true
-					},
+					"type": "string",
 					"required": true
 				},
 				"ids:reason": {
 					"type": "array",
 					"required": false,
 					"minItems": 1,
 					"items": {
-						
+
 					}
 				}
 			}

schemas/contract-negotiation-termination-message-shape.ttl

@@ -30,23 +30,4 @@ shapes:ContractNegotiationTerminationMessageShape
 	sh:targetClass ids:ContractNegotiationTerminationMessage ;
 	rdfs:subClassOf ids:ContractNegotiationMessageShape ;
 
-	sh:property [
-		a sh:PropertyShape ;
-		sh:path ids:code ;
-		sh:class ids:TerminationCode ;
-		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-termination-message-shape.ttl> (ContractNegotiationTerminationMessageShape): An ids:code property must point from an ids:ContractNegotiationTerminationMessage to exactly one ids:TerminationCode."@en ;
-	] ;
-
-	sh:property [
-		a sh:PropertyShape ;
-		sh:path ids:reason ;
-		sh:class ids:Reason ;
-		sh:minCount 1 ;
-		sh:severity sh:Violation ;
-		sh:message "<https://raw.githubusercontent.com/International-Data-Spaces-Association/ids-specification/master/schemas/contract-negotiation-termination-message-shape.ttl> (ContractNegotiationTerminationMessageShape): An ids:reason property must point from an ids:ContractNegotiationTerminationMessage to at least one ids:Reason."@en ;
-	] ;
-
 .

schemas/transfer-error-schema.json

@@ -31,31 +31,15 @@
 					"required": true
 				},
 				"ids:code": {
-					"type": "object",
-					"properties": {
-						"@id": {
-							"anyOf": [
-								{
-									"type": "string",
-									"enum": [
-
-									]
-								},
-								{
-									"type": "string"
-								}
-							]
-						},
-						"required": true
-					},
+					"type": "string",
 					"required": true
 				},
 				"ids:reason": {
 					"type": "array",
 					"required": false,
 					"minItems": 1,
 					"items": {
-						
+
 					}
 				}
 			}