fix: remove Duty type properties (#199)

* Fix for Rule subtypes and Duty

* Remove duty type properties

Author: jimmarino

artifacts/buildSrc/src/test/java/org/eclipse/dsp/generation/jsom/TestSchema.java

@@ -195,9 +195,6 @@ public interface TestSchema {
                       "items": {
                         "$ref": "#/definitions/Constraint"
                       }
-                    },
-                    "duty": {
-                      "$ref": "#/definitions/Duty"
                     }
                   },
                   "required": [

artifacts/src/main/resources/catalog/example/catalog.json

@@ -29,11 +29,6 @@
                   "operator": "eq",
                   "rightOperand": "http://example.org/EU"
                 }
-              ],
-              "duty": [
-                {
-                  "action": "Attribution"
-                }
               ]
             }
           ]

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

@@ -42,14 +42,14 @@
         "permission": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Rule"
+            "$ref": "#/definitions/Permission"
           },
           "minItems": 1
         },
         "prohibition": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Rule"
+            "$ref": "#/definitions/Prohibition"
           },
           "minItems": 1
         },
@@ -196,18 +196,28 @@
           "items": {
             "$ref": "#/definitions/Constraint"
           }
-        },
-        "duty": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Duty"
-          }
         }
       },
       "required": [
         "action"
       ]
     },
+    "Permission": {
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Rule"
+        }
+      ]
+    },
+    "Prohibition": {
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Rule"
+        }
+      ]
+    },
     "Duty": {
       "type": "object",
       "allOf": [

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

@@ -70,18 +70,6 @@
             "operator": "eq",
             "rightOperand": "gold"
           }
-        ],
-        "duty": [
-          {
-            "action": "report",
-            "constraint": [
-              {
-                "leftOperand": "event",
-                "operator": "gt",
-                "rightOperand": "use"
-              }
-            ]
-          }
         ]
       },
       {

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

@@ -29,7 +29,6 @@ void verifySchema() {
         assertThat(schema.validate(POLICY_STRING_PROFILE, JSON)).isEmpty();
         assertThat(schema.validate(POLICY_ARRAY_PROFILE, JSON)).isEmpty();
         assertThat(schema.validate(POLICY_PERMISSION_DUTY, JSON)).isEmpty();
-        assertThat(schema.validate(POLICY_PROHIBITION_DUTY, JSON)).isEmpty();
         assertThat(schema.validate(POLICY_OR_CONSTRAINT, JSON)).isEmpty();
         assertThat(schema.validate(POLICY_AND_CONSTRAINT, JSON)).isEmpty();
         assertThat(schema.validate(POLICY_AND_SEQUENCE_CONSTRAINT, JSON)).isEmpty();
@@ -54,9 +53,6 @@ void setUp() {
                     "leftOperand": "partner",
                     "operator": "eq",
                     "rightOperand": "gold"
-                  }],
-                  "duty": [{
-                    "action": "report"
                   }]
                 }
               ]
@@ -75,9 +71,6 @@ void setUp() {
                       "leftOperand": "partner",
                       "operator": "eq",
                       "rightOperand": "gold"
-                  }],
-                  "duty": [{
-                    "action": "report"
                   }]
                 }
               ]
@@ -96,9 +89,6 @@ void setUp() {
                       "leftOperand": "partner",
                       "operator": "eq",
                       "rightOperand": "gold"
-                  }],
-                  "duty": [{
-                    "action": "report"
                   }]
                 }
               ]
@@ -117,46 +107,11 @@ void setUp() {
                       "leftOperand": "partner",
                       "operator": "eq",
                       "rightOperand": "gold"
-                  }],
-                  "duty": [{
-                    "action": "report",
-                    "constraint": [{
-                          "leftOperand": "event",
-                          "operator": "gt",
-                          "rightOperand": "use"
-                    }]
                   }]
                 }
               ]
             }""";
 
-    private static final String POLICY_PROHIBITION_DUTY = """
-            {
-              "@id": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
-              "@type": "Offer",
-              "target": "asset:1",
-              "profile": ["https://test.com/profile"],
-              "prohibition": [
-                {
-                  "action": "use",
-                  "constraint": [{
-                      "leftOperand": "partner",
-                      "operator": "eq",
-                      "rightOperand": "gold"
-                  }],
-                  "duty": [{
-                    "action": "report",
-                    "constraint": [{
-                          "leftOperand": "event",
-                          "operator": "gt",
-                          "rightOperand": "use"
-                    }]
-                  }]
-                }
-              ]
-            }""";
-
-
     private static final String POLICY_OR_CONSTRAINT = """
             {
                  "@id": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",