This repository has been archived by the owner on Jan 20, 2024. It is now read-only.
forked from OAI/OpenAPI-Specification
-
Notifications
You must be signed in to change notification settings - Fork 1
Adding support for merging of components to simulate traits/resource types #6
Open
antoniogarrote
wants to merge
1
commit into
oas4_raml2
Choose a base branch
from
oas4_raml2_component_merge
base: oas4_raml2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+127
−8
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -51,6 +51,8 @@ An OpenAPI definition can then be used by documentation generation tools to disp | |
- [Header Object](#headerObject) | ||
- [Tag Object](#tagObject) | ||
- [Reference Object](#referenceObject) | ||
- [Merge Object](#mergeObject) | ||
- [Merge Object Spec](#mergeObjectSpec) | ||
- [Schema Object](#schemaObject) | ||
- [Discriminator Object](#discriminatorObject) | ||
- [XML Object](#xmlObject) | ||
|
@@ -174,7 +176,7 @@ Where OpenAPI tooling renders rich text it MUST support, at a minimum, markdown | |
Unless specified otherwise, all properties that are URLs MAY be relative references as defined by [RFC3986](https://tools.ietf.org/html/rfc3986#section-4.2). | ||
Relative references are resolved using the URLs defined in the [`Server Object`](#serverObject) as a Base URI. | ||
|
||
Relative references used in `$ref` are processed as per [JSON Reference](https://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03), using the URL of the current document as the base URI. See also the [Reference Object](#referenceObject). | ||
Relative references used in `$ref` an are processed as per [JSON Reference](https://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03), using the URL of the current document as the base URI. See also the [Reference Object](#referenceObject). | ||
|
||
### Schema | ||
|
||
|
@@ -443,11 +445,11 @@ All objects defined within the components object will have no effect on the API | |
|
||
Field Name | Type | Description | ||
---|:---|--- | ||
<a name="componentsSchemas"></a> schemas | Map[`string`, [Schema Object](#schemaObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Schema Objects](#schemaObject). | ||
<a name="componentsSchemas"></a> schemas | Map[`string`, [Schema Object](#schemaObject) \| [Reference Object](#referenceObject)] \| [Merge Object](#mergeObject) | An object to hold reusable [Schema Objects](#schemaObject). | ||
<a name="componentsResponses"></a> responses | Map[`string`, [Response Object](#responseObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Response Objects](#responseObject). | ||
<a name="componentsParameters"></a> parameters | Map[`string`, [Parameter Object](#parameterObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Parameter Objects](#parameterObject). | ||
<a name="componentsExamples"></a> examples | Map[`string`, [Example Object](#exampleObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Example Objects](#exampleObject). | ||
<a name="componentsRequestBodies"></a> requestBodies | Map[`string`, [Request Body Object](#requestBodyObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Request Body Objects](#requestBodyObject). | ||
<a name="componentsRequestBodies"></a> requestBodies | Map[`string`, [Request Body Object](#requestBodyObject) \| [Reference Object](#referenceObject)] \| [Merge Object](#mergeObject) | An object to hold reusable [Request Body Objects](#requestBodyObject). | ||
<a name="componentsHeaders"></a> headers | Map[`string`, [Header Object](#headerObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Header Objects](#headerObject). | ||
<a name="componentsSecuritySchemes"></a> securitySchemes| Map[`string`, [Security Scheme Object](#securitySchemeObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Security Scheme Objects](#securitySchemeObject). | ||
<a name="componentsLinks"></a> links | Map[`string`, [Link Object](#linkObject) \| [Reference Object](#referenceObject)] | An object to hold reusable [Link Objects](#linkObject). | ||
|
@@ -1003,7 +1005,7 @@ Field Name | Type | Description | |
<a name="parameterStyle"></a>style | `string` | Describes how the parameter value will be serialized depending on the type of the parameter value. Default values (based on value of `in`): for `query` - `form`; for `path` - `simple`; for `header` - `simple`; for `cookie` - `form`. | ||
<a name="parameterExplode"></a>explode | `boolean` | When this is true, parameter values of type `array` or `object` generate separate parameters for each value of the array or key-value pair of the map. For other types of parameters this property has no effect. When [`style`](#parameterStyle) is `form`, the default value is `true`. For all other styles, the default value is `false`. | ||
<a name="parameterAllowReserved"></a>allowReserved | `boolean` | Determines whether the parameter value SHOULD allow reserved characters, as defined by [RFC3986](https://tools.ietf.org/html/rfc3986#section-2.2) `:/?#[]@!$&'()*+,;=` to be included without percent-encoding. This property only applies to parameters with an `in` value of `query`. The default value is `false`. | ||
<a name="parameterSchema"></a>schema | [Schema Object](#schemaObject) \| [Reference Object](#referenceObject) | The schema defining the type used for the parameter. | ||
<a name="parameterSchema"></a>schema | [Schema Object](#schemaObject) \| [Reference Object](#referenceObject) \| [Merge Object](#mergeObject) | The schema defining the type used for the parameter. | ||
<a name="parameterExample"></a>example | Any | Example of the media type. The example SHOULD match the specified schema and encoding properties if present. The `example` field is mutually exclusive of the `examples` field. Furthermore, if referencing a `schema` which contains an example, the `example` value SHALL _override_ the example provided by the schema. To represent examples of media types that cannot naturally be represented in JSON or YAML, a string value can contain the example with escaping where necessary. | ||
<a name="parameterExamples"></a>examples | Map[ `string`, [Example Object](#exampleObject) \| [Reference Object](#referenceObject)] | Examples of the media type. Each example SHOULD contain a value in the correct format as specified in the parameter encoding. The `examples` field is mutually exclusive of the `example` field. Furthermore, if referencing a `schema` which contains an example, the `examples` value SHALL _override_ the example provided by the schema. | ||
|
||
|
@@ -1342,7 +1344,7 @@ Each Media Type Object provides schema and examples for the media type identifie | |
##### Fixed Fields | ||
Field Name | Type | Description | ||
---|:---:|--- | ||
<a name="mediaTypeSchema"></a>schema | [Schema Object](#schemaObject) \| [Reference Object](#referenceObject) | The schema defining the type used for the request body. | ||
<a name="mediaTypeSchema"></a>schema | [Schema Object](#schemaObject) \| [Reference Object](#referenceObject) \| [Merge Object](#mergeObject) | The schema defining the type used for the request body. | ||
<a name="mediaTypeExample"></a>example | Any | Example of the media type. The example object SHOULD be in the correct format as specified by the media type. The `example` field is mutually exclusive of the `examples` field. Furthermore, if referencing a `schema` which contains an example, the `example` value SHALL _override_ the example provided by the schema. | ||
<a name="mediaTypeExamples"></a>examples | Map[ `string`, [Example Object](#exampleObject) \| [Reference Object](#referenceObject)] | Examples of the media type. Each example object SHOULD match the media type and specified schema if present. The `examples` field is mutually exclusive of the `example` field. Furthermore, if referencing a `schema` which contains an example, the `examples` value SHALL _override_ the example provided by the schema. | ||
<a name="mediaTypeEncoding"></a>encoding | Map[`string`, [Encoding Object](#encodingObject)] | A map between a property name and its encoding information. The key, being the property name, MUST exist in the schema as a property. The encoding object SHALL only apply to `requestBody` objects when the media type is `multipart` or `application/x-www-form-urlencoded`. | ||
|
@@ -1621,12 +1623,12 @@ SHOULD be the response for a successful operation call. | |
##### Fixed Fields | ||
Field Name | Type | Description | ||
---|:---:|--- | ||
<a name="responsesDefault"></a>default | [Response Object](#responseObject) \| [Reference Object](#referenceObject) | The documentation of responses other than the ones declared for specific HTTP response codes. Use this field to cover undeclared responses. A [Reference Object](#referenceObject) can link to a response that the [OpenAPI Object's components/responses](#componentsResponses) section defines. | ||
<a name="responsesDefault"></a>default | [Response Object](#responseObject) \| [Reference Object](#referenceObject) \| [Merge Object](#mergeObject) | The documentation of responses other than the ones declared for specific HTTP response codes. Use this field to cover undeclared responses. A [Reference Object](#referenceObject) can link to a response that the [OpenAPI Object's components/responses](#componentsResponses) section defines. | ||
|
||
##### Patterned Fields | ||
Field Pattern | Type | Description | ||
---|:---:|--- | ||
<a name="responsesCode"></a>[HTTP Status Code](#httpCodes) | [Response Object](#responseObject) \| [Reference Object](#referenceObject) | Any [HTTP status code](#httpCodes) can be used as the property name, but only one property per code, to describe the expected response for that HTTP status code. A [Reference Object](#referenceObject) can link to a response that is defined in the [OpenAPI Object's components/responses](#componentsResponses) section. This field MUST be enclosed in quotation marks (for example, "200") for compatibility between JSON and YAML. To define a range of response codes, this field MAY contain the uppercase wildcard character `X`. For example, `2XX` represents all response codes between `[200-299]`. The following range definitions are allowed: `1XX`, `2XX`, `3XX`, `4XX`, and `5XX`. If a response range is defined using an explicit code, the explicit code definition takes precedence over the range definition for that code. | ||
<a name="responsesCode"></a>[HTTP Status Code](#httoppCodes) | [Response Object](#responseObject) \| [Reference Object](#referenceObject) | Any [HTTP status code](#httpCodes) can be used as the property name, but only one property per code, to describe the expected response for that HTTP status code. A [Reference Object](#referenceObject) can link to a response that is defined in the [OpenAPI Object's components/responses](#componentsResponses) section. This field MUST be enclosed in quotation marks (for example, "200") for compatibility between JSON and YAML. To define a range of response codes, this field MAY contain the uppercase wildcard character `X`. For example, `2XX` represents all response codes between `[200-299]`. The following range definitions are allowed: `1XX`, `2XX`, `3XX`, `4XX`, and `5XX`. If a response range is defined using an explicit code, the explicit code definition takes precedence over the range definition for that code. | ||
|
||
|
||
This object MAY be extended with [Specification Extensions](#specificationExtensions). | ||
|
@@ -1682,7 +1684,7 @@ Describes a single response from an API Operation, including design-time, static | |
##### Fixed Fields | ||
Field Name | Type | Description | ||
---|:---:|--- | ||
<a name="responseDescription"></a>description | `string` | **REQUIRED**. A short description of the response. [CommonMark syntax](http://spec.commonmark.org/) MAY be used for rich text representation. | ||
<a name="responseDescription"></a>description | `string` | A short description of the response. [CommonMark syntax](http://spec.commonmark.org/) MAY be used for rich text representation. | ||
<a name="responseHeaders"></a>headers | Map[`string`, [Header Object](#headerObject) \| [Reference Object](#referenceObject)] | Maps a header name to its definition. [RFC7230](https://tools.ietf.org/html/rfc7230#page-22) states header names are case insensitive. If a response header is defined with the name `"Content-Type"`, it SHALL be ignored. | ||
<a name="responseContent"></a>content | Map[`string`, [Media Type Object](#mediaTypeObject)] | A map containing descriptions of potential response payloads. The key is a media type or [media type range](https://tools.ietf.org/html/rfc7231#appendix-D) and the value describes it. For responses that match multiple keys, only the most specific key is applicable. e.g. text/plain overrides text/* | ||
<a name="responseLinks"></a>links | Map[`string`, [Link Object](#linkObject) \| [Reference Object](#referenceObject)] | A map of operations links that can be followed from the response. The key of the map is a short name for the link, following the naming constraints of the names for [Component Objects](#componentsObject). | ||
|
@@ -2233,6 +2235,123 @@ $ref: Pet.yaml | |
$ref: definitions.yaml#/Pet | ||
``` | ||
|
||
#### <a name="mergeObject"></a>Merge Object | ||
|
||
A simple object containing the specification to allow merging multiple components in the specification, internally and externally into a single output object combining fields from all of them. | ||
|
||
The Merge Object is defined by [JSON Patch](https://tools.ietf.org/html/rfc6902) and follows the same structure, behavior and rules. | ||
|
||
Notice that merge objects can only be added in the allowed locations in this specification. | ||
|
||
##### Fixed Fields | ||
Field Name | Type | Description | ||
---|:---:|--- | ||
<a name="mergeRef"></a>$merge | [Merge Object Spec](#mergeObjectSpec) | **REQUIRED**. The specification of the merge operation. | ||
|
||
This object cannot be extended with additional properties and any properties added SHALL be ignored. | ||
|
||
|
||
#### <a name="mergeObjectSpec"></a>Merge Object Spec | ||
|
||
Details of the merge operation to be applied to a set components in the specification. | ||
|
||
The Merge Object Spec is defined by [JSON Patch](https://tools.ietf.org/html/rfc6902) and follows the same structure, behavior and rules. | ||
|
||
##### Fixed Fields | ||
Field Name | Type | Description | ||
---|:---:|--- | ||
<a name="mergeSource"></a>source | [Request Body Object](#requestBodyObject) \| [Response Object](#responseObject) \| [Schema Object](#schemaObject) \| [Reference Object](#referenceObject) \| [Merge Object](#mergeObject) | **REQUIRED**. The base object used in the merge transformation | ||
<a name="mergeWith"></a>with | \[ [Request Body Object](#requestBodyObject) \| [Response Object](#responseObject) \| [Schema Object](#schemaObject) \| [Reference Object](#referenceObject) \] | **REQUIRED**. The list of objects to be merged on top of the base object | ||
|
||
This object cannot be extended with additional properties and any properties added SHALL be ignored. | ||
|
||
|
||
##### Merge Object Spec Example | ||
|
||
```json | ||
{ | ||
"$merge": { | ||
"source": { | ||
"description": "returns an Account", | ||
"content": { | ||
"application/json": { | ||
"schema": { "$ref": "#/components/schemas/Account" } | ||
} | ||
} | ||
}, | ||
"with": [ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is actually not clear how this example is connected to JSON Patch spec. As well as I see from JSON patch it requires [
{ "op": "add", "path": "/baz", "value": "qux" }
] |
||
{ | ||
"headers": { | ||
"X-Rate-Limit-Limit": { | ||
"description": "The number of allowed requests in the current period", | ||
"schema": { | ||
"type": "integer" | ||
} | ||
}, | ||
"X-Rate-Limit-Remaining": { | ||
"description": "The number of remaining requests in the current period", | ||
"schema": { | ||
"type": "integer" | ||
} | ||
}, | ||
"X-Rate-Limit-Reset": { | ||
"description": "The number of seconds left in the current period", | ||
"schema": { | ||
"type": "integer" | ||
} | ||
} | ||
} | ||
} | ||
] | ||
} | ||
} | ||
``` | ||
|
||
```yaml | ||
$merge: | ||
source: | ||
description: returns an Account | ||
content: | ||
application/json: | ||
schema: | ||
$ref: "#/components/schemas/Account | ||
with: | ||
- headers: | ||
X-Rate-Limit-limit: | ||
description: The number of allowed requests in the current period | ||
schema: | ||
type: integer | ||
X-Rate-Limit-Remaining: | ||
description: The number of remaining requests in the current period | ||
schema: | ||
type: integer | ||
X-Rate-Limit-Reset: | ||
description: The number of seconds left in the current period | ||
schema: | ||
type: integer | ||
``` | ||
|
||
##### Relative and absolute references Merge Object Spec example | ||
```json | ||
{ | ||
"$merge": { | ||
"source": { "$ref": "#/components/responses/Accounts" }, | ||
"with": [ | ||
{ "$ref": "library.json#/components/responses/rate-limit" } | ||
] | ||
} | ||
} | ||
``` | ||
|
||
```yaml | ||
$merge: | ||
source: | ||
$ref: "#/components/responses/Accounts" | ||
with: | ||
- $ref: "library.json#/components/responses/rate-limit" | ||
``` | ||
|
||
|
||
#### <a name="schemaObject"></a>Schema Object | ||
|
||
The Schema Object allows the definition of input and output data types. | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be that I missing something but what I see in examples look pretty different from JSON patch.