Approved: Rename 'units' to avoid conflict in bodymetrics

OpenInterConnect · Jul 8, 2016 · 6d2b8f5 · 6d2b8f5
1 parent a51c144
commit 6d2b8f5
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 30 deletions.
diff --git a/bodyHeight.raml b/bodyHeight.raml
@@ -39,7 +39,7 @@ traits:
                 "rt":     ["oic.r.body.height"],
                 "id":     "unique_example_id",
                 "height": 180,
-                "units":   "cm",
+                "heightunits":   "cm",
                 "observedtime": "2016-02-15T09:19Z"
               }
   post:
@@ -52,7 +52,7 @@ traits:
           {
             "id":     "unique_example_id",
             "height": 75,
-            "units":   "inch"
+            "heightunits":   "inch"
           }
     responses:
       200:
@@ -66,7 +66,7 @@ traits:
               {
                 "id":     "unique_example_id",
                 "height": 75,
-                "units":   "inch",
+                "heightunits":   "inch",
                 "observedtime": "2016-02-15T09:19Z"
               }
       403:
@@ -80,6 +80,6 @@ traits:
               {
                 "id":     "unique_example_id",
                 "height": 75,
-                "units":   "inch",
+                "heightunits":   "inch",
                 "observedtime": "2016-02-15T09:19Z"
               }
diff --git a/bodyWeight.raml b/bodyWeight.raml
@@ -39,6 +39,6 @@ traits:
                 "rt":     ["oic.r.body.weight"],
                 "id":     "unique_example_id",
                 "weight": 80,
-                "units":   "kg",
+                "weightunits":   "kg",
                 "observedtime": "2016-02-15T09:19Z"
               }
diff --git a/oic.r.body.height.json b/oic.r.body.height.json
@@ -6,17 +6,20 @@
   "definitions": {
     "oic.r.body.height": {
       "type": "object",
-      "properties": {
-        "$ref": "oic.r.height.json#/definitions/oic.r.height",
-        "units": {
-          "enum": ["cm", "inch"],
-          "description": "Unit of a person's height"
-        },
-        "observedtime": {
-          "type": "string",
-          "description": "ReadOnly, An ISO8601 format time indicating when the data is observed (ex: 2016-02-15T09:19Z)"
+      "allOf": [
+        {"$ref": "oic.r.height.json#/definitions/oic.r.height"},
+        {"properties": {
+          "heightunits": {
+            "enum": ["cm", "inch"],
+            "description": "Unit of a person's height"
+          },
+          "observedtime": {
+            "type": "string",
+            "description": "ReadOnly, An ISO8601 format time indicating when the data is observed (ex: 2016-02-15T09:19Z)"
+          }
+         }
         }
-      }
+      ]
     }
   },
   "type": "object",
@@ -25,5 +28,5 @@
     {"$ref": "oic.baseResource.json#/definitions/oic.r.baseresource"},
     {"$ref": "#/definitions/oic.r.body.height"}
   ],
-  "required": ["height", "units"]
+  "required": ["height", "heightunits"]
 }
diff --git a/oic.r.body.weight.json b/oic.r.body.weight.json
@@ -6,18 +6,21 @@
   "definitions": {
     "oic.r.body.weight": {
       "type": "object",
-      "properties": {
-        "$ref": "oic.r.weight.json#/definitions/oic.r.weight",
-        "units": {
-          "type": "string",
-          "enum": ["kg", "lb"],
-          "description": "ReadOnly, Unit of a person's weight"
-        },
-        "observedtime": {
-          "type": "string",
-          "description": "ReadOnly, An ISO8601 format time indicating when the data is observed (ex: 2016-02-15T09:19Z)"
+      "allOf": [
+        {"$ref": "oic.r.weight.json#/definitions/oic.r.weight"},
+        {"properties": {
+          "weightunits": {
+            "type": "string",
+            "enum": ["kg", "lb"],
+            "description": "ReadOnly, Unit of a person's weight"
+          },
+          "observedtime": {
+            "type": "string",
+            "description": "ReadOnly, An ISO8601 format time indicating when the data is observed (ex: 2016-02-15T09:19Z)"
+          }
+         }
         }
-      }
+      ]
     }
   },
   "type": "object",
@@ -26,5 +29,5 @@
     {"$ref": "oic.baseresource.json#/definitions/oic.r.baseresource"},
     {"$ref": "#/definitions/oic.r.body.weight"}
   ],
-  "required": ["weight", "units"]
+  "required": ["weight", "weightunits"]
 }
diff --git a/oic.r.height.json b/oic.r.height.json
@@ -1,5 +1,5 @@
 {
-  "id": "http://openinterconnect.org/schemas/oic.r.height#",
+  "id": "http://openinterconnect.org/schemas/oic.r.height.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.",
   "title": "Height",

diff --git a/oic.r.weight.json b/oic.r.weight.json
@@ -1,5 +1,5 @@
 {
-  "id": "http://openinterconnect.org/schemas/oic.r.weight#",
+  "id": "http://openinterconnect.org/schemas/oic.r.weight.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Copyright (c) 2016 Open Interconnect Consortium, Inc. All rights reserved.",
   "title": "Weight",