Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: consistency and nested traits #342

Merged
merged 10 commits into from
Apr 11, 2023
Merged

fix: consistency and nested traits #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b65a5fe
remove unused definitions
jonaslagoni Feb 20, 2023
16ce1cc
ensure consistency and fixed #339
jonaslagoni Feb 20, 2023
bcd54d6
fixed tests
jonaslagoni Feb 20, 2023
d5f81e5
remove unnecessary addtionalItems
jonaslagoni Feb 22, 2023
6fc9687
remove unnecessary addtionalItems
jonaslagoni Feb 22, 2023
8e2adc8
Merge branch 'next-major-spec' into feature/small_changes
jonaslagoni Mar 13, 2023
df2589f
Merge branch 'next-major-spec' into feature/small_changes
smoya Mar 14, 2023
46a95fe
Merge branch 'next-major-spec' into feature/small_changes
jonaslagoni Mar 16, 2023
b021902
fixed double message reference
jonaslagoni Mar 16, 2023
7ddcfa7
Merge branch 'next-major-spec' into feature/small_changes
jonaslagoni Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions definitions/3.0.0/bindingsObject.json
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion definitions/3.0.0/channelMessages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
{
"type": "object",
"additionalProperties": {
"$ref": "http://asyncapi.com/definitions/3.0.0/message.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/message.json"
}
]
},
"description": "A map of the messages that will be sent to this channel by any application at any time. **Every message sent to this channel MUST be valid against one, and only one, of the message objects defined in this map.**",
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
8 changes: 6 additions & 2 deletions definitions/3.0.0/channels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
"type": "object",
"additionalProperties": {
"oneOf": [
{ "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json" },
{ "$ref": "http://asyncapi.com/definitions/3.0.0/channel.json" }
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/channel.json"
}
]
},
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
5 changes: 0 additions & 5 deletions definitions/3.0.0/external.json
View file
Open in desktop

This file was deleted.

35 changes: 14 additions & 21 deletions definitions/3.0.0/message.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
{
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"oneOf": [
{
"type": "object",
"required": [
"oneOf"
],
"additionalProperties": false,
"properties": {
"oneOf": {
"type": "array",
"items": {
"$ref": "http://asyncapi.com/definitions/3.0.0/messageObject.json"
}
}
"type": "object",
"required": [
"oneOf"
],
"additionalProperties": false,
"properties": {
"oneOf": {
"type": "array",
"items": {
"$ref": "http://asyncapi.com/definitions/3.0.0/messageObject.json"
}
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/messageObject.json"
}
]
}
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/messageObject.json"
}
],
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
9 changes: 8 additions & 1 deletion definitions/3.0.0/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
{
"type": "object",
"additionalProperties": {
"$ref": "http://asyncapi.com/definitions/3.0.0/message.json"
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/message.json"
}
]
},
"description": "JSON objects describing the messages being consumed and produced by the API.",
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
19 changes: 0 additions & 19 deletions definitions/3.0.0/operation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,6 @@
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/operationTrait.json"
},
{
"type": "array",
"items": [
{
"oneOf": [
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/operationTrait.json"
}
]
},
{
"type": "object",
"additionalItems": true
}
]
}
]
}
Expand Down
8 changes: 6 additions & 2 deletions definitions/3.0.0/operations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
"type": "object",
"additionalProperties": {
"oneOf": [
{ "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json" },
{ "$ref": "http://asyncapi.com/definitions/3.0.0/operation.json" }
{
"$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
},
{
"$ref": "http://asyncapi.com/definitions/3.0.0/operation.json"
}
]
},
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down