Merge pull request #74 from cookeac/master

Removed Link Definition objects, fixed errors
adewg · Feb 17, 2020 · 3085ac0 · 3085ac0
2 parents 6f11543 + b636b3d
commit 3085ac0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 23 deletions.
diff --git a/Release Candidate Messages/icarDeviceResource.json b/Release Candidate Messages/icarDeviceResource.json
@@ -20,7 +20,7 @@
           "type": "string",
           "description": "Name given to the device by the farmer."
 				},
-				"description": {
+				"descr": {
           "type": "string",
           "description": "Description of the device by the farmer."
 				},

diff --git a/Release Candidate Messages/icarResourceCollection.json b/Release Candidate Messages/icarResourceCollection.json
@@ -30,33 +30,25 @@
                 "first": {
                     "type": "string",
                     "format": "uri",
-                    "description": "Link to the first page of the collection."
+                    "description": "Link to the first page of the collection. Link relation: first."
                 },
                 "next": {
                     "type": "string",
                     "format": "uri",
-                    "description": "Link to the next page of the collection, if any."
+                    "description": "Link to the next page of the collection, if any. Link relation: next."
                 },
                 "prev": {
                     "type": "string",
                     "format": "uri",
-                    "description": "Link to the previous page of the collection, if any."
+                    "description": "Link to the previous page of the collection, if any. Link relation: prev."
                 },
                 "last": {
                     "type": "string",
                     "format": "uri",
-                    "description": "Link to the last page of the collection, if any."
+                    "description": "Link to the last page of the collection, if any. Link relation: last."
                 }
             }
         }
-    },
-
-    "links": [
-        {  "rel": "first", "href": "{firsturi}", "templateRequired": ["firsturi"], "templatePointers": {"firsturi": "/view/first" }},
-        {  "rel": "next", "href": "{nexturi}", "templateRequired": ["nexturi"], "templatePointers": {"nexturi": "/view/next" }},
-        {  "rel": "prev", "href": "{prevuri}", "templateRequired": ["prevuri"], "templatePointers": {"prevuri": "/view/prev" }},
-        {  "rel": "last", "href": "{lasturi}", "templateRequired": ["lasturi"], "templatePointers": {"lasturi": "/view/last" }}
-    ]    
-
+    }    
 
 }
diff --git a/Release Candidate Messages/icarResourceReferenceType.json b/Release Candidate Messages/icarResourceReferenceType.json
@@ -17,12 +17,5 @@
             "description": "Specifies whether this is a single resource Link or a Collection.",
             "enum": ["Link"]
           }
-    },
-    "links": [
-      {
-          "rel": "related",
-          "href": "{@id}",
-          "templateRequired": ["@id"]
-      }
-    ]
-}
+    }
+}