Update Entity.json. Fixing Problems with allOf and additional properties (c4ed6b3c) · Commits · CIM - Context Information Management / NGSI-LD API

schema/Entity.json

+123 −101

Original line number	Diff line number	Diff line
		@@ -29,9 +29,6 @@
		}
		]
		},
		"Commons": {
		"type": "object",
		"properties": {
		"observedAt": {
		"type": "string",
		"format": "date-time"
		@@ -51,15 +48,8 @@
		"instanceId": {
		"type": "string",
		"format": "uri"
		}
		}
		},
		"Property": {
		"allOf": [
		{
		"$ref": "#/definitions/Commons"
		},
		{
		"type": "object",
		"properties": {
		"type": {
		@@ -68,6 +58,21 @@
		},
		"value": {
		"type": "any"
		},
		"observedAt": {
		"$ref": "#/definitions/observedAt"
		},
		"createdAt": {
		"$ref": "#/definitions/createdAt"
		},
		"modifiedAt": {
		"$ref": "#/definitions/modifiedAt"
		},
		"datasetId": {
		"$ref": "#/definitions/datasetId"
		},
		"instanceId": {
		"$ref": "#/definitions/instanceId"
		}
		},
		"required": [
		@@ -84,15 +89,8 @@
		}
		]
		}
		}
		]
		},
		"Relationship": {
		"allOf": [
		{
		"$ref": "#/definitions/Commons"
		},
		{
		"type": "object",
		"properties": {
		"type": {
		@@ -102,6 +100,21 @@
		"object": {
		"type": "string",
		"format": "uri"
		},
		"observedAt": {
		"$ref": "#/definitions/observedAt"
		},
		"createdAt": {
		"$ref": "#/definitions/createdAt"
		},
		"modifiedAt": {
		"$ref": "#/definitions/modifiedAt"
		},
		"datasetId": {
		"$ref": "#/definitions/datasetId"
		},
		"instanceId": {
		"$ref": "#/definitions/instanceId"
		}
		},
		"required": [
		@@ -118,15 +131,8 @@
		}
		]
		}
		}
		]
		},
		"GeoProperty": {
		"allOf": [
		{
		"$ref": "#/definitions/Commons"
		},
		{
		"type": "object",
		"properties": {
		"type": {
		@@ -135,6 +141,18 @@
		},
		"value": {
		"$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json#"
		},
		"createdAt": {
		"$ref": "#/definitions/createdAt"
		},
		"modifiedAt": {
		"$ref": "#/definitions/modifiedAt"
		},
		"datasetId": {
		"$ref": "#/definitions/datasetId"
		},
		"instanceId": {
		"$ref": "#/definitions/instanceId"
		}
		},
		"required": [
		@@ -152,8 +170,6 @@
		]
		}
		}
		]
		}
		},
		"type": "object",
		"properties": {
		@@ -176,6 +192,12 @@
		},
		"operationSpace": {
		"$ref": "#/definitions/GeoProperty"
		},
		"createdAt": {
		"$ref": "#/definitions/createdAt"
		},
		"modifiedAt": {
		"$ref": "#/definitions/modifiedAt"
		}
		},
		"required": [