From 233ac19914971813f9ccddfff86e060559120e08 Mon Sep 17 00:00:00 2001 From: Joel Kaasinen Date: Mon, 28 Aug 2023 10:03:07 +0300 Subject: [PATCH] refactor: remove dead code --- modules/reitit-core/src/reitit/coercion.cljc | 2 +- .../src/reitit/coercion/schema.cljc | 37 +------------------ .../reitit-spec/src/reitit/coercion/spec.cljc | 37 +------------------ 3 files changed, 3 insertions(+), 73 deletions(-) diff --git a/modules/reitit-core/src/reitit/coercion.cljc b/modules/reitit-core/src/reitit/coercion.cljc index f037983c..694a529d 100644 --- a/modules/reitit-core/src/reitit/coercion.cljc +++ b/modules/reitit-core/src/reitit/coercion.cljc @@ -209,7 +209,7 @@ :path :path :multipart :formData}] (case specification - :openapi (-get-apidocs coercion specification data) + ;; :openapi handled in reitit.openapi :swagger (do (-warn-unsupported-coercions data) (->> (update diff --git a/modules/reitit-schema/src/reitit/coercion/schema.cljc b/modules/reitit-schema/src/reitit/coercion/schema.cljc index 24acf220..edd5f72e 100644 --- a/modules/reitit-schema/src/reitit/coercion/schema.cljc +++ b/modules/reitit-schema/src/reitit/coercion/schema.cljc @@ -68,42 +68,7 @@ (empty responses) (for [[k response] responses] [k (set/rename-keys response {:body :schema})]))}))) - :openapi (merge - (when (seq (dissoc parameters :body :request :multipart)) - (openapi/openapi-spec {::openapi/parameters (dissoc parameters :body :request)})) - (when (:body parameters) - {:requestBody (openapi/openapi-spec - {::openapi/content (zipmap content-types (repeat (:body parameters)))})}) - (when request - {:requestBody (openapi/openapi-spec - {::openapi/content (merge - (when-let [default (coercion/get-default-schema request)] - (zipmap content-types (repeat default))) - (->> (for [[content-type {:keys [schema]}] (:content request)] - [content-type schema]) - (into {})))})}) - (when (:multipart parameters) - {:requestBody - (openapi/openapi-spec - {::openapi/content {"multipart/form-data" (:multipart parameters)}})}) - (when responses - {:responses - (into - (empty responses) - (for [[k {:keys [content] :as response}] responses - :let [default (coercion/get-default-schema response)]] - [k (merge - (select-keys response [:description]) - (when (or content default) - (openapi/openapi-spec - {::openapi/content (-> (merge - (when default - (zipmap content-types (repeat default))) - (->> (for [[content-type {:keys [schema]}] content] - [content-type schema]) - (into {}))) - (dissoc :default))})))]))})) - + ;; :openapi handled in reitit.openapi/-get-apidocs-openapi (throw (ex-info (str "Can't produce Schema apidocs for " specification) diff --git a/modules/reitit-spec/src/reitit/coercion/spec.cljc b/modules/reitit-spec/src/reitit/coercion/spec.cljc index da5cfdd1..ba251675 100644 --- a/modules/reitit-spec/src/reitit/coercion/spec.cljc +++ b/modules/reitit-spec/src/reitit/coercion/spec.cljc @@ -109,42 +109,7 @@ (for [[k response] responses] [k (as-> response $ (set/rename-keys $ {:body :schema}))]))}))) - :openapi (merge - (when (seq (dissoc parameters :body :request :multipart)) - (openapi/openapi-spec {::openapi/parameters (dissoc parameters :body :request)})) - (when (:body parameters) - {:requestBody (openapi/openapi-spec - {::openapi/content (zipmap content-types (repeat (:body parameters)))})}) - (when request - {:requestBody (openapi/openapi-spec - {::openapi/content (merge - (when-let [default (coercion/get-default-schema request)] - (zipmap content-types (repeat default))) - (->> (for [[content-type {:keys [schema]}] (:content request)] - [content-type schema]) - (into {})))})}) - (when (:multipart parameters) - {:requestBody - (openapi/openapi-spec - {::openapi/content {"multipart/form-data" (:multipart parameters)}})}) - (when responses - {:responses - (into - (empty responses) - (for [[k {:keys [content] :as response}] responses - :let [default (coercion/get-default-schema response) - content-types (remove #{:default} content-types)]] - [k (merge - (select-keys response [:description]) - (when (or content default) - (openapi/openapi-spec - {::openapi/content (-> (merge - (when default - (zipmap content-types (repeat default))) - (->> (for [[content-type {:keys [schema]}] content] - [content-type schema]) - (into {}))) - (dissoc :default))})))]))})) + ;; :openapi handled in reitit.openapi/-get-apidocs-openapi (throw (ex-info (str "Can't produce Spec apidocs for " specification)