Merge pull request #54 from ahokkonen/master

Performed some renaming for event observed resources and metadata type.
adewg · Dec 11, 2019 · 784bf30 · 784bf30
2 parents adcb0db + 77c293f
commit 784bf30
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 26 deletions.
diff --git a/Release Candidate Messages/exampleUrlScheme.json b/Release Candidate Messages/exampleUrlScheme.json
@@ -93,7 +93,7 @@
                "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "icarMilkingVisitResource.json"
+                    "$ref": "icarMilkingVisitEventResource.json"
                   }
                 },
                "examples": {
@@ -356,7 +356,7 @@
                "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "icarMovementBirthRegistrationResource.json"
+                    "$ref": "icarMovementBirthEventResource.json"
                   }
                 }
               }
@@ -443,7 +443,7 @@
                "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "icarMovementDeathResource.json"
+                    "$ref": "icarMovementDeathEventResource.json"
                   }
                 }
               }
@@ -530,7 +530,7 @@
                "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "icarMovementArrivalResource.json"
+                    "$ref": "icarMovementArrivalEventResource.json"
                   }
                 },
                "examples": {
@@ -684,7 +684,7 @@
                "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "icarMovementDepartureResource.json"
+                    "$ref": "icarMovementDepartureEventResource.json"
                   }
                 }
               }
@@ -1134,11 +1134,10 @@
         "description": "Error information",
         "properties": {
           "data": {
-            "description": "Error information",
             "$ref": "exampleErrorResource.json"
           }
         }
       }
     }
   }
-}
+}
diff --git a/Release Candidate Messages/icarIdentifierType.json b/Release Candidate Messages/icarIdentifierType.json
@@ -1,20 +1,20 @@
 {
-        "required": [
-          "id",
-          "scheme"
-        ],
-
-        "type": "object",
-
-        "properties": {
-          "id": {
-            "type": "string",
-            "description": "A unique identification for the resource issued under the auspices of the scheme."
-          },
-          "scheme": {
-            "type": "string",
-            "description": "The identifier (in reverse domain format) of an official scheme that manages unique identifiers."
-          }
+      "type": "object",
+      "description": "Identifies a resource.",
+
+      "required": [
+        "id",
+        "scheme"
+      ],
+
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "A unique identification for the resource issued under the auspices of the scheme."
         },
-        "description": "Identifies a resource."
-}
+        "scheme": {
+          "type": "string",
+          "description": "The identifier (in reverse domain format) of an official scheme that manages unique identifiers."
+        }
+      }
+}
diff --git a/...didate Messages/icarMetaDataResource.json → ... Candidate Messages/icarMetaDataType.json b/...didate Messages/icarMetaDataResource.json → ... Candidate Messages/icarMetaDataType.json
diff --git a/...te Messages/icarMilkingVisitResource.json → ...ssages/icarMilkingVisitEventResource.json b/...te Messages/icarMilkingVisitResource.json → ...ssages/icarMilkingVisitEventResource.json
diff --git a/...Messages/icarMovementArrivalResource.json → ...ges/icarMovementArrivalEventResource.json b/...Messages/icarMovementArrivalResource.json → ...ges/icarMovementArrivalEventResource.json
diff --git a/...carMovementBirthRegistrationResource.json → ...sages/icarMovementBirthEventResource.json b/...carMovementBirthRegistrationResource.json → ...sages/icarMovementBirthEventResource.json
diff --git a/...e Messages/icarMovementDeathResource.json → ...sages/icarMovementDeathEventResource.json b/...e Messages/icarMovementDeathResource.json → ...sages/icarMovementDeathEventResource.json
diff --git a/...ssages/icarMovementDepartureResource.json → ...s/icarMovementDepartureEventResource.json b/...ssages/icarMovementDepartureResource.json → ...s/icarMovementDepartureEventResource.json
diff --git a/Release Candidate Messages/icarResource.json b/Release Candidate Messages/icarResource.json
@@ -8,7 +8,7 @@
             "description": "Uniform resource identifier (URI) of the resource (rel=self)."
         },
         "meta": {
-            "$ref": "icarMetaDataResource.json",
+            "$ref": "icarMetaDataType.json",
             "description": "Meta-data for the resource. Mandatory if you wish to support synchronisation."
           }