fix: change callbackAddress in ContractAgreementMessage and ContractOfferMessage (#155)

* fix: removes callbackAddress from ContractAgreementMessage

* fix: removes mandatory callbackAddress from ContractOfferMessage

Author: wolf4ood

artifacts/src/main/resources/context/dspace.jsonld

@@ -101,7 +101,6 @@
           "@id": "dspace:agreement",
           "@type": "@id"
         },
-        "callbackAddress": "dspace:callbackAddress",
         "timestamp": "dspace:timestamp"
       }
     },

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

@@ -27,18 +27,14 @@
         },
         "agreement": {
           "$ref": "https://w3id.org/dspace/2025/1/negotiation/contract-schema.json#/definitions/Agreement"
-        },
-        "callbackAddress": {
-          "type": "string"
         }
       },
       "required": [
         "@context",
         "@type",
         "providerPid",
         "consumerPid",
-        "agreement",
-        "callbackAddress"
+        "agreement"
       ]
     }
   }

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

@@ -50,12 +50,23 @@
           "type": "string"
         }
       },
+      "oneOf": [
+        {
+          "required": [
+            "callbackAddress"
+          ]
+        },
+        {
+          "required": [
+            "consumerPid"
+          ]
+        }
+      ],
       "required": [
         "@context",
         "@type",
         "providerPid",
-        "offer",
-        "callbackAddress"
+        "offer"
       ]
     }
   }

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

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

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

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

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

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

artifacts/src/test/java/org/eclipse/dsp/schema/fixtures/AbstractSchemaTest.java

@@ -18,6 +18,7 @@
 import com.networknt.schema.JsonSchema;
 import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.SchemaLocation;
+import com.networknt.schema.ValidationMessage;
 
 import static com.networknt.schema.SpecVersion.VersionFlag.V202012;
 import static org.eclipse.dsp.DspConstants.DSP_PREFIX;
@@ -45,4 +46,16 @@ protected void setUp(String schemaFile) {
 
         schema = schemaFactory.getSchema(SchemaLocation.of(DSP_PREFIX + schemaFile));
     }
+
+    protected SchemaError errorExtractor(ValidationMessage validationMessage) {
+        return new SchemaError(validationMessage.getProperty(), validationMessage.getType());
+    }
+
+    protected SchemaError error(String property, String type) {
+        return new SchemaError(property, type);
+    }
+
+    public record SchemaError(String property, String type) {
+
+    }
 }

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

@@ -30,7 +30,6 @@ void verifyInvalidCases() {
         assertThat(schema.validate(INVALID_NO_TYPE, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
         assertThat(schema.validate(INVALID_NO_PROVIDER_ID, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
         assertThat(schema.validate(INVALID_NO_CONSUMER_ID, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
-        assertThat(schema.validate(INVALID_NO_CALLBACK, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
         assertThat(schema.validate(NO_AGREEMENT, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
     }
 
@@ -108,18 +107,6 @@ void setUp() {
             }
             """, AGREEMENT);
 
-    private static final String INVALID_NO_CALLBACK = format("""
-            {
-              "@context": [
-                "https://w3id.org/dspace/2025/1/context.jsonld"
-              ],
-              "@type": "ContractAgreementMessage",
-              "providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
-              "consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
-              %s
-            }
-            """, AGREEMENT);
-
     private static final String NO_AGREEMENT = """
             {
               "@context": [

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

@@ -26,7 +26,10 @@ public class InvalidContractOfferMessageSchemaTest extends AbstractSchemaTest {
     @Test
     void verifyInvalidCases() {
         assertThat(schema.validate(INVALID_MESSAGE_NO_TARGET, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
-        assertThat(schema.validate(INVALID_MESSAGE_NO_CALLBACK, JSON).iterator().next().getType()).isEqualTo(REQUIRED);
+        assertThat(schema.validate(INVALID_MESSAGE_NO_CALLBACK_NO_CONSUMER_PID, JSON))
+                .hasSize(3)
+                .extracting(this::errorExtractor)
+                .contains(error("callbackAddress", REQUIRED), error("consumerPid", REQUIRED));
     }
 
     @BeforeEach
@@ -55,14 +58,13 @@ void setUp() {
             }
             """;
 
-    private static final String INVALID_MESSAGE_NO_CALLBACK = """
+    private static final String INVALID_MESSAGE_NO_CALLBACK_NO_CONSUMER_PID = """
             {
               "@context": [
                 "https://w3id.org/dspace/2025/1/context.jsonld"
               ],
               "@type": "ContractOfferMessage",
               "providerPid": "urn:uuid:a343fcbf-99fc-4ce8-8e9b-148c97605aab",
-              "consumerPid": "urn:uuid:32541fe6-c580-409e-85a8-8a9a32fbe833",
               "offer": {
                 "@type": "Offer",
                 "@id": "urn:uuid:6bcea82e-c509-443d-ba8c-8eef25984c07",