Commit d0db8a43 authored Sep 05, 2019 by canterafonsj

Refactor schemas. Allow prefixes. Example with prefixes

parent 027d7c8c

examples/Vehicle_C2.2.json

+5 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,10 @@
		"type": "Property",
		"value": "Mercedes"
		},
		"schema:image": {
		"type": "Property",
		"value": "http://example.org/images/Mercedes-C220"
		},
		"isParked": {
		"type": "Relationship",
		"object": "urn:ngsi-ld:OffStreetParking:Downtown1",
		@@ -18,6 +22,7 @@
		"http://example.org/ngsi-ld/commonTerms.jsonld",
		"http://example.org/ngsi-ld/vehicle.jsonld",
		"http://example.org/ngsi-ld/parking.jsonld",
		"https://schema.org",
		"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
		]
		}

schema/Entity.json

+1 −2

Original line number	Diff line number	Diff line
		@@ -185,8 +185,7 @@
		]
		},
		"propertyNames": {
		"type": "string",
		"pattern": "^((\\d\|[a-zA-Z]\|_)+(:(\\d\|[a-zA-Z]\|_)+)?(#\\d+)?)$\|^(@context)$"
		"$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/PropertyNames"
		}
		},
		"Entity": {

schema/Entity_keyValues.json

+1 −2

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@
		]
		},
		"propertyNames": {
		"type": "string",
		"pattern": "^((\\d\|[a-zA-Z]\|_)+(#\\d+)?)$\|^(@context)$"
		"$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/PropertyNames"
		}
		}

schema/common.json

+5 −1

Original line number	Diff line number	Diff line
		@@ -6,10 +6,14 @@
		"definitions": {
		"Name": {
		"type": "string",
		"pattern": "^(\\d\|[a-zA-Z]\|_)+$",
		"pattern": "^((\\d\|[a-zA-Z]\|_)+(:(\\d\|[a-zA-Z]\|_)+)?(#\\d+)?)$",
		"minLength": 1,
		"description": "NGSI-LD Name"
		},
		"PropertyNames": {
		"type": "string",
		"pattern": "^((\\d\|[a-zA-Z]\|_)+(:(\\d\|[a-zA-Z]\|_)+)?(#\\d+)?)$\|^(@context)$"
		},
		"observedAt": {
		"type": "string",
		"format": "date-time"

schema/temporal/EntityTemporal.json

+1 −2

Original line number	Diff line number	Diff line
		@@ -71,8 +71,7 @@
		]
		},
		"propertyNames": {
		"type": "string",
		"pattern": "^((\\d\|[a-zA-Z]\|_)+(#\\d+)?)$\|^(@context)$"
		"$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/PropertyNames"
		}
		},
		"EntityTemporal": {