diff --git a/modules/reitit-openapi/src/reitit/openapi.cljc b/modules/reitit-openapi/src/reitit/openapi.cljc index 515fb6e3c..4a1b485b6 100644 --- a/modules/reitit-openapi/src/reitit/openapi.cljc +++ b/modules/reitit-openapi/src/reitit/openapi.cljc @@ -3,7 +3,6 @@ [clojure.spec.alpha :as s] [clojure.string :as str] [meta-merge.core :refer [meta-merge]] - [muuntaja.core :as m] [reitit.coercion :as coercion] [reitit.core :as r] [reitit.trie :as trie])) @@ -77,9 +76,9 @@ (-> path (trie/normalize opts) (str/replace #"\{\*" "{"))) (defn -get-apidocs-openapi - [coercion {:keys [request parameters responses openapi/request-content-types openapi/response-content-types muuntaja] - :or {request-content-types ["application/json"] - response-content-types ["application/json"]} :as r}] + [coercion {:keys [request parameters responses openapi/request-content-types openapi/response-content-types] + :or {request-content-types ["application/json"] + response-content-types ["application/json"]}}] (let [{:keys [body multipart]} parameters parameters (dissoc parameters :request :body :multipart) ->content (fn [data schema] @@ -87,16 +86,7 @@ {:schema schema} (select-keys data [:description :examples]) (:openapi data))) - ->schema-object #(coercion/-get-model-apidocs coercion :openapi %1 %2) - #_ request-content-types #_ (if (some? muuntaja) - (into [] (m/decodes muuntaja)) - ["application/json"]) - #_ response-content-types #_ (if (some? muuntaja) - (into [] (m/encodes muuntaja)) - ["application/json"]) - ] - #_ (tap> request) - #_ (tap> responses) + ->schema-object #(coercion/-get-model-apidocs coercion :openapi %1 %2)] (merge (when (seq parameters) {:parameters @@ -127,7 +117,6 @@ {:content (merge (select-keys request [:description]) (when-let [{:keys [schema] :as data} (coercion/get-default request)] - (tap> data) (into {} (map (fn [content-type] (let [schema (->schema-object schema {:in :requestBody @@ -141,7 +130,7 @@ :type :schema :content-type content-type})] [content-type (->content data schema)]))) - (:content request)))}}) + (dissoc (:content request) :default)))}}) (when multipart {:requestBody {:content