diff --git a/Release Candidate Messages/icarDeviceResource.json b/Release Candidate Messages/icarDeviceResource.json index 16ffe23..279cff4 100644 --- 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 index a880c56..8b43de3 100644 --- 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 index d3d4a7b..d585dae 100644 --- 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"] - } - ] -} \ No newline at end of file + } +}