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 schema recursive references #371

Merged
merged 5 commits into from
Mar 4, 2024
Merged

fix schema recursive references #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49209bb
fix schema recursive references
fmigneault Oct 24, 2023
cc66912
remove unnecessary schema-original
fmigneault Oct 24, 2023
03ba03f
enforce no properties under JSON object properties
fmigneault Oct 24, 2023
1373286
disallow reference additionalProperties to avoid multiple matches
fmigneault Oct 24, 2023
4345283
force no nested properties under properties of JSON object
fmigneault Oct 24, 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
2 changes: 1 addition & 1 deletion core/requirements/ogc-process-description/REQ_input-def.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The schema of each <<input-value-schema,process **input** value>> SHALL be speci

[.component,class=part]
--
The value of the `schema` parameter SHALL be a JSON fragment that validates according to the JSON Schema: https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/openapi/schemas/processes-core/schema-original.yaml[schema.yaml].
The value of the `schema` parameter SHALL be a JSON fragment that validates according to the JSON Schema: https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/openapi/schemas/processes-core/schema.yaml[schema.yaml].
--

[.component,class=part]
Expand Down
2 changes: 1 addition & 1 deletion core/requirements/ogc-process-description/REQ_input-mixed-type.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ An input that can be of mixed type SHALL be defined using the https://tools.ietf

[.component,class=part]
--
Each sub-schema SHALL be a JSON fragment that validates according to the JSON Schema: https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/openapi/schemas/processes-core/schema-original.yaml[schema.yaml].
Each sub-schema SHALL be a JSON fragment that validates according to the JSON Schema: https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/openapi/schemas/processes-core/schema.yaml[schema.yaml].
--

[.component,class=part]
Expand Down
2 changes: 1 addition & 1 deletion core/requirements/ogc-process-description/REQ_output-def.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ The schema of each <<sc_process_outputs,process **output**>> SHALL be specified

[.component,class=part]
--
The value of the `schema` parameter SHALL be a JSON fragment that validates according to the JSON Schema: https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/openapi/schemas/processes-core/schema-original.yaml[schema.yaml].
The value of the `schema` parameter SHALL be a JSON fragment that validates according to the JSON Schema: https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/openapi/schemas/processes-core/schema.yaml[schema.yaml].
--
====
2 changes: 1 addition & 1 deletion core/requirements/ogc-process-description/REQ_output-mixed-type.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ An output that can be of mixed type SHALL be defined using the https://tools.iet

[.component,class=part]
--
Each sub-schema SHALL be a JSON fragment that validates according to the JSON Schema: https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/openapi/schemas/schema-original.yaml[schema.yaml].
Each sub-schema SHALL be a JSON fragment that validates according to the JSON Schema: https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/openapi/schemas/schema.yaml[schema.yaml].
--

[.component,class=part]
Expand Down
1 change: 1 addition & 0 deletions openapi/schemas/processes-core/reference.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ properties:
"$ref":
type: string
format: uri-reference
additionalProperties: false
130 changes: 0 additions & 130 deletions openapi/schemas/processes-core/schema-original.yaml
View file
Open in desktop

This file was deleted.

28 changes: 8 additions & 20 deletions openapi/schemas/processes-core/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,41 +66,29 @@ oneOf:
- object
- string
not:
oneOf:
# - $ref: "schema.yaml" # Recursive references breaks SwaggerUI
- $ref: "reference.yaml"
$ref: "schema.yaml"
allOf:
type: array
items:
oneOf:
# - $ref: "schema.yaml" # Recursive references breaks SwaggerUI
- $ref: "reference.yaml"
$ref: "schema.yaml"
oneOf:
type: array
items:
oneOf:
# - $ref: "schema.yaml" # Recursive references breaks SwaggerUI
- $ref: "reference.yaml"
$ref: "schema.yaml"
anyOf:
type: array
items:
oneOf:
# - $ref: "schema.yaml" # Recursive references breaks SwaggerUI
- $ref: "reference.yaml"
$ref: "schema.yaml"
items:
oneOf:
# - $ref: "schema.yaml" # Recursive references breaks SwaggerUI
- $ref: "reference.yaml"
$ref: "schema.yaml"
properties:
type: object
properties: {}
additionalProperties:
oneOf:
# - $ref: "schema.yaml" # Recursive references breaks SwaggerUI
- $ref: "reference.yaml"
$ref: "schema.yaml"
additionalProperties:
oneOf:
# - $ref: "schema.yaml" # Recursive references breaks SwaggerUI
- $ref: "reference.yaml"
- $ref: "schema.yaml"
- type: boolean
default: true
description:
Expand Down
Loading