From 1d72575e48e4c5fcde1c6b040cd8bfc5bec3077d Mon Sep 17 00:00:00 2001 From: Tommi Reiman Date: Sat, 11 May 2019 14:25:25 +0300 Subject: [PATCH] Update swagger-examples to have closed-spec validation --- examples/http-swagger/src/example/server.clj | 12 ++++++------ examples/pedestal-swagger/src/example/server.clj | 12 ++++++------ .../ring-spec-swagger/src/example/server.clj | 16 +++++++++++++--- examples/ring-swagger/src/example/server.clj | 14 +++++++++++--- 4 files changed, 36 insertions(+), 18 deletions(-) diff --git a/examples/http-swagger/src/example/server.clj b/examples/http-swagger/src/example/server.clj index bd20c1fa..af2920a0 100644 --- a/examples/http-swagger/src/example/server.clj +++ b/examples/http-swagger/src/example/server.clj @@ -1,18 +1,18 @@ (ns example.server (:require [reitit.ring :as ring] [reitit.http :as http] + [reitit.coercion.spec] [reitit.swagger :as swagger] [reitit.swagger-ui :as swagger-ui] [reitit.http.coercion :as coercion] - [reitit.coercion.spec :as spec-coercion] + [reitit.dev.pretty :as pretty] + [reitit.interceptor.sieppari :as sieppari] [reitit.http.interceptors.parameters :as parameters] [reitit.http.interceptors.muuntaja :as muuntaja] [reitit.http.interceptors.exception :as exception] [reitit.http.interceptors.multipart :as multipart] - [reitit.http.spec :as spec] [reitit.http.interceptors.dev :as dev] - [reitit.interceptor.sieppari :as sieppari] - [reitit.dev.pretty :as pretty] + [reitit.http.spec :as spec] [spec-tools.spell :as spell] [ring.adapter.jetty :as jetty] [aleph.http :as client] @@ -114,9 +114,9 @@ {;:reitit.interceptor/transform dev/print-context-diffs ;; pretty context diffs ;;:validate spec/validate ;; enable spec validation for route data - ;;:reitit.spec/wrap spell/closed ;; strict top-level validation (alpha) + ;;:reitit.spec/wrap spell/closed ;; strict top-level validation :exception pretty/exception - :data {:coercion spec-coercion/coercion + :data {:coercion reitit.coercion.spec/coercion :muuntaja m/instance :interceptors [;; swagger feature swagger/swagger-feature diff --git a/examples/pedestal-swagger/src/example/server.clj b/examples/pedestal-swagger/src/example/server.clj index c5f18623..c30f9d24 100644 --- a/examples/pedestal-swagger/src/example/server.clj +++ b/examples/pedestal-swagger/src/example/server.clj @@ -1,20 +1,20 @@ (ns example.server (:require [io.pedestal.http :as server] - [reitit.pedestal :as pedestal] [reitit.ring :as ring] [reitit.http :as http] + [reitit.coercion.spec] [reitit.swagger :as swagger] [reitit.swagger-ui :as swagger-ui] [reitit.http.coercion :as coercion] - [reitit.coercion.spec :as spec-coercion] [reitit.http.interceptors.parameters :as parameters] [reitit.http.interceptors.muuntaja :as muuntaja] [reitit.http.interceptors.exception :as exception] [reitit.http.interceptors.multipart :as multipart] [reitit.http.interceptors.dev :as dev] - [reitit.dev.pretty :as pretty] - [spec-tools.spell :as spell] [reitit.http.spec :as spec] + [spec-tools.spell :as spell] + [io.pedestal.http :as server] + [reitit.pedestal :as pedestal] [clojure.core.async :as a] [clojure.java.io :as io] [muuntaja.core :as m])) @@ -82,9 +82,9 @@ {;:reitit.interceptor/transform dev/print-context-diffs ;; pretty context diffs ;;:validate spec/validate ;; enable spec validation for route data - ;;:reitit.spec/wrap spell/closed ;; strict top-level validation (alpha) + ;;:reitit.spec/wrap spell/closed ;; strict top-level validation :exception pretty/exception - :data {:coercion spec-coercion/coercion + :data {:coercion reitit.coercion.spec/coercion :muuntaja m/instance :interceptors [;; swagger feature swagger/swagger-feature diff --git a/examples/ring-spec-swagger/src/example/server.clj b/examples/ring-spec-swagger/src/example/server.clj index 514cb8f8..eca70e2b 100644 --- a/examples/ring-spec-swagger/src/example/server.clj +++ b/examples/ring-spec-swagger/src/example/server.clj @@ -1,13 +1,17 @@ (ns example.server (:require [reitit.ring :as ring] + [reitit.coercion.spec] [reitit.swagger :as swagger] [reitit.swagger-ui :as swagger-ui] [reitit.ring.coercion :as coercion] - [reitit.coercion.spec] + [reitit.dev.pretty :as pretty] [reitit.ring.middleware.muuntaja :as muuntaja] [reitit.ring.middleware.exception :as exception] [reitit.ring.middleware.multipart :as multipart] [reitit.ring.middleware.parameters :as parameters] + [reitit.ring.middleware.dev :as dev] + [reitit.ring.spec :as spec] + [spec-tools.spell :as spell] [ring.adapter.jetty :as jetty] [muuntaja.core :as m] [clojure.spec.alpha :as s] @@ -72,9 +76,15 @@ {:status 200 :body {:total (+ x y)}})}}]]] - {:data {:coercion reitit.coercion.spec/coercion + {;;:reitit.middleware/transform dev/print-request-diffs ;; pretty diffs + ;;:validate spec/validate ;; enable spec validation for route data + ;;:reitit.spec/wrap spell/closed ;; strict top-level validation + :exception pretty/exception + :data {:coercion reitit.coercion.spec/coercion :muuntaja m/instance - :middleware [;; query-params & form-params + :middleware [;; swagger feature + swagger/swagger-feature + ;; query-params & form-params parameters/parameters-middleware ;; content-negotiation muuntaja/format-negotiate-middleware diff --git a/examples/ring-swagger/src/example/server.clj b/examples/ring-swagger/src/example/server.clj index 17628614..dd661ce7 100644 --- a/examples/ring-swagger/src/example/server.clj +++ b/examples/ring-swagger/src/example/server.clj @@ -1,14 +1,17 @@ (ns example.server (:require [reitit.ring :as ring] + [reitit.coercion.spec] [reitit.swagger :as swagger] [reitit.swagger-ui :as swagger-ui] [reitit.ring.coercion :as coercion] - [reitit.coercion.spec] + [reitit.dev.pretty :as pretty] [reitit.ring.middleware.muuntaja :as muuntaja] [reitit.ring.middleware.exception :as exception] [reitit.ring.middleware.multipart :as multipart] [reitit.ring.middleware.parameters :as parameters] [reitit.ring.middleware.dev :as dev] + [reitit.ring.spec :as spec] + [spec-tools.spell :as spell] [ring.adapter.jetty :as jetty] [muuntaja.core :as m] [clojure.java.io :as io])) @@ -61,10 +64,15 @@ {:status 200 :body {:total (+ x y)}})}}]]] - {;;:reitit.middleware/transform dev/print-request-diffs + {;;:reitit.middleware/transform dev/print-request-diffs ;; pretty diffs + ;;:validate spec/validate ;; enable spec validation for route data + ;;:reitit.spec/wrap spell/closed ;; strict top-level validation + :exception pretty/exception :data {:coercion reitit.coercion.spec/coercion :muuntaja m/instance - :middleware [;; query-params & form-params + :middleware [;; swagger feature + swagger/swagger-feature + ;; query-params & form-params parameters/parameters-middleware ;; content-negotiation muuntaja/format-negotiate-middleware