Merge pull request #371 from crim-ca/fix-schema-recursive

fix schema recursive references
opengeospatial · Mar 4, 2024 · 3eb6764 · 3eb6764
2 parents c04b2e2 + 4345283
commit 3eb6764
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 154 deletions.
diff --git a/core/requirements/ogc-process-description/REQ_input-def.adoc b/core/requirements/ogc-process-description/REQ_input-def.adoc
@@ -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]

diff --git a/core/requirements/ogc-process-description/REQ_input-mixed-type.adoc b/core/requirements/ogc-process-description/REQ_input-mixed-type.adoc
@@ -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]

diff --git a/core/requirements/ogc-process-description/REQ_output-def.adoc b/core/requirements/ogc-process-description/REQ_output-def.adoc
@@ -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].
 --
 ====
diff --git a/core/requirements/ogc-process-description/REQ_output-mixed-type.adoc b/core/requirements/ogc-process-description/REQ_output-mixed-type.adoc
@@ -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]

diff --git a/openapi/schemas/processes-core/reference.yaml b/openapi/schemas/processes-core/reference.yaml
@@ -5,3 +5,4 @@ properties:
   "$ref":
     type: string
     format: uri-reference
+additionalProperties: false
diff --git a/openapi/schemas/processes-core/schema-original.yaml b/openapi/schemas/processes-core/schema-original.yaml
diff --git a/openapi/schemas/processes-core/schema.yaml b/openapi/schemas/processes-core/schema.yaml
@@ -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: