nullable on the top-level element doesn't work well with anyOf/allOf/…

…oneOf, therefore allow null as part of the other sub-schemas. See OAI/OpenAPI-Specification#1368 and related issues.
Open-EO · Jul 3, 2019 · bbfd1b2 · bbfd1b2
1 parent 577fdf5
commit bbfd1b2
Showing 1 changed file with 24 additions and 17 deletions.
diff --git a/openapi.json b/openapi.json
@@ -823,14 +823,15 @@
                             "items": {
                               "anyOf": [
                                 {
-                                  "type": "number"
+                                  "type": "number",
+                                  "nullable": true
                                 },
                                 {
                                   "type": "string",
-                                  "format": "date-time"
+                                  "format": "date-time",
+                                  "nullable": true
                                 }
-                              ],
-                              "nullable": true
+                              ]
                             }
                           },
                           "values": {
@@ -840,20 +841,23 @@
                             "items": {
                               "anyOf": [
                                 {
-                                  "type": "number"
+                                  "type": "number",
+                                  "nullable": true
                                 },
                                 {
-                                  "type": "string"
+                                  "type": "string",
+                                  "nullable": true
                                 },
                                 {
                                   "type": "string",
-                                  "format": "date-time"
+                                  "format": "date-time",
+                                  "nullable": true
                                 },
                                 {
-                                  "type": "boolean"
+                                  "type": "boolean",
+                                  "nullable": true
                                 }
-                              ],
-                              "nullable": true
+                              ]
                             }
                           }
                         }
@@ -4111,7 +4115,6 @@
           },
           "default": {
             "description": "Whenever no value for the variable is defined, the default value is used.",
-            "nullable": true,
             "anyOf": [
               {
                 "type": "string"
@@ -4127,7 +4130,8 @@
                 "type": "boolean"
               },
               {
-                "type": "object"
+                "type": "object",
+                "nullable": true
               },
               {
                 "$ref": "#/components/schemas/process_graph"
@@ -4170,7 +4174,6 @@
       "process_argument_value": {
         "title": "Process Argument Value",
         "description": "Arguments for a process. See the API documentation for more information.",
-        "nullable": true,
         "anyOf": [
           {
             "type": "string",
@@ -4186,7 +4189,8 @@
           },
           {
             "type": "object",
-            "title": "Object"
+            "nullable": true,
+            "title": "Object (or null)"
           },
           {
             "type": "array",
@@ -4210,7 +4214,8 @@
                 "description": "The ID of the node that data is expected to come from.",
                 "type": "string"
               }
-            }
+            },
+            "additionalProperties": false
           },
           {
             "type": "object",
@@ -4224,7 +4229,8 @@
                 "description": "The name of the parameter that is made available to a callback by a calling process.",
                 "type": "string"
               }
-            }
+            },
+            "additionalProperties": false
           },
           {
             "type": "object",
@@ -4237,7 +4243,8 @@
               "callback": {
                 "$ref": "#/components/schemas/process_graph"
               }
-            }
+            },
+            "additionalProperties": false
           }
         ]
       },