From 26a9622603da695b1b410346e09c490c6f06be1a Mon Sep 17 00:00:00 2001 From: Jose Manuel Cantera Date: Thu, 5 Sep 2019 10:03:05 +0200 Subject: [PATCH] JSON Schemas now have --- schema/BatchOperationResult.json | 2 +- schema/Entity.json | 2 +- schema/EntityList.json | 2 +- schema/Entity_keyValues.json | 4 ++-- schema/UpdateResult.json | 2 +- schema/common.json | 4 ++-- schema/geometry-schema.json | 2 +- schema/registrations/ContextSourceNotification.json | 4 ++-- schema/registrations/ContextSourceRegistration.json | 4 ++-- schema/registrations/ContextSourceRegistrationList.json | 2 +- schema/subscriptions/Notification.json | 4 ++-- schema/subscriptions/Subscription.json | 4 ++-- schema/subscriptions/SubscriptionList.json | 2 +- schema/temporal/EntityTemporal.json | 4 ++-- schema/temporal/EntityTemporalList.json | 2 +- schema/temporal/Entity_temporalValues.json | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/schema/BatchOperationResult.json b/schema/BatchOperationResult.json index 7f6fd2c..d2d8f94 100644 --- a/schema/BatchOperationResult.json +++ b/schema/BatchOperationResult.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/BatchOperationResult.json", + "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/BatchOperationResult.json", "title": "NGSI-LD Batch Operation Result", "description": "NGSI-LD Batch Operation Result", "definitions": { diff --git a/schema/Entity.json b/schema/Entity.json index ad4da55..f8f4c7c 100644 --- a/schema/Entity.json +++ b/schema/Entity.json @@ -157,7 +157,7 @@ "operationSpace": { "$ref": "#/definitions/GeoProperty" }, - "id": { + "$id": { "type": "string", "format": "uri" }, diff --git a/schema/EntityList.json b/schema/EntityList.json index 94d1c47..f71f57e 100644 --- a/schema/EntityList.json +++ b/schema/EntityList.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://uri.etsi.org/ngsi-ld/schema/EntityList.json", + "$id": "https://uri.etsi.org/ngsi-ld/schema/EntityList.json", "title": "NGSI-LD EntityList", "description": "NGSI-LD EntityList", "definitions": { diff --git a/schema/Entity_keyValues.json b/schema/Entity_keyValues.json index a1f8839..3b5af99 100644 --- a/schema/Entity_keyValues.json +++ b/schema/Entity_keyValues.json @@ -1,11 +1,11 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://uri.etsi.org/ngsi-ld/schema/Entity_keyValues.json", + "$id": "https://uri.etsi.org/ngsi-ld/schema/Entity_keyValues.json", "title": "NGSI-LD Entity Key Values", "description": "NGSI-LD Entity Simplified Representation", "type": "object", "properties": { - "id": { + "$id": { "type": "string", "format": "uri" }, diff --git a/schema/UpdateResult.json b/schema/UpdateResult.json index bd9eac2..cba48d9 100644 --- a/schema/UpdateResult.json +++ b/schema/UpdateResult.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://uri.etsi.org/ngsi-ld/schema/UpdateResult.json", + "$id": "https://uri.etsi.org/ngsi-ld/schema/UpdateResult.json", "title": "NGSI-LD Update Result", "description": "NGSI-LD Update Result", "definitions": { diff --git a/schema/common.json b/schema/common.json index 0d7c078..32a4857 100644 --- a/schema/common.json +++ b/schema/common.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json", + "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json", "title": "NGSI-LD Common Definitions", "description": "NGSI-LD Common", "definitions": { @@ -70,7 +70,7 @@ "EntityInfo": { "type": "object", "properties": { - "id": { + "$id": { "type": "string", "format": "uri" }, diff --git a/schema/geometry-schema.json b/schema/geometry-schema.json index ff32991..328bb09 100644 --- a/schema/geometry-schema.json +++ b/schema/geometry-schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json", + "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json", "title": "geometry", "description": "One geometry as defined by GeoJSON. Licensed as per original source is https://github.com/fge/sample-json-schemas/blob/master/geojson/geometry.json", "type": "object", diff --git a/schema/registrations/ContextSourceNotification.json b/schema/registrations/ContextSourceNotification.json index 5c5082c..8cc970d 100644 --- a/schema/registrations/ContextSourceNotification.json +++ b/schema/registrations/ContextSourceNotification.json @@ -1,11 +1,11 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://uri.etsi.org/ngsi-ld/schema/ContextSourceNotification.json", + "$id": "https://uri.etsi.org/ngsi-ld/schema/ContextSourceNotification.json", "title": "NGSI-LD Context Source Notification", "description": "NGSI-LD Context Source Notification", "type": "object", "properties": { - "id": { + "$id": { "type": "string", "format": "uri" }, diff --git a/schema/registrations/ContextSourceRegistration.json b/schema/registrations/ContextSourceRegistration.json index 75ee7bf..398b186 100644 --- a/schema/registrations/ContextSourceRegistration.json +++ b/schema/registrations/ContextSourceRegistration.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/registrations/ContextSourceRegistration.json", + "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/registrations/ContextSourceRegistration.json", "title": "NGSI-LD Context Source Registration", "description": "NGSI-LD Context Source Registration", "definitions": { @@ -116,7 +116,7 @@ { "type": "object", "properties": { - "id": { + "$id": { "type": "string", "format": "uri" }, diff --git a/schema/registrations/ContextSourceRegistrationList.json b/schema/registrations/ContextSourceRegistrationList.json index 243d391..72400b9 100644 --- a/schema/registrations/ContextSourceRegistrationList.json +++ b/schema/registrations/ContextSourceRegistrationList.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://uri.etsi.org/ngsi-ld/schema/ContextSourceRegistrationList.json", + "$id": "https://uri.etsi.org/ngsi-ld/schema/ContextSourceRegistrationList.json", "title": "NGSI-LD Registration List", "description": "NGSI-LD Registration List", "definitions": { diff --git a/schema/subscriptions/Notification.json b/schema/subscriptions/Notification.json index 6d27e50..f4a4fba 100644 --- a/schema/subscriptions/Notification.json +++ b/schema/subscriptions/Notification.json @@ -1,11 +1,11 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://uri.etsi.org/ngsi-ld/schema/Notification.json", + "$id": "https://uri.etsi.org/ngsi-ld/schema/Notification.json", "title": "NGSI-LD Notification", "description": "NGSI-LD Notification", "type": "object", "properties": { - "id": { + "$id": { "type": "string", "format": "uri" }, diff --git a/schema/subscriptions/Subscription.json b/schema/subscriptions/Subscription.json index 79022bf..b769668 100644 --- a/schema/subscriptions/Subscription.json +++ b/schema/subscriptions/Subscription.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/subscriptions/Subscription.json", + "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/subscriptions/Subscription.json", "title": "NGSI-LD Subscription", "description": "NGSI-LD Subscription", "definitions": { @@ -132,7 +132,7 @@ { "type": "object", "properties": { - "id": { + "$id": { "type": "string", "format": "uri" }, diff --git a/schema/subscriptions/SubscriptionList.json b/schema/subscriptions/SubscriptionList.json index 5c046bb..a4dcad4 100644 --- a/schema/subscriptions/SubscriptionList.json +++ b/schema/subscriptions/SubscriptionList.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://uri.etsi.org/ngsi-ld/schema/SubscriptionList.json", + "$id": "https://uri.etsi.org/ngsi-ld/schema/SubscriptionList.json", "title": "NGSI-LD Subscription List", "description": "NGSI-LD Subscription List", "definitions": { diff --git a/schema/temporal/EntityTemporal.json b/schema/temporal/EntityTemporal.json index 2064ee7..f5c6490 100644 --- a/schema/temporal/EntityTemporal.json +++ b/schema/temporal/EntityTemporal.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/temporal/EntityTemporal.json", + "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/temporal/EntityTemporal.json", "title": "NGSI-LD Entity", "description": "NGSI-LD Temporal Representation of an Entity", "definitions": { @@ -31,7 +31,7 @@ }, "minItems": 1 }, - "id": { + "$id": { "type": "string", "format": "uri" }, diff --git a/schema/temporal/EntityTemporalList.json b/schema/temporal/EntityTemporalList.json index f4e65a3..540f665 100644 --- a/schema/temporal/EntityTemporalList.json +++ b/schema/temporal/EntityTemporalList.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://uri.etsi.org/ngsi-ld/schema/temporal/EntityTemporalList.json", + "$id": "https://uri.etsi.org/ngsi-ld/schema/temporal/EntityTemporalList.json", "title": "NGSI-LD Entity", "description": "NGSI-LD Temporal Representation List", "definitions": { diff --git a/schema/temporal/Entity_temporalValues.json b/schema/temporal/Entity_temporalValues.json index 103904a..a06e22a 100644 --- a/schema/temporal/Entity_temporalValues.json +++ b/schema/temporal/Entity_temporalValues.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://uri.etsi.org/ngsi-ld/schema/Entity_temporalValues.json", + "$id": "https://uri.etsi.org/ngsi-ld/schema/Entity_temporalValues.json", "title": "NGSI-LD Entity Temporal Values", "description": "NGSI-LD Simplified Temporal Representation of Entities", "definitions": { @@ -83,7 +83,7 @@ }, "type": "object", "properties": { - "id": { + "$id": { "type": "string", "format": "uri" }, -- 2.18.1