Merge pull request #89 from Systems-Modeling/feature/ST5AS-222

feat: add diff & merge operations ST5AS-222

Author: ivan-gomes

conf/json/schema/api/schemas-sans-metamodel-requests.json

@@ -648,6 +648,95 @@
       ],
       "additionalProperties": false
     },
+    "DataDifference": {
+      "$id": "http://www.omg.org/spec/SysML/2.0/API/DataDifference",
+      "title": "DataDifference",
+      "type": "object",
+      "properties": {
+        "@type": {
+          "type": "string",
+          "const": "DataDifference"
+        },
+        "baseData": {
+          "oneOf": [
+            {
+              "$ref": "http://www.omg.org/spec/SysML/2.0/API/DataVersion"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "compareData": {
+          "oneOf": [
+            {
+              "$ref": "http://www.omg.org/spec/SysML/2.0/API/DataVersion"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "required": [
+        "@type",
+        "baseData",
+        "compareData"
+      ],
+      "additionalProperties": false
+    },
+    "MergeResult": {
+      "$id": "http://www.omg.org/spec/SysML/2.0/API/MergeResult",
+      "title": "MergeResult",
+      "allOf": [
+        {
+          "oneOf": [
+            {
+              "type": "object",
+              "properties": {
+                "@type": {
+                  "type": "string",
+                  "const": "MergeResult"
+                },
+                "conflict": {
+                  "type": "array",
+                  "maxItems": 0
+                },
+                "mergeCommit": {
+                  "$ref": "http://www.omg.org/spec/SysML/2.0/API/Commit"
+                }
+              }
+            },
+            {
+              "type": "object",
+              "properties": {
+                "@type": {
+                  "type": "string",
+                  "const": "MergeResult"
+                },
+                "conflict": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "http://www.omg.org/spec/SysML/2.0/API/DataIdentity"
+                  },
+                  "minItems": 1
+                },
+                "mergeCommit": {
+                  "type": "null"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "required": [
+            "@type",
+            "conflict",
+            "mergeCommit"
+          ]
+        }
+      ]
+    },
     "Query": {
       "$id": "http://www.omg.org/spec/SysML/2.0/API/Query",
       "title": "Query",

conf/json/schema/api/schemas.json

@@ -648,6 +648,95 @@
       ],
       "additionalProperties": false
     },
+    "DataDifference": {
+      "$id": "http://www.omg.org/spec/SysML/2.0/API/DataDifference",
+      "title": "DataDifference",
+      "type": "object",
+      "properties": {
+        "@type": {
+          "type": "string",
+          "const": "DataDifference"
+        },
+        "baseData": {
+          "oneOf": [
+            {
+              "$ref": "http://www.omg.org/spec/SysML/2.0/API/DataVersion"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "compareData": {
+          "oneOf": [
+            {
+              "$ref": "http://www.omg.org/spec/SysML/2.0/API/DataVersion"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "required": [
+        "@type",
+        "baseData",
+        "compareData"
+      ],
+      "additionalProperties": false
+    },
+    "MergeResult": {
+      "$id": "http://www.omg.org/spec/SysML/2.0/API/MergeResult",
+      "title": "MergeResult",
+      "allOf": [
+        {
+          "oneOf": [
+            {
+              "type": "object",
+              "properties": {
+                "@type": {
+                  "type": "string",
+                  "const": "MergeResult"
+                },
+                "conflict": {
+                  "type": "array",
+                  "maxItems": 0
+                },
+                "mergeCommit": {
+                  "$ref": "http://www.omg.org/spec/SysML/2.0/API/Commit"
+                }
+              }
+            },
+            {
+              "type": "object",
+              "properties": {
+                "@type": {
+                  "type": "string",
+                  "const": "MergeResult"
+                },
+                "conflict": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "http://www.omg.org/spec/SysML/2.0/API/DataIdentity"
+                  },
+                  "minItems": 1
+                },
+                "mergeCommit": {
+                  "type": "null"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "required": [
+            "@type",
+            "conflict",
+            "mergeCommit"
+          ]
+        }
+      ]
+    },
     "Query": {
       "$id": "http://www.omg.org/spec/SysML/2.0/API/Query",
       "title": "Query",