Removing the allOf wrapper for schemas definition when they reference to other... (580957ea) · Commits · CIM - Context Information Management / NGSI-LD OpenAPI

ngsi-ld-api.yaml

+45 −87

Original line number	Original line	Diff line number	Diff line
	@@ -3187,9 +3187,8 @@ components:
	content:		content:
	application/json:		application/json:
	schema:		schema:
	allOf:		$ref: '#/components/schemas/EntityTemporal'
	- $ref: '#/components/schemas/EntityTemporal'		required:
	- required:
	- id		- id
	- type		- type
	application/json+ld:		application/json+ld:
	@@ -3360,16 +3359,13 @@ components:
	type: object		type: object
	properties:		properties:
	createdAt:		createdAt:
	allOf:		$ref: '#/components/schemas/CreatedAt'
	- $ref: '#/components/schemas/CreatedAt'
	readOnly: true		readOnly: true
	modifiedAt:		modifiedAt:
	allOf:		$ref: '#/components/schemas/ModifiedAt'
	- $ref: '#/components/schemas/ModifiedAt'
	readOnly: true		readOnly: true
	deletedAt:		deletedAt:
	allOf:		$ref: '#/components/schemas/DeletedAt'
	- $ref: '#/components/schemas/DeletedAt'
	readOnly: true		readOnly: true
	CreatedAt:		CreatedAt:
	description: \|		description: \|
	@@ -3493,8 +3489,7 @@ components:
	error:		error:
	description: \|		description: \|
	One instance per Entity in error.		One instance per Entity in error.
	allOf:		$ref: '#/components/schemas/ProblemDetails'
	- $ref: '#/components/schemas/ProblemDetails'
	required:		required:
	- entityId		- entityId
	- error		- error
	@@ -3632,8 +3627,7 @@ components:
	Entity information as specified by the observedAt Temporal Property.		Entity information as specified by the observedAt Temporal Property.
	A temporal query based on the observedAt Temporal Property, which is the default,		A temporal query based on the observedAt Temporal Property, which is the default,
	is matched against the observationInterval for overlap.		is matched against the observationInterval for overlap.
	allOf:		$ref: '#/components/schemas/TimeInterval'
	- $ref: '#/components/schemas/TimeInterval'
	managementInterval:		managementInterval:
	description: \|		description: \|
	If present, the Context Source can be queried for Temporal Entity Representations. (If latest Entity		If present, the Context Source can be queried for Temporal Entity Representations. (If latest Entity
	@@ -3642,27 +3636,23 @@ components:
	information as specified by the createdAt, modifiedAt and deletedAt Temporal Properties.		information as specified by the createdAt, modifiedAt and deletedAt Temporal Properties.
	A temporal query based on the createdAt, modifiedAt or deletedAt Temporal Property is matched		A temporal query based on the createdAt, modifiedAt or deletedAt Temporal Property is matched
	against the managementInterval for overlap.		against the managementInterval for overlap.
	allOf:		$ref: '#/components/schemas/TimeInterval'
	- $ref: '#/components/schemas/TimeInterval'
	location:		location:
	description: \|		description: \|
	Location for which the Context Source may be able to provide information.		Location for which the Context Source may be able to provide information.
	allOf:		$ref: '#/components/schemas/Geometry'
	- $ref: '#/components/schemas/Geometry'
	observationSpace:		observationSpace:
	description: \|		description: \|
	Geographic location that includes the observation spaces of all entities as specified by their		Geographic location that includes the observation spaces of all entities as specified by their
	respective observationSpace GeoProperty for which the Context Source may be able to provide		respective observationSpace GeoProperty for which the Context Source may be able to provide
	information.		information.
	allOf:		$ref: '#/components/schemas/Geometry'
	- $ref: '#/components/schemas/Geometry'
	operationSpace:		operationSpace:
	description: \|		description: \|
	Geographic location that includes the operation spaces of all entities as specified by their		Geographic location that includes the operation spaces of all entities as specified by their
	respective operationSpace GeoProperty for which the Context Source may be able to provide		respective operationSpace GeoProperty for which the Context Source may be able to provide
	information.		information.
	allOf:		$ref: '#/components/schemas/Geometry'
	- $ref: '#/components/schemas/Geometry'
	expiresAt:		expiresAt:
	description: \|		description: \|
	Provides an expiration date. When passed the Context Source Registration		Provides an expiration date. When passed the Context Source Registration
	@@ -3717,12 +3707,10 @@ components:
	description: \|		description: \|
	Holds additional optional registration management information that can be used		Holds additional optional registration management information that can be used
	to limit unnecessary distributed operation requests.		to limit unnecessary distributed operation requests.
	allOf:		$ref: '#/components/schemas/RegistrationManagementInfo'
	- $ref: '#/components/schemas/RegistrationManagementInfo'
	# Clause 5.2.2 Common members. System-generated temporal attributes.		# Clause 5.2.2 Common members. System-generated temporal attributes.
	systemGeneratedAttrs:		systemGeneratedAttrs:
	allOf:		$ref: '#/components/schemas/SystemGeneratedAttributes'
	- $ref: '#/components/schemas/SystemGeneratedAttributes'
	status:		status:
	description: \|		description: \|
	Read-only. Status of the Registration. It shall be "ok" if the last attempt to perform a distributed		Read-only. Status of the Registration. It shall be "ok" if the last attempt to perform a distributed
	@@ -3851,22 +3839,18 @@ components:
	location:		location:
	description: \|		description: \|
	Default geospatial Property of an entity. See clause 4.7.		Default geospatial Property of an entity. See clause 4.7.
	allOf:		$ref: '#/components/schemas/GeoProperty'
	- $ref: '#/components/schemas/GeoProperty'
	observationSpace:		observationSpace:
	description: \|		description: \|
	See clause 4.7.		See clause 4.7.
	allOf:		$ref: '#/components/schemas/GeoProperty'
	- $ref: '#/components/schemas/GeoProperty'
	operationSpace:		operationSpace:
	description: \|		description: \|
	See clause 4.7.		See clause 4.7.
	allOf:		$ref: '#/components/schemas/GeoProperty'
	- $ref: '#/components/schemas/GeoProperty'
	# Clause 5.2.2 Common members. System-generated temporal attributes.		# Clause 5.2.2 Common members. System-generated temporal attributes.
	systemGeneratedAttrs:		systemGeneratedAttrs:
	allOf:		$ref: '#/components/schemas/SystemGeneratedAttributes'
	- $ref: '#/components/schemas/SystemGeneratedAttributes'
	additionalProperties:		additionalProperties:
	oneOf:		oneOf:
	- $ref: '#/components/schemas/Property'		- $ref: '#/components/schemas/Property'
	@@ -3970,22 +3954,18 @@ components:
	location:		location:
	description: \|		description: \|
	Default geospatial Property of an entity. See clause 4.7.		Default geospatial Property of an entity. See clause 4.7.
	allOf:		$ref: '#/components/schemas/GeoProperty'
	- $ref: '#/components/schemas/GeoProperty'
	observationSpace:		observationSpace:
	description: \|		description: \|
	See clause 4.7.		See clause 4.7.
	allOf:		$ref: '#/components/schemas/GeoProperty'
	- $ref: '#/components/schemas/GeoProperty'
	operationSpace:		operationSpace:
	description: \|		description: \|
	See clause 4.7.		See clause 4.7.
	allOf:		$ref: '#/components/schemas/GeoProperty'
	- $ref: '#/components/schemas/GeoProperty'
	# Clause 5.2.2 Common members. System-generated temporal attributes.		# Clause 5.2.2 Common members. System-generated temporal attributes.
	systemGeneratedAttrs:		systemGeneratedAttrs:
	allOf:		$ref: '#/components/schemas/SystemGeneratedAttributes'
	- $ref: '#/components/schemas/SystemGeneratedAttributes'
	additionalProperties:		additionalProperties:
	oneOf:		oneOf:
	- type: array		- type: array
	@@ -4118,19 +4098,16 @@ components:
	geometry:		geometry:
	description: \|		description: \|
	Null if no matching GeoProperty.		Null if no matching GeoProperty.
	allOf:		$ref: '#/components/schemas/Geometry'
	- $ref: '#/components/schemas/Geometry'
	properties:		properties:
	description: \|		description: \|
	List of attributes as mandated by clause 5.2.31.		List of attributes as mandated by clause 5.2.31.
	allOf:		$ref: '#/components/schemas/FeatureProperties'
	- $ref: '#/components/schemas/FeatureProperties'
	'@context':		'@context':
	description: \|		description: \|
	JSON-LD @context. This field is only present if requested in the payload by		JSON-LD @context. This field is only present if requested in the payload by
	the HTTP Prefer Header (IETF RFC 7240).		the HTTP Prefer Header (IETF RFC 7240).
	allOf:		$ref: '#/components/schemas/LdContext'
	- $ref: '#/components/schemas/LdContext'
	required:		required:
	- id		- id
	- type		- type
	@@ -4158,8 +4135,7 @@ components:
	description: \|		description: \|
	JSON-LD @context. This field is only present if requested in the payload		JSON-LD @context. This field is only present if requested in the payload
	by the HTTP Prefer Header (IETF RFC 7240).		by the HTTP Prefer Header (IETF RFC 7240).
	allOf:		$ref: '#/components/schemas/LdContext'
	- $ref: '#/components/schemas/LdContext'
	required:		required:
	- type		- type
	FeatureProperties:		FeatureProperties:
	@@ -4323,8 +4299,7 @@ components:
	observedAt:		observedAt:
	description: \|		description: \|
	Timestamp. See clause 4.8.		Timestamp. See clause 4.8.
	allOf:		$ref: '#/components/schemas/ObservedAt'
	- $ref: '#/components/schemas/ObservedAt'
	datasetId:		datasetId:
	description: \|		description: \|
	It allows identifying a set or group of property values.		It allows identifying a set or group of property values.
	@@ -4332,8 +4307,7 @@ components:
	format: uri		format: uri
	# Clause 5.2.2 Common members. System-generated temporal attributes.		# Clause 5.2.2 Common members. System-generated temporal attributes.
	systemGeneratedAttrs:		systemGeneratedAttrs:
	allOf:		$ref: '#/components/schemas/SystemGeneratedAttributes'
	- $ref: '#/components/schemas/SystemGeneratedAttributes'
	instanceId:		instanceId:
	description: \|		description: \|
	A URI uniquely identifying a Property instance,		A URI uniquely identifying a Property instance,
	@@ -4345,8 +4319,7 @@ components:
	description: \|		description: \|
	Previous GeoProperty value. Only used in notifications, if the showChanges		Previous GeoProperty value. Only used in notifications, if the showChanges
	option is explicitly requested.		option is explicitly requested.
	allOf:		$ref: '#/components/schemas/Geometry'
	- $ref: '#/components/schemas/Geometry'
	readOnly: true		readOnly: true
	additionalProperties:		additionalProperties:
	oneOf:		oneOf:
	@@ -4426,8 +4399,7 @@ components:
	observedAt:		observedAt:
	description: \|		description: \|
	Timestamp. See clause 4.8.		Timestamp. See clause 4.8.
	allOf:		$ref: '#/components/schemas/ObservedAt'
	- $ref: '#/components/schemas/ObservedAt'
	datasetId:		datasetId:
	description: \|		description: \|
	It allows identifying a set or group of property values.		It allows identifying a set or group of property values.
	@@ -4435,8 +4407,7 @@ components:
	format: uri		format: uri
	# Clause 5.2.2 Common members. System-generated temporal attributes.		# Clause 5.2.2 Common members. System-generated temporal attributes.
	systemGeneratedAttrs:		systemGeneratedAttrs:
	allOf:		$ref: '#/components/schemas/SystemGeneratedAttributes'
	- $ref: '#/components/schemas/SystemGeneratedAttributes'
	instanceId:		instanceId:
	description: \|		description: \|
	A URI uniquely identifying a Property instance,		A URI uniquely identifying a Property instance,
	@@ -4623,8 +4594,7 @@ components:
	endpoint:		endpoint:
	description: \|		description: \|
	Notification endpoint details.		Notification endpoint details.
	allOf:		$ref: '#/components/schemas/Endpoint'
	- $ref: '#/components/schemas/Endpoint'
	status:		status:
	description: \|		description: \|
	Status of the Notification. It shall be "ok" if the last attempt to notify the subscriber succeeded.		Status of the Notification. It shall be "ok" if the last attempt to notify the subscriber succeeded.
	@@ -4753,8 +4723,7 @@ components:
	observedAt:		observedAt:
	description: \|		description: \|
	Timestamp. See clause 4.8.		Timestamp. See clause 4.8.
	allOf:		$ref: '#/components/schemas/ObservedAt'
	- $ref: '#/components/schemas/ObservedAt'
	unitCode:		unitCode:
	description: \|		description: \|
	Property Value's unit code.		Property Value's unit code.
	@@ -4766,8 +4735,7 @@ components:
	format: uri		format: uri
	# Clause 5.2.2 Common members. System-generated temporal attributes.		# Clause 5.2.2 Common members. System-generated temporal attributes.
	systemGeneratedAttrs:		systemGeneratedAttrs:
	allOf:		$ref: '#/components/schemas/SystemGeneratedAttributes'
	- $ref: '#/components/schemas/SystemGeneratedAttributes'
	instanceId:		instanceId:
	description: \|		description: \|
	A URI uniquely identifying a Property instance,		A URI uniquely identifying a Property instance,
	@@ -4828,8 +4796,7 @@ components:
	geoQ:		geoQ:
	description: \|		description: \|
	Geoquery that shall be matched by Entities in order be retrieved.		Geoquery that shall be matched by Entities in order be retrieved.
	allOf:		$ref: '#/components/schemas/GeoQuery'
	- $ref: '#/components/schemas/GeoQuery'
	csf:		csf:
	description: \|		description: \|
	Context source filter that shall be matched by Context Source Registrations describing		Context source filter that shall be matched by Context Source Registrations describing
	@@ -4858,8 +4825,7 @@ components:
	temporalQ:		temporalQ:
	description: \|		description: \|
	Temporal Query to be present only for "Query Temporal Evolution of Entities" operation (clause 5.7.4).		Temporal Query to be present only for "Query Temporal Evolution of Entities" operation (clause 5.7.4).
	allOf:		$ref: '#/components/schemas/TemporalQuery'
	- $ref: '#/components/schemas/TemporalQuery'
	- required:		- required:
	- temporalQ		- temporalQ
	RegistrationInfo:		RegistrationInfo:
	@@ -4939,8 +4905,7 @@ components:
	observedAt:		observedAt:
	description: \|		description: \|
	Timestamp. See clause 4.8.		Timestamp. See clause 4.8.
	allOf:		$ref: '#/components/schemas/ObservedAt'
	- $ref: '#/components/schemas/ObservedAt'
	datasetId:		datasetId:
	description: \|		description: \|
	It allows identifying a set or group of target relationship objects.		It allows identifying a set or group of target relationship objects.
	@@ -4948,8 +4913,7 @@ components:
	format: uri		format: uri
	# Clause 5.2.2 Common members. System-generated temporal attributes.		# Clause 5.2.2 Common members. System-generated temporal attributes.
	systemGeneratedAttrs:		systemGeneratedAttrs:
	allOf:		$ref: '#/components/schemas/SystemGeneratedAttributes'
	- $ref: '#/components/schemas/SystemGeneratedAttributes'
	instanceId:		instanceId:
	description: \|		description: \|
	A URI uniquely identifying a Relationship instance		A URI uniquely identifying a Relationship instance
	@@ -5031,8 +4995,7 @@ components:
	geoQ:		geoQ:
	description: \|		description: \|
	Geoquery that shall be met by subscribed entities in order to trigger the notification.		Geoquery that shall be met by subscribed entities in order to trigger the notification.
	allOf:		$ref: '#/components/schemas/GeoQuery'
	- $ref: '#/components/schemas/GeoQuery'
	csf:		csf:
	description: \|		description: \|
	Context source filter that shall be met by Context Source Registrations describing Context Sources		Context source filter that shall be met by Context Source Registrations describing Context Sources
	@@ -5048,8 +5011,7 @@ components:
	notification:		notification:
	description: \|		description: \|
	Notification details.		Notification details.
	allOf:		$ref: '#/components/schemas/NotificationParams'
	- $ref: '#/components/schemas/NotificationParams'
	expiresAt:		expiresAt:
	description: \|		description: \|
	Expiration date for the subscription.		Expiration date for the subscription.
	@@ -5059,8 +5021,7 @@ components:
	description: \|		description: \|
	Temporal Query to be used only in Context Registration Subscriptions for matching		Temporal Query to be used only in Context Registration Subscriptions for matching
	Context Source Registrations of Context Sources providing temporal information.		Context Source Registrations of Context Sources providing temporal information.
	allOf:		$ref: '#/components/schemas/TemporalQuery'
	- $ref: '#/components/schemas/TemporalQuery'
	scopeQ:		scopeQ:
	description: \|		description: \|
	Scope query.		Scope query.
	@@ -5071,8 +5032,7 @@ components:
	type: string		type: string
	# Clause 5.2.2 Common members. System-generated temporal attributes.		# Clause 5.2.2 Common members. System-generated temporal attributes.
	systemGeneratedAttrs:		systemGeneratedAttrs:
	allOf:		$ref: '#/components/schemas/SystemGeneratedAttributes'
	- $ref: '#/components/schemas/SystemGeneratedAttributes'
	status:		status:
	description: \|		description: \|
	Read-only. Provided by the system when querying the details of a subscription.		Read-only. Provided by the system when querying the details of a subscription.
	@@ -5226,8 +5186,7 @@ components:
	observedAt:		observedAt:
	description: \|		description: \|
	Timestamp. See clause 4.8.		Timestamp. See clause 4.8.
	allOf:		$ref: '#/components/schemas/ObservedAt'
	- $ref: '#/components/schemas/ObservedAt'
	datasetId:		datasetId:
	description: \|		description: \|
	It allows identifying a set or group of property values.		It allows identifying a set or group of property values.
	@@ -5235,8 +5194,7 @@ components:
	format: uri		format: uri
	# Clause 5.2.2 Common members. System-generated temporal attributes.		# Clause 5.2.2 Common members. System-generated temporal attributes.
	systemGeneratedAttrs:		systemGeneratedAttrs:
	allOf:		$ref: '#/components/schemas/SystemGeneratedAttributes'
	- $ref: '#/components/schemas/SystemGeneratedAttributes'
	instanceId:		instanceId:
	description: \|		description: \|
	A URI uniquely identifying a Property instance,		A URI uniquely identifying a Property instance,

Admin message