feat: align ContractRequestMessage behavior (#201)

Author: wolf4ood

artifacts/src/main/resources/negotiation/contract-request-message-schema.json

@@ -33,12 +33,23 @@
           "$comment": "A URL indicating where messages to the consumer should be sent"
         }
       },
+      "oneOf": [
+        {
+          "required": [
+            "callbackAddress"
+          ]
+        },
+        {
+          "required": [
+            "providerPid"
+          ]
+        }
+      ],
       "required": [
         "@context",
         "@type",
         "consumerPid",
-        "offer",
-        "callbackAddress"
+        "offer"
       ]
     }
   }

artifacts/src/main/resources/negotiation/example/contract-request-message.json

@@ -21,6 +21,5 @@
         ]
       }
     ]
-  },
-  "callbackAddress": "https://example.com/callback"
+  }
 }

artifacts/src/test/java/org/eclipse/dsp/schema/negotiation/InvalidContractRequestMessageSchemaTest.java

@@ -27,8 +27,9 @@ public class InvalidContractRequestMessageSchemaTest extends AbstractSchemaTest
     void verifyInvalidCases() {
         assertThat(schema.validate(INVALID_REQUEST_NO_OFFER, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
         assertThat(schema.validate(INVALID_REQUEST_NO_ID, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
-        assertThat(schema.validate(INVALID_REQUEST_NO_CONSUMER_ID, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
-        assertThat(schema.validate(INVALID_REQUEST_NO_CALLBACK, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
+        assertThat(schema.validate(INVALID_REQUEST_NO_CALLBACK_NO_CONSUMER_PID, JSON))
+                .extracting(this::errorExtractor)
+                .contains(error("callbackAddress", REQUIRED), error("providerPid", REQUIRED));
         assertThat(schema.validate(INVALID_REQUEST_NO_TYPE, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
         assertThat(schema.validate(INVALID_REQUEST_NO_CONTEXT, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
         assertThat(schema.validate(INVALID_REQUEST_JUST_ID, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
@@ -45,7 +46,6 @@ void setUp() {
                   "https://w3id.org/dspace/2025/1/context.jsonld"
                 ],
                 "@type": "ContractRequestMessage",
-                "providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
                 "consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
                 "callbackAddress": "https://example.com/callback"
             }
@@ -65,20 +65,7 @@ void setUp() {
             }
             """;
 
-    private static final String INVALID_REQUEST_NO_CONSUMER_ID = """
-            {
-                "@context": [
-                  "https://w3id.org/dspace/2025/1/context.jsonld"
-                ],
-                "@type": "ContractRequestMessage",
-                "offer": {
-                  "@id": "urn:uuid:d526561f-528e-4d5a-ae12-9a9dd9b7a815"
-                },
-                "callbackAddress": "https://example.com/callback"
-            }
-            """;
-
-    private static final String INVALID_REQUEST_NO_CALLBACK = """
+    private static final String INVALID_REQUEST_NO_CALLBACK_NO_CONSUMER_PID = """
             {
                 "@context": [
                   "https://w3id.org/dspace/2025/1/context.jsonld"

specifications/negotiation/message/diagram/contract-request-message.png

@@ -11,7 +11,6 @@ class "dspace:ContractRequestMessage" {
     @type : dspace:ContractRequestMessage
     dspace:providerPid : String
     dspace:consumerPid : String
-    dspace:callbackAddress : String
 }
 
 class odrl:Offer {