Skip to content

minor simplification of v3.1 schema #2671

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

Merged
webron merged 4 commits into from
Sep 23, 2021
Merged

minor simplification of v3.1 schema #2671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74c5bb0
minor simplification of v3.1 schema
karenetheridge Aug 6, 2021
5c89b8c
add missing constraint to "header"
karenetheridge Aug 10, 2021
25ca57f
allowEmptyValue and allowReserved don't make sense for headers
karenetheridge Aug 10, 2021
cb62dcb
collapse single-item "enum"s in "cookie" and "header" to "const"
karenetheridge Sep 14, 2021
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
46 changes: 20 additions & 26 deletions schemas/v3.1/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,7 @@
"properties": {
"style": {
"default": "simple",
"enum": [
"simple"
]
"const": "simple"
}
}
}
Expand Down Expand Up @@ -581,9 +579,7 @@
"properties": {
"style": {
"default": "form",
"enum": [
"form"
]
"const": "form"
}
}
}
Expand Down Expand Up @@ -934,40 +930,38 @@
"default": false,
"type": "boolean"
},
"allowEmptyValue": {
"default": false,
"type": "boolean"
"schema": {
"$dynamicRef": "#meta"
},
"content": {
"$ref": "#/$defs/content"
}
},
"oneOf": [
{
"required": [
"schema"
]
},
{
"required": [
"content"
]
}
],
"dependentSchemas": {
"schema": {
"properties": {
"style": {
"default": "simple",
"enum": [
"simple"
]
"const": "simple"
},
"explode": {
"default": false,
"type": "boolean"
},
"allowReserved": {
"default": false,
"type": "boolean"
},
"schema": {
"$dynamicRef": "#meta"
}
},
"$ref": "#/$defs/examples"
},
"content": {
"properties": {
"content": {
"$ref": "#/$defs/content"
}
}
}
},
"$ref": "#/$defs/specification-extensions",
Expand Down
30 changes: 12 additions & 18 deletions schemas/v3.1/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,7 @@ $defs:
properties:
style:
default: simple
enum:
- simple
const: simple

styles-for-query:
if:
Expand Down Expand Up @@ -394,8 +393,7 @@ $defs:
properties:
style:
default: form
enum:
- form
const: form

styles-for-form:
if:
Expand Down Expand Up @@ -634,29 +632,25 @@ $defs:
deprecated:
default: false
type: boolean
allowEmptyValue:
default: false
type: boolean
schema:
$dynamicRef: '#meta'
content:
$ref: '#/$defs/content'
oneOf:
- required:
- schema
- required:
- content
dependentSchemas:
schema:
properties:
style:
default: simple
enum:
- simple
const: simple
explode:
default: false
type: boolean
allowReserved:
default: false
type: boolean
schema:
$dynamicRef: '#meta'
$ref: '#/$defs/examples'
content:
properties:
content:
$ref: '#/$defs/content'
$ref: '#/$defs/specification-extensions'
unevaluatedProperties: false

Expand Down