fix the parameter schema

src/ring/swagger/json_schema.clj

@@ -187,10 +187,12 @@
 
   schema.core.Maybe
   (convert [e {:keys [in] :as options}]
-    (let [schema (->swagger (:schema e) options)]
+    (let [schema       (->swagger (:schema e) options)
+          schema-type  (opts->schema-type options)
+          nullable-key (if (= schema-type :openapi) :nullable :x-nullable)]
       (condp contains? in
         #{:query :formData} (assoc schema :allowEmptyValue true)
-        #{nil :body} (assoc schema :x-nullable true)
+        #{nil :body} (assoc schema nullable-key true)
         schema)))
 
   schema.core.Both
@@ -226,11 +228,17 @@
 
   schema.core.ConditionalSchema
   (convert [e options]
-    {:x-oneOf (vec (keep #(->swagger (second %) options) (:preds-and-schemas e)))})
+    (let [schema-type (opts->schema-type options)
+          schema      (vec (keep #(->swagger (second %) options) (:preds-and-schemas e)))
+          schema-key  (if (= schema-type :openapi) :oneOf :x-oneOf)]
+      {schema-key schema}))
 
   schema.core.CondPre
   (convert [e options]
-    {:x-oneOf (mapv #(->swagger % options) (:schemas e))})
+    (let [schema-type (opts->schema-type options)
+          schema      (mapv #(->swagger % options) (:schemas e))
+          schema-key  (if (= schema-type :openapi) :oneOf :x-oneOf)]
+      {schema-key schema}))
 
   schema.core.Constrained
   (convert [e options]

src/ring/swagger/openapi3_schema.clj

@@ -50,13 +50,13 @@
    (opt :encoding) {s/Str Encoding}})
 
 (s/defschema Parameter
-  {(opt :query) s/Any
-   (opt :path) s/Any
-   (opt :header) s/Any})
+  {(opt :query)  {s/Any s/Any}
+   (opt :path)   {s/Any s/Any}
+   (opt :header) {s/Any s/Any}})
 
 (s/defschema RequestBody
   {(opt :description) s/Str
-   :content {s/Str MediaObject}
+   :content           {s/Str MediaObject}
    (opt :required) s/Bool})
 
 (s/defschema Link
@@ -91,7 +91,7 @@
    (opt :description) s/Str
    (opt :externalDocs) ExternalDocumentation
    (opt :operationId) s/Str
-   (opt :parameters) [Parameter]
+   (opt :parameters) Parameter
    (opt :requestBody) RequestBody
    (opt :responses) {ResponseCode Response}
    (opt :deprecated) s/Bool