From f3dee769fb309fe32b0f5cd9c4a11807608f7fe8 Mon Sep 17 00:00:00 2001 From: Tommi Reiman Date: Mon, 14 Feb 2022 16:59:20 +0200 Subject: [PATCH] format-ns --- .lsp/config.edn | 3 +- modules/reitit-core/src/reitit/coercion.cljc | 8 ++---- modules/reitit-core/src/reitit/core.cljc | 7 ++--- .../reitit-core/src/reitit/dependency.cljc | 3 +- modules/reitit-core/src/reitit/exception.cljc | 3 +- modules/reitit-core/src/reitit/impl.cljc | 16 +++++------ .../reitit-core/src/reitit/interceptor.cljc | 11 ++++---- .../reitit-core/src/reitit/middleware.cljc | 11 ++++---- modules/reitit-core/src/reitit/spec.cljc | 9 +++--- modules/reitit-core/src/reitit/trie.cljc | 10 +++---- modules/reitit-dev/src/reitit/dev/pretty.cljc | 25 ++++++++--------- .../reitit-frontend/src/reitit/frontend.cljs | 12 ++++---- .../src/reitit/frontend/easy.cljs | 3 +- .../src/reitit/frontend/history.cljs | 10 +++---- modules/reitit-http/src/reitit/http.cljc | 11 ++++---- .../reitit-http/src/reitit/http/coercion.cljc | 7 ++--- modules/reitit-http/src/reitit/http/spec.cljc | 11 ++++---- .../src/reitit/http/interceptors/dev.clj | 9 +++--- .../reitit/http/interceptors/exception.clj | 14 ++++------ .../reitit/http/interceptors/multipart.clj | 14 ++++------ .../src/reitit/http/interceptors/muuntaja.clj | 7 ++--- .../reitit/http/interceptors/parameters.clj | 3 +- .../src/reitit/coercion/malli.cljc | 21 +++++++------- .../reitit-malli/src/reitit/ring/malli.cljc | 3 +- .../src/reitit/ring/middleware/dev.clj | 9 +++--- .../src/reitit/ring/middleware/exception.clj | 14 ++++------ .../src/reitit/ring/middleware/multipart.clj | 12 ++++---- .../src/reitit/ring/middleware/muuntaja.clj | 7 ++--- .../src/reitit/ring/middleware/parameters.clj | 3 +- .../reitit-pedestal/src/reitit/pedestal.clj | 16 +++++------ modules/reitit-ring/src/reitit/ring.cljc | 15 +++++----- .../reitit-ring/src/reitit/ring/coercion.cljc | 7 ++--- modules/reitit-ring/src/reitit/ring/spec.cljc | 9 +++--- .../src/reitit/coercion/schema.cljc | 19 ++++++------- .../reitit-schema/src/reitit/ring/schema.cljc | 8 ++---- .../src/reitit/interceptor/sieppari.clj | 7 ++--- .../reitit-spec/src/reitit/coercion/spec.cljc | 18 ++++++------ .../src/reitit/swagger_ui.cljc | 5 ++-- .../reitit-swagger/src/reitit/swagger.cljc | 15 +++++----- test/clj/cljdoc/reaper.clj | 7 ++--- .../http/interceptors/exception_test.clj | 20 ++++++------- .../http/interceptors/muuntaja_test.clj | 13 ++++----- .../http/interceptors/parameters_test.clj | 11 ++++---- test/clj/reitit/http_coercion_test.clj | 28 +++++++++---------- test/clj/reitit/http_test.clj | 20 ++++++------- test/clj/reitit/pedestal_test.clj | 13 ++++----- .../reitit/ring/middleware/exception_test.clj | 22 +++++++-------- .../reitit/ring/middleware/muuntaja_test.clj | 11 ++++---- .../ring/middleware/parameters_test.clj | 9 +++--- test/cljc/reitit/coercion_test.cljc | 22 +++++++-------- test/cljc/reitit/core_test.cljc | 12 ++++---- test/cljc/reitit/dependency_test.cljc | 8 ++---- test/cljc/reitit/exception_test.cljc | 16 +++++------ test/cljc/reitit/impl_test.cljc | 5 ++-- test/cljc/reitit/interceptor_test.cljc | 10 +++---- test/cljc/reitit/middleware_test.cljc | 10 +++---- test/cljc/reitit/ring_coercion_test.cljc | 28 +++++++++---------- test/cljc/reitit/ring_spec_test.cljc | 18 ++++++------ test/cljc/reitit/ring_test.cljc | 16 +++++------ test/cljc/reitit/spec_test.cljc | 14 ++++------ test/cljc/reitit/swagger_test.clj | 23 ++++++++------- test/cljc/reitit/trie_test.cljc | 5 ++-- 62 files changed, 325 insertions(+), 411 deletions(-) diff --git a/.lsp/config.edn b/.lsp/config.edn index bfbe9181..577a7c9c 100644 --- a/.lsp/config.edn +++ b/.lsp/config.edn @@ -1,2 +1,3 @@ {:cljfmt {:indents {for-all [[:inner 0]] - are [[:inner 0]]}}} \ No newline at end of file + are [[:inner 0]]}} + :clean {:ns-inner-blocks-indentation :same-line}} \ No newline at end of file diff --git a/modules/reitit-core/src/reitit/coercion.cljc b/modules/reitit-core/src/reitit/coercion.cljc index 6cbd6627..0fd5d234 100644 --- a/modules/reitit-core/src/reitit/coercion.cljc +++ b/modules/reitit-core/src/reitit/coercion.cljc @@ -1,10 +1,8 @@ (ns reitit.coercion - (:require - [clojure.walk :as walk] - [reitit.impl :as impl]) + (:require [clojure.walk :as walk] + [reitit.impl :as impl]) #?(:clj - (:import - (java.io Writer)))) + (:import (java.io Writer)))) ;; ;; Protocol diff --git a/modules/reitit-core/src/reitit/core.cljc b/modules/reitit-core/src/reitit/core.cljc index 8457130f..c6776db4 100644 --- a/modules/reitit-core/src/reitit/core.cljc +++ b/modules/reitit-core/src/reitit/core.cljc @@ -1,8 +1,7 @@ (ns reitit.core - (:require - [reitit.exception :as exception] - [reitit.impl :as impl] - [reitit.trie :as trie])) + (:require [reitit.exception :as exception] + [reitit.impl :as impl] + [reitit.trie :as trie])) ;; ;; Expand diff --git a/modules/reitit-core/src/reitit/dependency.cljc b/modules/reitit-core/src/reitit/dependency.cljc index fc31f13a..6f1209eb 100644 --- a/modules/reitit-core/src/reitit/dependency.cljc +++ b/modules/reitit-core/src/reitit/dependency.cljc @@ -1,7 +1,6 @@ (ns reitit.dependency "Dependency resolution for middleware/interceptors." - (:require - [reitit.exception :as exception])) + (:require [reitit.exception :as exception])) (defn- providers "Map from provision key to provider. `get-provides` should return the provision keys of a dependent." diff --git a/modules/reitit-core/src/reitit/exception.cljc b/modules/reitit-core/src/reitit/exception.cljc index 0465551f..df61b66a 100644 --- a/modules/reitit-core/src/reitit/exception.cljc +++ b/modules/reitit-core/src/reitit/exception.cljc @@ -1,6 +1,5 @@ (ns reitit.exception - (:require - [clojure.string :as str])) + (:require [clojure.string :as str])) (defn fail! ([type] diff --git a/modules/reitit-core/src/reitit/impl.cljc b/modules/reitit-core/src/reitit/impl.cljc index d59ebf0a..03c55e72 100644 --- a/modules/reitit-core/src/reitit/impl.cljc +++ b/modules/reitit-core/src/reitit/impl.cljc @@ -1,15 +1,13 @@ (ns ^:no-doc reitit.impl #?(:cljs (:require-macros [reitit.impl])) - (:require - [clojure.set :as set] - [clojure.string :as str] - [meta-merge.core :as mm] - [reitit.exception :as ex] - [reitit.trie :as trie]) + (:require [clojure.set :as set] + [clojure.string :as str] + [meta-merge.core :as mm] + [reitit.exception :as ex] + [reitit.trie :as trie]) #?(:clj - (:import - (java.net URLEncoder URLDecoder) - (java.util HashMap Map)))) + (:import (java.net URLEncoder URLDecoder) + (java.util HashMap Map)))) (defn parse [path opts] (let [path #?(:clj (.intern ^String (trie/normalize path opts)) :cljs (trie/normalize path opts)) diff --git a/modules/reitit-core/src/reitit/interceptor.cljc b/modules/reitit-core/src/reitit/interceptor.cljc index 7c34ab3b..8d90c2e4 100644 --- a/modules/reitit-core/src/reitit/interceptor.cljc +++ b/modules/reitit-core/src/reitit/interceptor.cljc @@ -1,10 +1,9 @@ (ns reitit.interceptor - (:require - [clojure.pprint :as pprint] - [meta-merge.core :refer [meta-merge]] - [reitit.core :as r] - [reitit.exception :as exception] - [reitit.impl :as impl])) + (:require [clojure.pprint :as pprint] + [meta-merge.core :refer [meta-merge]] + [reitit.core :as r] + [reitit.exception :as exception] + [reitit.impl :as impl])) (defprotocol IntoInterceptor (into-interceptor [this data opts])) diff --git a/modules/reitit-core/src/reitit/middleware.cljc b/modules/reitit-core/src/reitit/middleware.cljc index 53df1b14..49381b68 100644 --- a/modules/reitit-core/src/reitit/middleware.cljc +++ b/modules/reitit-core/src/reitit/middleware.cljc @@ -1,10 +1,9 @@ (ns reitit.middleware - (:require - [clojure.pprint :as pprint] - [meta-merge.core :refer [meta-merge]] - [reitit.core :as r] - [reitit.exception :as exception] - [reitit.impl :as impl])) + (:require [clojure.pprint :as pprint] + [meta-merge.core :refer [meta-merge]] + [reitit.core :as r] + [reitit.exception :as exception] + [reitit.impl :as impl])) (defprotocol IntoMiddleware (into-middleware [this data opts])) diff --git a/modules/reitit-core/src/reitit/spec.cljc b/modules/reitit-core/src/reitit/spec.cljc index 7a11a4ed..a3fa0290 100644 --- a/modules/reitit-core/src/reitit/spec.cljc +++ b/modules/reitit-core/src/reitit/spec.cljc @@ -1,9 +1,8 @@ (ns reitit.spec - (:require - [clojure.spec.alpha :as s] - [clojure.spec.gen.alpha :as gen] - [reitit.core :as r] - [reitit.exception :as exception])) + (:require [clojure.spec.alpha :as s] + [clojure.spec.gen.alpha :as gen] + [reitit.core :as r] + [reitit.exception :as exception])) ;; ;; routes diff --git a/modules/reitit-core/src/reitit/trie.cljc b/modules/reitit-core/src/reitit/trie.cljc index 8ea30bf7..cda97066 100644 --- a/modules/reitit-core/src/reitit/trie.cljc +++ b/modules/reitit-core/src/reitit/trie.cljc @@ -1,11 +1,9 @@ (ns reitit.trie (:refer-clojure :exclude [compile]) - (:require - [clojure.string :as str] - [reitit.exception :as ex]) - #?(:clj (:import - (java.net URLDecoder) - [reitit Trie Trie$Match Trie$Matcher]))) + (:require [clojure.string :as str] + [reitit.exception :as ex]) + #?(:clj (:import (java.net URLDecoder) + [reitit Trie Trie$Match Trie$Matcher]))) (defn ^:no-doc into-set [x] (cond diff --git a/modules/reitit-dev/src/reitit/dev/pretty.cljc b/modules/reitit-dev/src/reitit/dev/pretty.cljc index 4c8a5433..158d09e0 100644 --- a/modules/reitit-dev/src/reitit/dev/pretty.cljc +++ b/modules/reitit-dev/src/reitit/dev/pretty.cljc @@ -1,17 +1,16 @@ (ns reitit.dev.pretty - (:require - [arrangement.core] ;; spell-spec - [clojure.spec.alpha :as s] - [clojure.string :as str] - [expound.alpha] ;; fipp - [expound.ansi] - [fipp.edn] - [fipp.ednize] - [fipp.engine] - [fipp.visit] - [reitit.exception :as exception] - [spell-spec.expound] ;; expound - )) + (:require [arrangement.core] ;; spell-spec + [clojure.spec.alpha :as s] + [clojure.string :as str] + [expound.alpha] ;; fipp + [expound.ansi] + [fipp.edn] + [fipp.ednize] + [fipp.engine] + [fipp.visit] + [reitit.exception :as exception] + [spell-spec.expound] ;; expound +)) ;; ;; colors diff --git a/modules/reitit-frontend/src/reitit/frontend.cljs b/modules/reitit-frontend/src/reitit/frontend.cljs index 27a66a90..60273f79 100644 --- a/modules/reitit-frontend/src/reitit/frontend.cljs +++ b/modules/reitit-frontend/src/reitit/frontend.cljs @@ -1,11 +1,9 @@ (ns reitit.frontend - (:require - [clojure.set :as set] - [reitit.coercion :as coercion] - [reitit.core :as r]) - (:import - goog.Uri - goog.Uri.QueryData)) + (:require [clojure.set :as set] + [reitit.coercion :as coercion] + [reitit.core :as r]) + (:import goog.Uri + goog.Uri.QueryData)) (defn- query-param [^QueryData q k] (let [vs (.getValues q k)] diff --git a/modules/reitit-frontend/src/reitit/frontend/easy.cljs b/modules/reitit-frontend/src/reitit/frontend/easy.cljs index d35ef40f..8a76b900 100644 --- a/modules/reitit-frontend/src/reitit/frontend/easy.cljs +++ b/modules/reitit-frontend/src/reitit/frontend/easy.cljs @@ -2,8 +2,7 @@ "Easy wrapper over reitit.frontend.history, handling the state. Only one router can be active at a time." - (:require - [reitit.frontend.history :as rfh])) + (:require [reitit.frontend.history :as rfh])) (defonce history (atom nil)) diff --git a/modules/reitit-frontend/src/reitit/frontend/history.cljs b/modules/reitit-frontend/src/reitit/frontend/history.cljs index 74337ec7..600feaec 100644 --- a/modules/reitit-frontend/src/reitit/frontend/history.cljs +++ b/modules/reitit-frontend/src/reitit/frontend/history.cljs @@ -1,12 +1,10 @@ (ns reitit.frontend.history "Provides integration to hash-change or HTML5 History events." - (:require - [goog.events :as gevents] - [reitit.core :as reitit] - [reitit.frontend :as rf]) - (:import - goog.Uri)) + (:require [goog.events :as gevents] + [reitit.core :as reitit] + [reitit.frontend :as rf]) + (:import goog.Uri)) (defprotocol History (-init [this] "Create event listeners") diff --git a/modules/reitit-http/src/reitit/http.cljc b/modules/reitit-http/src/reitit/http.cljc index 5366b701..c85817f8 100644 --- a/modules/reitit-http/src/reitit/http.cljc +++ b/modules/reitit-http/src/reitit/http.cljc @@ -1,10 +1,9 @@ (ns reitit.http - (:require - [meta-merge.core :refer [meta-merge]] - [reitit.core :as r] - [reitit.exception :as ex] - [reitit.interceptor :as interceptor] - [reitit.ring :as ring])) + (:require [meta-merge.core :refer [meta-merge]] + [reitit.core :as r] + [reitit.exception :as ex] + [reitit.interceptor :as interceptor] + [reitit.ring :as ring])) (defrecord Endpoint [data interceptors queue handler path method]) diff --git a/modules/reitit-http/src/reitit/http/coercion.cljc b/modules/reitit-http/src/reitit/http/coercion.cljc index d2075045..8e63db28 100644 --- a/modules/reitit-http/src/reitit/http/coercion.cljc +++ b/modules/reitit-http/src/reitit/http/coercion.cljc @@ -1,8 +1,7 @@ (ns reitit.http.coercion - (:require - [reitit.coercion :as coercion] - [reitit.impl :as impl] - [reitit.spec :as rs])) + (:require [reitit.coercion :as coercion] + [reitit.impl :as impl] + [reitit.spec :as rs])) (defn coerce-request-interceptor "Interceptor for pluggable request coercion. diff --git a/modules/reitit-http/src/reitit/http/spec.cljc b/modules/reitit-http/src/reitit/http/spec.cljc index 3ee5f819..f6112c5a 100644 --- a/modules/reitit-http/src/reitit/http/spec.cljc +++ b/modules/reitit-http/src/reitit/http/spec.cljc @@ -1,10 +1,9 @@ (ns reitit.http.spec - (:require - [clojure.spec.alpha :as s] - [reitit.exception :as exception] - [reitit.interceptor :as interceptor] - [reitit.ring.spec :as rrs] - [reitit.spec :as rs])) + (:require [clojure.spec.alpha :as s] + [reitit.exception :as exception] + [reitit.interceptor :as interceptor] + [reitit.ring.spec :as rrs] + [reitit.spec :as rs])) ;; ;; Specs diff --git a/modules/reitit-interceptors/src/reitit/http/interceptors/dev.clj b/modules/reitit-interceptors/src/reitit/http/interceptors/dev.clj index f36c8298..896f99fc 100644 --- a/modules/reitit-interceptors/src/reitit/http/interceptors/dev.clj +++ b/modules/reitit-interceptors/src/reitit/http/interceptors/dev.clj @@ -1,9 +1,8 @@ (ns reitit.http.interceptors.dev - (:require - [lambdaisland.deep-diff :as ddiff] - [lambdaisland.deep-diff.printer :as printer] - [puget.color :as color] - [reitit.core :as r])) + (:require [lambdaisland.deep-diff :as ddiff] + [lambdaisland.deep-diff.printer :as printer] + [puget.color :as color] + [reitit.core :as r])) (def printer (-> (printer/puget-printer) diff --git a/modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj b/modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj index c2e2efbe..559a55b3 100644 --- a/modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj +++ b/modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj @@ -1,12 +1,10 @@ (ns reitit.http.interceptors.exception - (:require - [clojure.spec.alpha :as s] - [clojure.string :as str] - [reitit.coercion :as coercion] - [reitit.ring :as ring]) - (:import - (java.io PrintWriter Writer) - (java.time Instant))) + (:require [clojure.spec.alpha :as s] + [clojure.string :as str] + [reitit.coercion :as coercion] + [reitit.ring :as ring]) + (:import (java.io PrintWriter Writer) + (java.time Instant))) (s/def ::handlers (s/map-of any? fn?)) (s/def ::spec (s/keys :opt-un [::handlers])) diff --git a/modules/reitit-interceptors/src/reitit/http/interceptors/multipart.clj b/modules/reitit-interceptors/src/reitit/http/interceptors/multipart.clj index 5c38a8d2..d616c689 100644 --- a/modules/reitit-interceptors/src/reitit/http/interceptors/multipart.clj +++ b/modules/reitit-interceptors/src/reitit/http/interceptors/multipart.clj @@ -1,12 +1,10 @@ (ns reitit.http.interceptors.multipart - (:require - [clojure.spec.alpha :as s] - [reitit.coercion :as coercion] - [reitit.spec] - [ring.middleware.multipart-params :as multipart-params] - [spec-tools.core :as st]) - (:import - (java.io File))) + (:require [clojure.spec.alpha :as s] + [reitit.coercion :as coercion] + [reitit.spec] + [ring.middleware.multipart-params :as multipart-params] + [spec-tools.core :as st]) + (:import (java.io File))) (s/def ::filename string?) (s/def ::content-type string?) diff --git a/modules/reitit-interceptors/src/reitit/http/interceptors/muuntaja.clj b/modules/reitit-interceptors/src/reitit/http/interceptors/muuntaja.clj index 7ddda390..3dbf7285 100644 --- a/modules/reitit-interceptors/src/reitit/http/interceptors/muuntaja.clj +++ b/modules/reitit-interceptors/src/reitit/http/interceptors/muuntaja.clj @@ -1,8 +1,7 @@ (ns reitit.http.interceptors.muuntaja - (:require - [clojure.spec.alpha :as s] - [muuntaja.core :as m] - [muuntaja.interceptor])) + (:require [clojure.spec.alpha :as s] + [muuntaja.core :as m] + [muuntaja.interceptor])) (s/def ::muuntaja m/muuntaja?) (s/def ::spec (s/keys :opt-un [::muuntaja])) diff --git a/modules/reitit-interceptors/src/reitit/http/interceptors/parameters.clj b/modules/reitit-interceptors/src/reitit/http/interceptors/parameters.clj index 91a7c98b..5731744e 100644 --- a/modules/reitit-interceptors/src/reitit/http/interceptors/parameters.clj +++ b/modules/reitit-interceptors/src/reitit/http/interceptors/parameters.clj @@ -1,6 +1,5 @@ (ns reitit.http.interceptors.parameters - (:require - [ring.middleware.params :as params])) + (:require [ring.middleware.params :as params])) (defn parameters-interceptor "Interceptor to parse urlencoded parameters from the query string and form diff --git a/modules/reitit-malli/src/reitit/coercion/malli.cljc b/modules/reitit-malli/src/reitit/coercion/malli.cljc index 4f1614a8..a57d2641 100644 --- a/modules/reitit-malli/src/reitit/coercion/malli.cljc +++ b/modules/reitit-malli/src/reitit/coercion/malli.cljc @@ -1,15 +1,14 @@ (ns reitit.coercion.malli - (:require - [clojure.set :as set] - [clojure.walk :as walk] - [malli.core :as m] - [malli.edn :as edn] - [malli.error :as me] - [malli.experimental.lite :as l] - [malli.swagger :as swagger] - [malli.transform :as mt] - [malli.util :as mu] - [reitit.coercion :as coercion])) + (:require [clojure.set :as set] + [clojure.walk :as walk] + [malli.core :as m] + [malli.edn :as edn] + [malli.error :as me] + [malli.experimental.lite :as l] + [malli.swagger :as swagger] + [malli.transform :as mt] + [malli.util :as mu] + [reitit.coercion :as coercion])) ;; ;; coercion diff --git a/modules/reitit-malli/src/reitit/ring/malli.cljc b/modules/reitit-malli/src/reitit/ring/malli.cljc index dfd5ea8e..a7987625 100644 --- a/modules/reitit-malli/src/reitit/ring/malli.cljc +++ b/modules/reitit-malli/src/reitit/ring/malli.cljc @@ -1,6 +1,5 @@ (ns reitit.ring.malli - #?(:clj (:import - (java.io File)))) + #?(:clj (:import (java.io File)))) #?(:clj (def temp-file-part diff --git a/modules/reitit-middleware/src/reitit/ring/middleware/dev.clj b/modules/reitit-middleware/src/reitit/ring/middleware/dev.clj index 907cd680..587416ff 100644 --- a/modules/reitit-middleware/src/reitit/ring/middleware/dev.clj +++ b/modules/reitit-middleware/src/reitit/ring/middleware/dev.clj @@ -1,9 +1,8 @@ (ns reitit.ring.middleware.dev - (:require - [lambdaisland.deep-diff :as ddiff] - [lambdaisland.deep-diff.printer :as printer] - [puget.color :as color] - [reitit.core :as r])) + (:require [lambdaisland.deep-diff :as ddiff] + [lambdaisland.deep-diff.printer :as printer] + [puget.color :as color] + [reitit.core :as r])) (def printer (-> (printer/puget-printer) diff --git a/modules/reitit-middleware/src/reitit/ring/middleware/exception.clj b/modules/reitit-middleware/src/reitit/ring/middleware/exception.clj index 89e99e20..7aa0db92 100644 --- a/modules/reitit-middleware/src/reitit/ring/middleware/exception.clj +++ b/modules/reitit-middleware/src/reitit/ring/middleware/exception.clj @@ -1,12 +1,10 @@ (ns reitit.ring.middleware.exception - (:require - [clojure.spec.alpha :as s] - [clojure.string :as str] - [reitit.coercion :as coercion] - [reitit.ring :as ring]) - (:import - (java.io Writer PrintWriter) - (java.time Instant))) + (:require [clojure.spec.alpha :as s] + [clojure.string :as str] + [reitit.coercion :as coercion] + [reitit.ring :as ring]) + (:import (java.io Writer PrintWriter) + (java.time Instant))) (s/def ::handlers (s/map-of any? fn?)) (s/def ::spec (s/keys :opt-un [::handlers])) diff --git a/modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj b/modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj index 8f353cae..2542b0a3 100644 --- a/modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj +++ b/modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj @@ -1,12 +1,10 @@ (ns reitit.ring.middleware.multipart (:refer-clojure :exclude [compile]) - (:require - [clojure.spec.alpha :as s] - [reitit.coercion :as coercion] - [ring.middleware.multipart-params :as multipart-params] - [spec-tools.core :as st]) - (:import - (java.io File))) + (:require [clojure.spec.alpha :as s] + [reitit.coercion :as coercion] + [ring.middleware.multipart-params :as multipart-params] + [spec-tools.core :as st]) + (:import (java.io File))) (s/def ::filename string?) (s/def ::content-type string?) diff --git a/modules/reitit-middleware/src/reitit/ring/middleware/muuntaja.clj b/modules/reitit-middleware/src/reitit/ring/middleware/muuntaja.clj index 9b1f1f34..06d0b0b8 100644 --- a/modules/reitit-middleware/src/reitit/ring/middleware/muuntaja.clj +++ b/modules/reitit-middleware/src/reitit/ring/middleware/muuntaja.clj @@ -1,8 +1,7 @@ (ns reitit.ring.middleware.muuntaja - (:require - [clojure.spec.alpha :as s] - [muuntaja.core :as m] - [muuntaja.middleware])) + (:require [clojure.spec.alpha :as s] + [muuntaja.core :as m] + [muuntaja.middleware])) (s/def ::muuntaja m/muuntaja?) (s/def ::spec (s/keys :opt-un [::muuntaja])) diff --git a/modules/reitit-middleware/src/reitit/ring/middleware/parameters.clj b/modules/reitit-middleware/src/reitit/ring/middleware/parameters.clj index e93b8a09..ec0a334b 100644 --- a/modules/reitit-middleware/src/reitit/ring/middleware/parameters.clj +++ b/modules/reitit-middleware/src/reitit/ring/middleware/parameters.clj @@ -1,6 +1,5 @@ (ns reitit.ring.middleware.parameters - (:require - [ring.middleware.params :as params])) + (:require [ring.middleware.params :as params])) (def parameters-middleware "Middleware to parse urlencoded parameters from the query string and form diff --git a/modules/reitit-pedestal/src/reitit/pedestal.clj b/modules/reitit-pedestal/src/reitit/pedestal.clj index 5c33546d..04c262f8 100644 --- a/modules/reitit-pedestal/src/reitit/pedestal.clj +++ b/modules/reitit-pedestal/src/reitit/pedestal.clj @@ -1,13 +1,11 @@ (ns reitit.pedestal - (:require - [io.pedestal.http :as http] - [io.pedestal.interceptor :as interceptor] - [io.pedestal.interceptor.chain :as chain] - [reitit.http] - [reitit.interceptor]) - (:import - (java.lang.reflect Method) - (reitit.interceptor Executor))) + (:require [io.pedestal.http :as http] + [io.pedestal.interceptor :as interceptor] + [io.pedestal.interceptor.chain :as chain] + [reitit.http] + [reitit.interceptor]) + (:import (java.lang.reflect Method) + (reitit.interceptor Executor))) ;; TODO: variadic (defn- arities [f] diff --git a/modules/reitit-ring/src/reitit/ring.cljc b/modules/reitit-ring/src/reitit/ring.cljc index 1c06c6a6..4aceaaf1 100644 --- a/modules/reitit-ring/src/reitit/ring.cljc +++ b/modules/reitit-ring/src/reitit/ring.cljc @@ -1,13 +1,12 @@ (ns reitit.ring - (:require - [clojure.string :as str] - [meta-merge.core :refer [meta-merge]] - #?@(:clj [[ring.util.mime-type :as mime-type] + (:require [clojure.string :as str] + [meta-merge.core :refer [meta-merge]] + #?@(:clj [[ring.util.mime-type :as mime-type] [ring.util.response :as response]]) - [reitit.core :as r] - [reitit.exception :as ex] - [reitit.impl :as impl] - [reitit.middleware :as middleware])) + [reitit.core :as r] + [reitit.exception :as ex] + [reitit.impl :as impl] + [reitit.middleware :as middleware])) (declare get-match) (declare get-router) diff --git a/modules/reitit-ring/src/reitit/ring/coercion.cljc b/modules/reitit-ring/src/reitit/ring/coercion.cljc index 6262f4f9..efbe83f7 100644 --- a/modules/reitit-ring/src/reitit/ring/coercion.cljc +++ b/modules/reitit-ring/src/reitit/ring/coercion.cljc @@ -1,8 +1,7 @@ (ns reitit.ring.coercion - (:require - [reitit.coercion :as coercion] - [reitit.impl :as impl] - [reitit.spec :as rs])) + (:require [reitit.coercion :as coercion] + [reitit.impl :as impl] + [reitit.spec :as rs])) (defn handle-coercion-exception [e respond raise] (let [data (ex-data e)] diff --git a/modules/reitit-ring/src/reitit/ring/spec.cljc b/modules/reitit-ring/src/reitit/ring/spec.cljc index 63d98119..9d68e8ed 100644 --- a/modules/reitit-ring/src/reitit/ring/spec.cljc +++ b/modules/reitit-ring/src/reitit/ring/spec.cljc @@ -1,9 +1,8 @@ (ns reitit.ring.spec - (:require - [clojure.spec.alpha :as s] - [reitit.exception :as exception] - [reitit.middleware :as middleware] - [reitit.spec :as rs])) + (:require [clojure.spec.alpha :as s] + [reitit.exception :as exception] + [reitit.middleware :as middleware] + [reitit.spec :as rs])) ;; ;; Specs diff --git a/modules/reitit-schema/src/reitit/coercion/schema.cljc b/modules/reitit-schema/src/reitit/coercion/schema.cljc index 6ec9e60b..022f3872 100644 --- a/modules/reitit-schema/src/reitit/coercion/schema.cljc +++ b/modules/reitit-schema/src/reitit/coercion/schema.cljc @@ -1,14 +1,13 @@ (ns reitit.coercion.schema - (:require - [clojure.set :as set] - [clojure.walk :as walk] - [reitit.coercion :as coercion] - [schema-tools.coerce :as stc] - [schema-tools.core :as st] - [schema-tools.swagger.core :as swagger] - [schema.coerce :as sc] - [schema.core :as s] - [schema.utils :as su])) + (:require [clojure.set :as set] + [clojure.walk :as walk] + [reitit.coercion :as coercion] + [schema-tools.coerce :as stc] + [schema-tools.core :as st] + [schema-tools.swagger.core :as swagger] + [schema.coerce :as sc] + [schema.core :as s] + [schema.utils :as su])) (def string-coercion-matcher stc/string-coercion-matcher) diff --git a/modules/reitit-schema/src/reitit/ring/schema.cljc b/modules/reitit-schema/src/reitit/ring/schema.cljc index 96829af3..934948d8 100644 --- a/modules/reitit-schema/src/reitit/ring/schema.cljc +++ b/modules/reitit-schema/src/reitit/ring/schema.cljc @@ -1,9 +1,7 @@ (ns reitit.ring.schema - (:require - [schema-tools.swagger.core :as swagger] - [schema.core :as s]) - #?(:clj (:import - (java.io File)))) + (:require [schema-tools.swagger.core :as swagger] + [schema.core :as s]) + #?(:clj (:import (java.io File)))) (defrecord Upload [m] s/Schema diff --git a/modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj b/modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj index 336a9cfa..1fa4e242 100644 --- a/modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj +++ b/modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj @@ -1,8 +1,7 @@ (ns reitit.interceptor.sieppari - (:require - [reitit.interceptor :as interceptor] - [sieppari.core :as sieppari] - [sieppari.queue :as queue])) + (:require [reitit.interceptor :as interceptor] + [sieppari.core :as sieppari] + [sieppari.queue :as queue])) (def executor (reify diff --git a/modules/reitit-spec/src/reitit/coercion/spec.cljc b/modules/reitit-spec/src/reitit/coercion/spec.cljc index 12c88310..5f9809a7 100644 --- a/modules/reitit-spec/src/reitit/coercion/spec.cljc +++ b/modules/reitit-spec/src/reitit/coercion/spec.cljc @@ -1,15 +1,13 @@ (ns reitit.coercion.spec - (:require - [clojure.set :as set] - [clojure.spec.alpha :as s] - [reitit.coercion :as coercion] - [spec-tools.core :as st #?@(:cljs [:refer [Spec]])] - [spec-tools.data-spec :as ds #?@(:cljs [:refer [Maybe]])] - [spec-tools.swagger.core :as swagger]) + (:require [clojure.set :as set] + [clojure.spec.alpha :as s] + [reitit.coercion :as coercion] + [spec-tools.core :as st #?@(:cljs [:refer [Spec]])] + [spec-tools.data-spec :as ds #?@(:cljs [:refer [Maybe]])] + [spec-tools.swagger.core :as swagger]) #?(:clj - (:import - (spec_tools.core Spec) - (spec_tools.data_spec Maybe)))) + (:import (spec_tools.core Spec) + (spec_tools.data_spec Maybe)))) (def string-transformer (st/type-transformer diff --git a/modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc b/modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc index 60d3d2af..1c10ea27 100644 --- a/modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc +++ b/modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc @@ -1,7 +1,6 @@ (ns reitit.swagger-ui - #?(:clj (:require - [jsonista.core :as j] - [reitit.ring :as ring]))) + #?(:clj (:require [jsonista.core :as j] + [reitit.ring :as ring]))) #?(:clj (defn create-swagger-ui-handler diff --git a/modules/reitit-swagger/src/reitit/swagger.cljc b/modules/reitit-swagger/src/reitit/swagger.cljc index 951d3b80..2c71a6d3 100644 --- a/modules/reitit-swagger/src/reitit/swagger.cljc +++ b/modules/reitit-swagger/src/reitit/swagger.cljc @@ -1,12 +1,11 @@ (ns reitit.swagger - (:require - [clojure.set :as set] - [clojure.spec.alpha :as s] - [clojure.string :as str] - [meta-merge.core :refer [meta-merge]] - [reitit.coercion :as coercion] - [reitit.core :as r] - [reitit.trie :as trie])) + (:require [clojure.set :as set] + [clojure.spec.alpha :as s] + [clojure.string :as str] + [meta-merge.core :refer [meta-merge]] + [reitit.coercion :as coercion] + [reitit.core :as r] + [reitit.trie :as trie])) (s/def ::id (s/or :keyword keyword? :set (s/coll-of keyword? :into #{}))) (s/def ::no-doc boolean?) diff --git a/test/clj/cljdoc/reaper.clj b/test/clj/cljdoc/reaper.clj index 58887b83..bce3e68c 100644 --- a/test/clj/cljdoc/reaper.clj +++ b/test/clj/cljdoc/reaper.clj @@ -1,8 +1,7 @@ (ns cljdoc.reaper - (:require - [clojure.java.io :as io] - [clojure.pprint :as pprint] - [clojure.string :as str])) + (:require [clojure.java.io :as io] + [clojure.pprint :as pprint] + [clojure.string :as str])) (defn reap! [] (let [docs (->> (for [line (-> (io/file "./doc/SUMMARY.md") (slurp) (str/split #"\n")) diff --git a/test/clj/reitit/http/interceptors/exception_test.clj b/test/clj/reitit/http/interceptors/exception_test.clj index 275ffd6f..15a53197 100644 --- a/test/clj/reitit/http/interceptors/exception_test.clj +++ b/test/clj/reitit/http/interceptors/exception_test.clj @@ -1,15 +1,13 @@ (ns reitit.http.interceptors.exception-test - (:require - [clojure.test :refer [deftest is testing]] - [muuntaja.core :as m] - [reitit.coercion.spec] - [reitit.http :as http] - [reitit.http.coercion] - [reitit.http.interceptors.exception :as exception] - [reitit.interceptor.sieppari :as sieppari] - [reitit.ring :as ring]) - (:import - (java.sql SQLException SQLWarning))) + (:require [clojure.test :refer [deftest is testing]] + [muuntaja.core :as m] + [reitit.coercion.spec] + [reitit.http :as http] + [reitit.http.coercion] + [reitit.http.interceptors.exception :as exception] + [reitit.interceptor.sieppari :as sieppari] + [reitit.ring :as ring]) + (:import (java.sql SQLException SQLWarning))) (derive ::kikka ::kukka) diff --git a/test/clj/reitit/http/interceptors/muuntaja_test.clj b/test/clj/reitit/http/interceptors/muuntaja_test.clj index 9cb5c030..c26a5160 100644 --- a/test/clj/reitit/http/interceptors/muuntaja_test.clj +++ b/test/clj/reitit/http/interceptors/muuntaja_test.clj @@ -1,11 +1,10 @@ (ns reitit.http.interceptors.muuntaja-test - (:require - [clojure.test :refer [deftest is testing]] - [muuntaja.core :as m] - [reitit.http :as http] - [reitit.http.interceptors.muuntaja :as muuntaja] - [reitit.interceptor.sieppari :as sieppari] - [reitit.swagger :as swagger])) + (:require [clojure.test :refer [deftest is testing]] + [muuntaja.core :as m] + [reitit.http :as http] + [reitit.http.interceptors.muuntaja :as muuntaja] + [reitit.interceptor.sieppari :as sieppari] + [reitit.swagger :as swagger])) (deftest muuntaja-test (let [data {:kikka "kukka"} diff --git a/test/clj/reitit/http/interceptors/parameters_test.clj b/test/clj/reitit/http/interceptors/parameters_test.clj index 4703d15b..648e1d4c 100644 --- a/test/clj/reitit/http/interceptors/parameters_test.clj +++ b/test/clj/reitit/http/interceptors/parameters_test.clj @@ -1,10 +1,9 @@ (ns reitit.http.interceptors.parameters-test - (:require - [clojure.test :refer [deftest is testing]] - [reitit.http :as http] - [reitit.http.interceptors.parameters :as parameters] - [reitit.interceptor.sieppari :as sieppari] - [reitit.swagger :as swagger])) + (:require [clojure.test :refer [deftest is testing]] + [reitit.http :as http] + [reitit.http.interceptors.parameters :as parameters] + [reitit.interceptor.sieppari :as sieppari] + [reitit.swagger :as swagger])) (deftest parameters-test (let [app (http/ring-handler diff --git a/test/clj/reitit/http_coercion_test.clj b/test/clj/reitit/http_coercion_test.clj index 76e16a36..53c749a7 100644 --- a/test/clj/reitit/http_coercion_test.clj +++ b/test/clj/reitit/http_coercion_test.clj @@ -1,19 +1,17 @@ (ns reitit.http-coercion-test - (:require - [clojure.test :refer [deftest is testing]] - [jsonista.core :as j] - [muuntaja.interceptor] - [reitit.coercion.malli :as malli] - [reitit.coercion.schema :as schema] - [reitit.coercion.spec :as spec] - [reitit.core :as r] - [reitit.http :as http] - [reitit.http.coercion :as rrc] - [reitit.interceptor.sieppari :as sieppari] - [schema.core :as s]) - (:import - (clojure.lang ExceptionInfo) - (java.io ByteArrayInputStream))) + (:require [clojure.test :refer [deftest is testing]] + [jsonista.core :as j] + [muuntaja.interceptor] + [reitit.coercion.malli :as malli] + [reitit.coercion.schema :as schema] + [reitit.coercion.spec :as spec] + [reitit.core :as r] + [reitit.http :as http] + [reitit.http.coercion :as rrc] + [reitit.interceptor.sieppari :as sieppari] + [schema.core :as s]) + (:import (clojure.lang ExceptionInfo) + (java.io ByteArrayInputStream))) (defn mounted-interceptor [app path method] (->> app diff --git a/test/clj/reitit/http_test.clj b/test/clj/reitit/http_test.clj index 7dc79f89..0894ab9a 100644 --- a/test/clj/reitit/http_test.clj +++ b/test/clj/reitit/http_test.clj @@ -1,16 +1,14 @@ (ns reitit.http-test "just Clojure before Sieppari is ported into cljs" - (:require - [clojure.core.async :as a] - [clojure.set :as set] - [clojure.test :refer [deftest is testing]] - [reitit.core :as r] - [reitit.http :as http] - [reitit.interceptor :as interceptor] - [reitit.interceptor.sieppari :as sieppari] - [reitit.ring :as ring]) - (:import - (clojure.lang ExceptionInfo))) + (:require [clojure.core.async :as a] + [clojure.set :as set] + [clojure.test :refer [deftest is testing]] + [reitit.core :as r] + [reitit.http :as http] + [reitit.interceptor :as interceptor] + [reitit.interceptor.sieppari :as sieppari] + [reitit.ring :as ring]) + (:import (clojure.lang ExceptionInfo))) (defn interceptor [name] {:enter (fn [ctx] (update-in ctx [:request ::i] (fnil conj []) name))}) diff --git a/test/clj/reitit/pedestal_test.clj b/test/clj/reitit/pedestal_test.clj index a6678ec4..6f5150a0 100644 --- a/test/clj/reitit/pedestal_test.clj +++ b/test/clj/reitit/pedestal_test.clj @@ -1,11 +1,10 @@ (ns reitit.pedestal-test - (:require - [clojure.test :refer [deftest is testing]] - [io.pedestal.http] - [io.pedestal.test] - [reitit.http :as http] - [reitit.http.interceptors.exception :as exception] - [reitit.pedestal :as pedestal])) + (:require [clojure.test :refer [deftest is testing]] + [io.pedestal.http] + [io.pedestal.test] + [reitit.http :as http] + [reitit.http.interceptors.exception :as exception] + [reitit.pedestal :as pedestal])) (deftest arities-test (is (= #{0} (#'pedestal/arities (fn [])))) diff --git a/test/clj/reitit/ring/middleware/exception_test.clj b/test/clj/reitit/ring/middleware/exception_test.clj index 6fdd9224..f905d994 100644 --- a/test/clj/reitit/ring/middleware/exception_test.clj +++ b/test/clj/reitit/ring/middleware/exception_test.clj @@ -1,16 +1,14 @@ (ns reitit.ring.middleware.exception-test - (:require - [clojure.spec.alpha :as s] - [clojure.test :refer [deftest is testing]] - [muuntaja.core :as m] - [reitit.coercion :as coercion] - [reitit.coercion.spec] - [reitit.ring :as ring] - [reitit.ring.coercion] - [reitit.ring.middleware.exception :as exception] - [ring.util.http-response :as http-response]) - (:import - (java.sql SQLException SQLWarning))) + (:require [clojure.spec.alpha :as s] + [clojure.test :refer [deftest is testing]] + [muuntaja.core :as m] + [reitit.coercion :as coercion] + [reitit.coercion.spec] + [reitit.ring :as ring] + [reitit.ring.coercion] + [reitit.ring.middleware.exception :as exception] + [ring.util.http-response :as http-response]) + (:import (java.sql SQLException SQLWarning))) (derive ::kikka ::kukka) diff --git a/test/clj/reitit/ring/middleware/muuntaja_test.clj b/test/clj/reitit/ring/middleware/muuntaja_test.clj index c714940c..8442b5a0 100644 --- a/test/clj/reitit/ring/middleware/muuntaja_test.clj +++ b/test/clj/reitit/ring/middleware/muuntaja_test.clj @@ -1,10 +1,9 @@ (ns reitit.ring.middleware.muuntaja-test - (:require - [clojure.test :refer [deftest is testing]] - [muuntaja.core :as m] - [reitit.ring :as ring] - [reitit.ring.middleware.muuntaja :as muuntaja] - [reitit.swagger :as swagger])) + (:require [clojure.test :refer [deftest is testing]] + [muuntaja.core :as m] + [reitit.ring :as ring] + [reitit.ring.middleware.muuntaja :as muuntaja] + [reitit.swagger :as swagger])) (deftest muuntaja-test (let [data {:kikka "kukka"} diff --git a/test/clj/reitit/ring/middleware/parameters_test.clj b/test/clj/reitit/ring/middleware/parameters_test.clj index dc15c253..dec3f9d5 100644 --- a/test/clj/reitit/ring/middleware/parameters_test.clj +++ b/test/clj/reitit/ring/middleware/parameters_test.clj @@ -1,9 +1,8 @@ (ns reitit.ring.middleware.parameters-test - (:require - [clojure.test :refer [deftest is testing]] - [reitit.ring :as ring] - [reitit.ring.middleware.parameters :as parameters] - [reitit.swagger :as swagger])) + (:require [clojure.test :refer [deftest is testing]] + [reitit.ring :as ring] + [reitit.ring.middleware.parameters :as parameters] + [reitit.swagger :as swagger])) (deftest parameters-test (let [app (ring/ring-handler diff --git a/test/cljc/reitit/coercion_test.cljc b/test/cljc/reitit/coercion_test.cljc index 0a1a4aaa..97ab0aae 100644 --- a/test/cljc/reitit/coercion_test.cljc +++ b/test/cljc/reitit/coercion_test.cljc @@ -1,17 +1,15 @@ (ns reitit.coercion-test - (:require - [clojure.test :refer [deftest is testing]] - [malli.experimental.lite :as l] - [reitit.coercion :as coercion] - [reitit.coercion.malli] - [reitit.coercion.schema] - [reitit.coercion.spec] - [reitit.core :as r] - [schema.core :as s] - [spec-tools.data-spec :as ds]) + (:require [clojure.test :refer [deftest is testing]] + [malli.experimental.lite :as l] + [reitit.coercion :as coercion] + [reitit.coercion.malli] + [reitit.coercion.schema] + [reitit.coercion.spec] + [reitit.core :as r] + [schema.core :as s] + [spec-tools.data-spec :as ds]) #?(:clj - (:import - (clojure.lang ExceptionInfo)))) + (:import (clojure.lang ExceptionInfo)))) (deftest coercion-test (let [r (r/router diff --git a/test/cljc/reitit/core_test.cljc b/test/cljc/reitit/core_test.cljc index 8186184b..1780982c 100644 --- a/test/cljc/reitit/core_test.cljc +++ b/test/cljc/reitit/core_test.cljc @@ -1,12 +1,10 @@ (ns reitit.core-test - (:require - [clojure.test :refer [are deftest is testing]] - [reitit.core :as r #?@(:cljs [:refer [Router]])] - [reitit.impl :as impl]) + (:require [clojure.test :refer [are deftest is testing]] + [reitit.core :as r #?@(:cljs [:refer [Router]])] + [reitit.impl :as impl]) #?(:clj - (:import - (clojure.lang ExceptionInfo) - (reitit.core Router)))) + (:import (clojure.lang ExceptionInfo) + (reitit.core Router)))) (deftest reitit-test diff --git a/test/cljc/reitit/dependency_test.cljc b/test/cljc/reitit/dependency_test.cljc index 8795c3ad..eff7b5a1 100644 --- a/test/cljc/reitit/dependency_test.cljc +++ b/test/cljc/reitit/dependency_test.cljc @@ -1,9 +1,7 @@ (ns reitit.dependency-test - (:require - [clojure.test :refer [are deftest is testing]] - [reitit.dependency :as rc]) - #?(:clj (:import - [clojure.lang ExceptionInfo]))) + (:require [clojure.test :refer [are deftest is testing]] + [reitit.dependency :as rc]) + #?(:clj (:import [clojure.lang ExceptionInfo]))) (deftest post-order-test (let [base-middlewares [{:name ::bar, :provides #{:bar}, :requires #{:foo}, :wrap identity} diff --git a/test/cljc/reitit/exception_test.cljc b/test/cljc/reitit/exception_test.cljc index c73bf1ea..bb77421d 100644 --- a/test/cljc/reitit/exception_test.cljc +++ b/test/cljc/reitit/exception_test.cljc @@ -1,14 +1,12 @@ (ns reitit.exception-test - (:require - [clojure.spec.alpha :as s] - [clojure.test :refer [are deftest is testing]] - [reitit.core :as r] - [reitit.dev.pretty :as pretty] - [reitit.exception :as exception] - [reitit.spec :as rs]) + (:require [clojure.spec.alpha :as s] + [clojure.test :refer [are deftest is testing]] + [reitit.core :as r] + [reitit.dev.pretty :as pretty] + [reitit.exception :as exception] + [reitit.spec :as rs]) #?(:clj - (:import - (clojure.lang ExceptionInfo)))) + (:import (clojure.lang ExceptionInfo)))) (s/def ::role #{:admin :manager}) (s/def ::roles (s/coll-of ::role :into #{})) diff --git a/test/cljc/reitit/impl_test.cljc b/test/cljc/reitit/impl_test.cljc index b6a4c204..526c140c 100644 --- a/test/cljc/reitit/impl_test.cljc +++ b/test/cljc/reitit/impl_test.cljc @@ -1,7 +1,6 @@ (ns reitit.impl-test - (:require - [clojure.test :refer [are deftest is testing]] - [reitit.impl :as impl])) + (:require [clojure.test :refer [are deftest is testing]] + [reitit.impl :as impl])) (deftest strip-nils-test (is (= {:a 1, :c false} (impl/strip-nils {:a 1, :b nil, :c false})))) diff --git a/test/cljc/reitit/interceptor_test.cljc b/test/cljc/reitit/interceptor_test.cljc index e4f510ba..185db2db 100644 --- a/test/cljc/reitit/interceptor_test.cljc +++ b/test/cljc/reitit/interceptor_test.cljc @@ -1,11 +1,9 @@ (ns reitit.interceptor-test - (:require - [clojure.test :refer [are deftest is testing]] - [reitit.core :as r] - [reitit.interceptor :as interceptor]) + (:require [clojure.test :refer [are deftest is testing]] + [reitit.core :as r] + [reitit.interceptor :as interceptor]) #?(:clj - (:import - (clojure.lang ExceptionInfo)))) + (:import (clojure.lang ExceptionInfo)))) (def ctx (interceptor/context [])) diff --git a/test/cljc/reitit/middleware_test.cljc b/test/cljc/reitit/middleware_test.cljc index df508b5f..0b7bb05e 100644 --- a/test/cljc/reitit/middleware_test.cljc +++ b/test/cljc/reitit/middleware_test.cljc @@ -1,11 +1,9 @@ (ns reitit.middleware-test - (:require - [clojure.test :refer [are deftest is testing]] - [reitit.core :as r] - [reitit.middleware :as middleware]) + (:require [clojure.test :refer [are deftest is testing]] + [reitit.core :as r] + [reitit.middleware :as middleware]) #?(:clj - (:import - (clojure.lang ExceptionInfo)))) + (:import (clojure.lang ExceptionInfo)))) (def request []) diff --git a/test/cljc/reitit/ring_coercion_test.cljc b/test/cljc/reitit/ring_coercion_test.cljc index 3c5582a7..cf4c9092 100644 --- a/test/cljc/reitit/ring_coercion_test.cljc +++ b/test/cljc/reitit/ring_coercion_test.cljc @@ -1,21 +1,19 @@ (ns reitit.ring-coercion-test - (:require - [clojure.test :refer [deftest is testing]] - [malli.experimental.lite :as l] - #?@(:clj [[muuntaja.middleware] + (:require [clojure.test :refer [deftest is testing]] + [malli.experimental.lite :as l] + #?@(:clj [[muuntaja.middleware] [jsonista.core :as j]]) - [reitit.coercion.malli :as malli] - [reitit.coercion.schema :as schema] - [reitit.coercion.spec :as spec] - [reitit.core :as r] - [reitit.ring :as ring] - [reitit.ring.coercion :as rrc] - [schema.core :as s] - [spec-tools.data-spec :as ds]) + [reitit.coercion.malli :as malli] + [reitit.coercion.schema :as schema] + [reitit.coercion.spec :as spec] + [reitit.core :as r] + [reitit.ring :as ring] + [reitit.ring.coercion :as rrc] + [schema.core :as s] + [spec-tools.data-spec :as ds]) #?(:clj - (:import - (clojure.lang ExceptionInfo) - (java.io ByteArrayInputStream)))) + (:import (clojure.lang ExceptionInfo) + (java.io ByteArrayInputStream)))) (defn mounted-middleware [app path method] (->> app diff --git a/test/cljc/reitit/ring_spec_test.cljc b/test/cljc/reitit/ring_spec_test.cljc index 4822401b..1112342b 100644 --- a/test/cljc/reitit/ring_spec_test.cljc +++ b/test/cljc/reitit/ring_spec_test.cljc @@ -1,15 +1,13 @@ (ns reitit.ring-spec-test - (:require - [clojure.spec.alpha :as s] - [clojure.test :refer [deftest is testing]] - [reitit.coercion.spec] - [reitit.core :as r] - [reitit.ring :as ring] - [reitit.ring.coercion :as rrc] - [reitit.ring.spec :as rrs]) + (:require [clojure.spec.alpha :as s] + [clojure.test :refer [deftest is testing]] + [reitit.coercion.spec] + [reitit.core :as r] + [reitit.ring :as ring] + [reitit.ring.coercion :as rrc] + [reitit.ring.spec :as rrs]) #?(:clj - (:import - (clojure.lang ExceptionInfo)))) + (:import (clojure.lang ExceptionInfo)))) (s/def ::role #{:admin :user}) (s/def ::roles (s/and (s/coll-of ::role :into #{}) set?)) diff --git a/test/cljc/reitit/ring_test.cljc b/test/cljc/reitit/ring_test.cljc index 5bf05d52..d7b9f8f4 100644 --- a/test/cljc/reitit/ring_test.cljc +++ b/test/cljc/reitit/ring_test.cljc @@ -1,14 +1,12 @@ (ns reitit.ring-test - (:require - [clojure.set :as set] - [clojure.test :refer [deftest is testing]] - [reitit.core :as r] - [reitit.middleware :as middleware] - [reitit.ring :as ring] - [reitit.trie :as trie]) + (:require [clojure.set :as set] + [clojure.test :refer [deftest is testing]] + [reitit.core :as r] + [reitit.middleware :as middleware] + [reitit.ring :as ring] + [reitit.trie :as trie]) #?(:clj - (:import - (clojure.lang ExceptionInfo)))) + (:import (clojure.lang ExceptionInfo)))) (defn mw [handler name] (fn diff --git a/test/cljc/reitit/spec_test.cljc b/test/cljc/reitit/spec_test.cljc index 55d84fc0..e2717989 100644 --- a/test/cljc/reitit/spec_test.cljc +++ b/test/cljc/reitit/spec_test.cljc @@ -1,13 +1,11 @@ (ns reitit.spec-test - (:require - [#?(:clj clojure.spec.test.alpha :cljs cljs.spec.test.alpha) :as stest] - [clojure.spec.alpha :as s] - [clojure.test :refer [are deftest is testing use-fixtures]] - [reitit.core :as r] - [reitit.spec :as rs]) + (:require [#?(:clj clojure.spec.test.alpha :cljs cljs.spec.test.alpha) :as stest] + [clojure.spec.alpha :as s] + [clojure.test :refer [are deftest is testing use-fixtures]] + [reitit.core :as r] + [reitit.spec :as rs]) #?(:clj - (:import - (clojure.lang ExceptionInfo)))) + (:import (clojure.lang ExceptionInfo)))) (defn instrument-all [f] (try diff --git a/test/cljc/reitit/swagger_test.clj b/test/cljc/reitit/swagger_test.clj index 4110b190..d1b2c81b 100644 --- a/test/cljc/reitit/swagger_test.clj +++ b/test/cljc/reitit/swagger_test.clj @@ -1,16 +1,15 @@ (ns reitit.swagger-test - (:require - [clojure.test :refer [deftest is testing]] - [muuntaja.core :as m] - [reitit.coercion.malli :as malli] - [reitit.coercion.schema :as schema] - [reitit.coercion.spec :as spec] - [reitit.ring :as ring] - [reitit.ring.coercion :as rrc] - [reitit.swagger :as swagger] - [reitit.swagger-ui :as swagger-ui] - [schema.core :as s] - [spec-tools.data-spec :as ds])) + (:require [clojure.test :refer [deftest is testing]] + [muuntaja.core :as m] + [reitit.coercion.malli :as malli] + [reitit.coercion.schema :as schema] + [reitit.coercion.spec :as spec] + [reitit.ring :as ring] + [reitit.ring.coercion :as rrc] + [reitit.swagger :as swagger] + [reitit.swagger-ui :as swagger-ui] + [schema.core :as s] + [spec-tools.data-spec :as ds])) (def app (ring/ring-handler diff --git a/test/cljc/reitit/trie_test.cljc b/test/cljc/reitit/trie_test.cljc index 1828b12b..7b252bc6 100644 --- a/test/cljc/reitit/trie_test.cljc +++ b/test/cljc/reitit/trie_test.cljc @@ -1,7 +1,6 @@ (ns reitit.trie-test - (:require - [clojure.test :refer [are deftest is testing]] - [reitit.trie :as trie])) + (:require [clojure.test :refer [are deftest is testing]] + [reitit.trie :as trie])) (deftest into-set-test (is (= #{} (trie/into-set nil)))