format-ns

.lsp/config.edn

@@ -1,2 +1,3 @@
 {:cljfmt {:indents {for-all [[:inner 0]]
-                    are [[:inner 0]]}}}
+                    are [[:inner 0]]}}
+ :clean {:ns-inner-blocks-indentation :same-line}}

modules/reitit-core/src/reitit/coercion.cljc

@@ -1,10 +1,8 @@
 (ns reitit.coercion
-  (:require
+  (:require [clojure.walk :as walk]
-   [clojure.walk :as walk]
+            [reitit.impl :as impl])
-   [reitit.impl :as impl])
   #?(:clj
-     (:import
+     (:import (java.io Writer))))
-      (java.io Writer))))
 
 ;;
 ;; Protocol

modules/reitit-core/src/reitit/core.cljc

@@ -1,8 +1,7 @@
 (ns reitit.core
-  (:require
+  (:require [reitit.exception :as exception]
-   [reitit.exception :as exception]
+            [reitit.impl :as impl]
-   [reitit.impl :as impl]
+            [reitit.trie :as trie]))
-   [reitit.trie :as trie]))
 
 ;;
 ;; Expand

modules/reitit-core/src/reitit/dependency.cljc

@@ -1,7 +1,6 @@
 (ns reitit.dependency
   "Dependency resolution for middleware/interceptors."
-  (:require
+  (:require [reitit.exception :as exception]))
-   [reitit.exception :as exception]))
 
 (defn- providers
   "Map from provision key to provider. `get-provides` should return the provision keys of a dependent."

modules/reitit-core/src/reitit/exception.cljc

@@ -1,6 +1,5 @@
 (ns reitit.exception
-  (:require
+  (:require [clojure.string :as str]))
-   [clojure.string :as str]))
 
 (defn fail!
   ([type]

modules/reitit-core/src/reitit/impl.cljc

@@ -1,15 +1,13 @@
 (ns ^:no-doc reitit.impl
   #?(:cljs (:require-macros [reitit.impl]))
-  (:require
+  (:require [clojure.set :as set]
-   [clojure.set :as set]
+            [clojure.string :as str]
-   [clojure.string :as str]
+            [meta-merge.core :as mm]
-   [meta-merge.core :as mm]
+            [reitit.exception :as ex]
-   [reitit.exception :as ex]
+            [reitit.trie :as trie])
-   [reitit.trie :as trie])
   #?(:clj
-     (:import
+     (:import (java.net URLEncoder URLDecoder)
-      (java.net URLEncoder URLDecoder)
+              (java.util HashMap Map))))
-      (java.util HashMap Map))))
 
 (defn parse [path opts]
   (let [path #?(:clj (.intern ^String (trie/normalize path opts)) :cljs (trie/normalize path opts))

modules/reitit-core/src/reitit/interceptor.cljc

@@ -1,10 +1,9 @@
 (ns reitit.interceptor
-  (:require
+  (:require [clojure.pprint :as pprint]
-   [clojure.pprint :as pprint]
+            [meta-merge.core :refer [meta-merge]]
-   [meta-merge.core :refer [meta-merge]]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.exception :as exception]
-   [reitit.exception :as exception]
+            [reitit.impl :as impl]))
-   [reitit.impl :as impl]))
 
 (defprotocol IntoInterceptor
   (into-interceptor [this data opts]))

modules/reitit-core/src/reitit/middleware.cljc

@@ -1,10 +1,9 @@
 (ns reitit.middleware
-  (:require
+  (:require [clojure.pprint :as pprint]
-   [clojure.pprint :as pprint]
+            [meta-merge.core :refer [meta-merge]]
-   [meta-merge.core :refer [meta-merge]]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.exception :as exception]
-   [reitit.exception :as exception]
+            [reitit.impl :as impl]))
-   [reitit.impl :as impl]))
 
 (defprotocol IntoMiddleware
   (into-middleware [this data opts]))

modules/reitit-core/src/reitit/spec.cljc

@@ -1,9 +1,8 @@
 (ns reitit.spec
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [clojure.spec.gen.alpha :as gen]
-   [clojure.spec.gen.alpha :as gen]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.exception :as exception]))
-   [reitit.exception :as exception]))
 
 ;;
 ;; routes

modules/reitit-core/src/reitit/trie.cljc

@@ -1,11 +1,9 @@
 (ns reitit.trie
   (:refer-clojure :exclude [compile])
-  (:require
+  (:require [clojure.string :as str]
-   [clojure.string :as str]
+            [reitit.exception :as ex])
-   [reitit.exception :as ex])
+  #?(:clj (:import (java.net URLDecoder)
-  #?(:clj (:import
+                   [reitit Trie Trie$Match Trie$Matcher])))
-           (java.net URLDecoder)
-           [reitit Trie Trie$Match Trie$Matcher])))
 
 (defn ^:no-doc into-set [x]
   (cond

modules/reitit-dev/src/reitit/dev/pretty.cljc

@@ -1,17 +1,16 @@
 (ns reitit.dev.pretty
-  (:require
+  (:require [arrangement.core] ;; spell-spec
-   [arrangement.core] ;; spell-spec
+            [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [clojure.string :as str]
-   [clojure.string :as str]
+            [expound.alpha] ;; fipp
-   [expound.alpha] ;; fipp
+            [expound.ansi]
-   [expound.ansi]
+            [fipp.edn]
-   [fipp.edn]
+            [fipp.ednize]
-   [fipp.ednize]
+            [fipp.engine]
-   [fipp.engine]
+            [fipp.visit]
-   [fipp.visit]
+            [reitit.exception :as exception]
-   [reitit.exception :as exception]
+            [spell-spec.expound] ;; expound
-   [spell-spec.expound] ;; expound
+))
-   ))
 
 ;;
 ;; colors

modules/reitit-frontend/src/reitit/frontend.cljs

@@ -1,11 +1,9 @@
 (ns reitit.frontend
-  (:require
+  (:require [clojure.set :as set]
-   [clojure.set :as set]
+            [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [reitit.core :as r])
-   [reitit.core :as r])
+  (:import goog.Uri
-  (:import
+           goog.Uri.QueryData))
-   goog.Uri
-   goog.Uri.QueryData))
 
 (defn- query-param [^QueryData q k]
   (let [vs (.getValues q k)]

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
+  (:require [reitit.frontend.history :as rfh]))
-   [reitit.frontend.history :as rfh]))
 
 (defonce history (atom nil))
 

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
+  (:require [goog.events :as gevents]
-   [goog.events :as gevents]
+            [reitit.core :as reitit]
-   [reitit.core :as reitit]
+            [reitit.frontend :as rf])
-   [reitit.frontend :as rf])
+  (:import goog.Uri))
-  (:import
-   goog.Uri))
 
 (defprotocol History
   (-init [this] "Create event listeners")

modules/reitit-http/src/reitit/http.cljc

@@ -1,10 +1,9 @@
 (ns reitit.http
-  (:require
+  (:require [meta-merge.core :refer [meta-merge]]
-   [meta-merge.core :refer [meta-merge]]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.exception :as ex]
-   [reitit.exception :as ex]
+            [reitit.interceptor :as interceptor]
-   [reitit.interceptor :as interceptor]
+            [reitit.ring :as ring]))
-   [reitit.ring :as ring]))
 
 (defrecord Endpoint [data interceptors queue handler path method])
 

modules/reitit-http/src/reitit/http/coercion.cljc

@@ -1,8 +1,7 @@
 (ns reitit.http.coercion
-  (:require
+  (:require [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [reitit.impl :as impl]
-   [reitit.impl :as impl]
+            [reitit.spec :as rs]))
-   [reitit.spec :as rs]))
 
 (defn coerce-request-interceptor
   "Interceptor for pluggable request coercion.

modules/reitit-http/src/reitit/http/spec.cljc

@@ -1,10 +1,9 @@
 (ns reitit.http.spec
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [reitit.exception :as exception]
-   [reitit.exception :as exception]
+            [reitit.interceptor :as interceptor]
-   [reitit.interceptor :as interceptor]
+            [reitit.ring.spec :as rrs]
-   [reitit.ring.spec :as rrs]
+            [reitit.spec :as rs]))
-   [reitit.spec :as rs]))
 
 ;;
 ;; Specs

modules/reitit-interceptors/src/reitit/http/interceptors/dev.clj

@@ -1,9 +1,8 @@
 (ns reitit.http.interceptors.dev
-  (:require
+  (:require [lambdaisland.deep-diff :as ddiff]
-   [lambdaisland.deep-diff :as ddiff]
+            [lambdaisland.deep-diff.printer :as printer]
-   [lambdaisland.deep-diff.printer :as printer]
+            [puget.color :as color]
-   [puget.color :as color]
+            [reitit.core :as r]))
-   [reitit.core :as r]))
 
 (def printer
   (-> (printer/puget-printer)

modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj

@@ -1,12 +1,10 @@
 (ns reitit.http.interceptors.exception
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [clojure.string :as str]
-   [clojure.string :as str]
+            [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [reitit.ring :as ring])
-   [reitit.ring :as ring])
+  (:import (java.io PrintWriter Writer)
-  (:import
+           (java.time Instant)))
-   (java.io PrintWriter Writer)
-   (java.time Instant)))
 
 (s/def ::handlers (s/map-of any? fn?))
 (s/def ::spec (s/keys :opt-un [::handlers]))

modules/reitit-interceptors/src/reitit/http/interceptors/multipart.clj

@@ -1,12 +1,10 @@
 (ns reitit.http.interceptors.multipart
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [reitit.spec]
-   [reitit.spec]
+            [ring.middleware.multipart-params :as multipart-params]
-   [ring.middleware.multipart-params :as multipart-params]
+            [spec-tools.core :as st])
-   [spec-tools.core :as st])
+  (:import (java.io File)))
-  (:import
-   (java.io File)))
 
 (s/def ::filename string?)
 (s/def ::content-type string?)

modules/reitit-interceptors/src/reitit/http/interceptors/muuntaja.clj

@@ -1,8 +1,7 @@
 (ns reitit.http.interceptors.muuntaja
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [muuntaja.core :as m]
-   [muuntaja.core :as m]
+            [muuntaja.interceptor]))
-   [muuntaja.interceptor]))
 
 (s/def ::muuntaja m/muuntaja?)
 (s/def ::spec (s/keys :opt-un [::muuntaja]))

modules/reitit-interceptors/src/reitit/http/interceptors/parameters.clj

@@ -1,6 +1,5 @@
 (ns reitit.http.interceptors.parameters
-  (:require
+  (:require [ring.middleware.params :as params]))
-   [ring.middleware.params :as params]))
 
 (defn parameters-interceptor
   "Interceptor to parse urlencoded parameters from the query string and form

modules/reitit-malli/src/reitit/coercion/malli.cljc

@@ -1,15 +1,14 @@
 (ns reitit.coercion.malli
-  (:require
+  (:require [clojure.set :as set]
-   [clojure.set :as set]
+            [clojure.walk :as walk]
-   [clojure.walk :as walk]
+            [malli.core :as m]
-   [malli.core :as m]
+            [malli.edn :as edn]
-   [malli.edn :as edn]
+            [malli.error :as me]
-   [malli.error :as me]
+            [malli.experimental.lite :as l]
-   [malli.experimental.lite :as l]
+            [malli.swagger :as swagger]
-   [malli.swagger :as swagger]
+            [malli.transform :as mt]
-   [malli.transform :as mt]
+            [malli.util :as mu]
-   [malli.util :as mu]
+            [reitit.coercion :as coercion]))
-   [reitit.coercion :as coercion]))
 
 ;;
 ;; coercion

modules/reitit-malli/src/reitit/ring/malli.cljc

@@ -1,6 +1,5 @@
 (ns reitit.ring.malli
-  #?(:clj (:import
+  #?(:clj (:import (java.io File))))
-           (java.io File))))
 
 #?(:clj
    (def temp-file-part

modules/reitit-middleware/src/reitit/ring/middleware/dev.clj

@@ -1,9 +1,8 @@
 (ns reitit.ring.middleware.dev
-  (:require
+  (:require [lambdaisland.deep-diff :as ddiff]
-   [lambdaisland.deep-diff :as ddiff]
+            [lambdaisland.deep-diff.printer :as printer]
-   [lambdaisland.deep-diff.printer :as printer]
+            [puget.color :as color]
-   [puget.color :as color]
+            [reitit.core :as r]))
-   [reitit.core :as r]))
 
 (def printer
   (-> (printer/puget-printer)

modules/reitit-middleware/src/reitit/ring/middleware/exception.clj

@@ -1,12 +1,10 @@
 (ns reitit.ring.middleware.exception
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [clojure.string :as str]
-   [clojure.string :as str]
+            [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [reitit.ring :as ring])
-   [reitit.ring :as ring])
+  (:import (java.io Writer PrintWriter)
-  (:import
+           (java.time Instant)))
-   (java.io Writer PrintWriter)
-   (java.time Instant)))
 
 (s/def ::handlers (s/map-of any? fn?))
 (s/def ::spec (s/keys :opt-un [::handlers]))

modules/reitit-middleware/src/reitit/ring/middleware/multipart.clj

@@ -1,12 +1,10 @@
 (ns reitit.ring.middleware.multipart
   (:refer-clojure :exclude [compile])
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [ring.middleware.multipart-params :as multipart-params]
-   [ring.middleware.multipart-params :as multipart-params]
+            [spec-tools.core :as st])
-   [spec-tools.core :as st])
+  (:import (java.io File)))
-  (:import
-   (java.io File)))
 
 (s/def ::filename string?)
 (s/def ::content-type string?)

modules/reitit-middleware/src/reitit/ring/middleware/muuntaja.clj

@@ -1,8 +1,7 @@
 (ns reitit.ring.middleware.muuntaja
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [muuntaja.core :as m]
-   [muuntaja.core :as m]
+            [muuntaja.middleware]))
-   [muuntaja.middleware]))
 
 (s/def ::muuntaja m/muuntaja?)
 (s/def ::spec (s/keys :opt-un [::muuntaja]))

modules/reitit-middleware/src/reitit/ring/middleware/parameters.clj

@@ -1,6 +1,5 @@
 (ns reitit.ring.middleware.parameters
-  (:require
+  (:require [ring.middleware.params :as params]))
-   [ring.middleware.params :as params]))
 
 (def parameters-middleware
   "Middleware to parse urlencoded parameters from the query string and form

modules/reitit-pedestal/src/reitit/pedestal.clj

@@ -1,13 +1,11 @@
 (ns reitit.pedestal
-  (:require
+  (:require [io.pedestal.http :as http]
-   [io.pedestal.http :as http]
+            [io.pedestal.interceptor :as interceptor]
-   [io.pedestal.interceptor :as interceptor]
+            [io.pedestal.interceptor.chain :as chain]
-   [io.pedestal.interceptor.chain :as chain]
+            [reitit.http]
-   [reitit.http]
+            [reitit.interceptor])
-   [reitit.interceptor])
+  (:import (java.lang.reflect Method)
-  (:import
+           (reitit.interceptor Executor)))
-   (java.lang.reflect Method)
-   (reitit.interceptor Executor)))
 
 ;; TODO: variadic
 (defn- arities [f]

modules/reitit-ring/src/reitit/ring.cljc

@@ -1,13 +1,12 @@
 (ns reitit.ring
-  (:require
+  (:require [clojure.string :as str]
-   [clojure.string :as str]
+            [meta-merge.core :refer [meta-merge]]
-   [meta-merge.core :refer [meta-merge]]
+            #?@(:clj [[ring.util.mime-type :as mime-type]
-   #?@(:clj [[ring.util.mime-type :as mime-type]
              [ring.util.response :as response]])
-   [reitit.core :as r]
+            [reitit.core :as r]
-   [reitit.exception :as ex]
+            [reitit.exception :as ex]
-   [reitit.impl :as impl]
+            [reitit.impl :as impl]
-   [reitit.middleware :as middleware]))
+            [reitit.middleware :as middleware]))
 
 (declare get-match)
 (declare get-router)

modules/reitit-ring/src/reitit/ring/coercion.cljc

@@ -1,8 +1,7 @@
 (ns reitit.ring.coercion
-  (:require
+  (:require [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [reitit.impl :as impl]
-   [reitit.impl :as impl]
+            [reitit.spec :as rs]))
-   [reitit.spec :as rs]))
 
 (defn handle-coercion-exception [e respond raise]
   (let [data (ex-data e)]

modules/reitit-ring/src/reitit/ring/spec.cljc

@@ -1,9 +1,8 @@
 (ns reitit.ring.spec
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [reitit.exception :as exception]
-   [reitit.exception :as exception]
+            [reitit.middleware :as middleware]
-   [reitit.middleware :as middleware]
+            [reitit.spec :as rs]))
-   [reitit.spec :as rs]))
 
 ;;
 ;; Specs

modules/reitit-schema/src/reitit/coercion/schema.cljc

@@ -1,14 +1,13 @@
 (ns reitit.coercion.schema
-  (:require
+  (:require [clojure.set :as set]
-   [clojure.set :as set]
+            [clojure.walk :as walk]
-   [clojure.walk :as walk]
+            [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [schema-tools.coerce :as stc]
-   [schema-tools.coerce :as stc]
+            [schema-tools.core :as st]
-   [schema-tools.core :as st]
+            [schema-tools.swagger.core :as swagger]
-   [schema-tools.swagger.core :as swagger]
+            [schema.coerce :as sc]
-   [schema.coerce :as sc]
+            [schema.core :as s]
-   [schema.core :as s]
+            [schema.utils :as su]))
-   [schema.utils :as su]))
 
 (def string-coercion-matcher
   stc/string-coercion-matcher)

modules/reitit-schema/src/reitit/ring/schema.cljc

@@ -1,9 +1,7 @@
 (ns reitit.ring.schema
-  (:require
+  (:require [schema-tools.swagger.core :as swagger]
-   [schema-tools.swagger.core :as swagger]
+            [schema.core :as s])
-   [schema.core :as s])
+  #?(:clj (:import (java.io File))))
-  #?(:clj (:import
-           (java.io File))))
 
 (defrecord Upload [m]
   s/Schema

modules/reitit-sieppari/src/reitit/interceptor/sieppari.clj

@@ -1,8 +1,7 @@
 (ns reitit.interceptor.sieppari
-  (:require
+  (:require [reitit.interceptor :as interceptor]
-   [reitit.interceptor :as interceptor]
+            [sieppari.core :as sieppari]
-   [sieppari.core :as sieppari]
+            [sieppari.queue :as queue]))
-   [sieppari.queue :as queue]))
 
 (def executor
   (reify

modules/reitit-spec/src/reitit/coercion/spec.cljc

@@ -1,15 +1,13 @@
 (ns reitit.coercion.spec
-  (:require
+  (:require [clojure.set :as set]
-   [clojure.set :as set]
+            [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [spec-tools.core :as st #?@(:cljs [:refer [Spec]])]
-   [spec-tools.core :as st #?@(:cljs [:refer [Spec]])]
+            [spec-tools.data-spec :as ds #?@(:cljs [:refer [Maybe]])]
-   [spec-tools.data-spec :as ds #?@(:cljs [:refer [Maybe]])]
+            [spec-tools.swagger.core :as swagger])
-   [spec-tools.swagger.core :as swagger])
   #?(:clj
-     (:import
+     (:import (spec_tools.core Spec)
-      (spec_tools.core Spec)
+              (spec_tools.data_spec Maybe))))
-      (spec_tools.data_spec Maybe))))
 
 (def string-transformer
   (st/type-transformer

modules/reitit-swagger-ui/src/reitit/swagger_ui.cljc

@@ -1,7 +1,6 @@
 (ns reitit.swagger-ui
-  #?(:clj (:require
+  #?(:clj (:require [jsonista.core :as j]
-           [jsonista.core :as j]
+                    [reitit.ring :as ring])))
-           [reitit.ring :as ring])))
 
 #?(:clj
    (defn create-swagger-ui-handler

modules/reitit-swagger/src/reitit/swagger.cljc

@@ -1,12 +1,11 @@
 (ns reitit.swagger
-  (:require
+  (:require [clojure.set :as set]
-   [clojure.set :as set]
+            [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [clojure.string :as str]
-   [clojure.string :as str]
+            [meta-merge.core :refer [meta-merge]]
-   [meta-merge.core :refer [meta-merge]]
+            [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.trie :as trie]))
-   [reitit.trie :as trie]))
 
 (s/def ::id (s/or :keyword keyword? :set (s/coll-of keyword? :into #{})))
 (s/def ::no-doc boolean?)

test/clj/cljdoc/reaper.clj

@@ -1,8 +1,7 @@
 (ns cljdoc.reaper
-  (:require
+  (:require [clojure.java.io :as io]
-   [clojure.java.io :as io]
+            [clojure.pprint :as pprint]
-   [clojure.pprint :as pprint]
+            [clojure.string :as str]))
-   [clojure.string :as str]))
 
 (defn reap! []
   (let [docs (->> (for [line (-> (io/file "./doc/SUMMARY.md") (slurp) (str/split #"\n"))

test/clj/reitit/http/interceptors/exception_test.clj

@@ -1,15 +1,13 @@
 (ns reitit.http.interceptors.exception-test
-  (:require
+  (:require [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [muuntaja.core :as m]
-   [muuntaja.core :as m]
+            [reitit.coercion.spec]
-   [reitit.coercion.spec]
+            [reitit.http :as http]
-   [reitit.http :as http]
+            [reitit.http.coercion]
-   [reitit.http.coercion]
+            [reitit.http.interceptors.exception :as exception]
-   [reitit.http.interceptors.exception :as exception]
+            [reitit.interceptor.sieppari :as sieppari]
-   [reitit.interceptor.sieppari :as sieppari]
+            [reitit.ring :as ring])
-   [reitit.ring :as ring])
+  (:import (java.sql SQLException SQLWarning)))
-  (:import
-   (java.sql SQLException SQLWarning)))
 
 (derive ::kikka ::kukka)
 

test/clj/reitit/http/interceptors/muuntaja_test.clj

@@ -1,11 +1,10 @@
 (ns reitit.http.interceptors.muuntaja-test
-  (:require
+  (:require [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [muuntaja.core :as m]
-   [muuntaja.core :as m]
+            [reitit.http :as http]
-   [reitit.http :as http]
+            [reitit.http.interceptors.muuntaja :as muuntaja]
-   [reitit.http.interceptors.muuntaja :as muuntaja]
+            [reitit.interceptor.sieppari :as sieppari]
-   [reitit.interceptor.sieppari :as sieppari]
+            [reitit.swagger :as swagger]))
-   [reitit.swagger :as swagger]))
 
 (deftest muuntaja-test
   (let [data {:kikka "kukka"}

test/clj/reitit/http/interceptors/parameters_test.clj

@@ -1,10 +1,9 @@
 (ns reitit.http.interceptors.parameters-test
-  (:require
+  (:require [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [reitit.http :as http]
-   [reitit.http :as http]
+            [reitit.http.interceptors.parameters :as parameters]
-   [reitit.http.interceptors.parameters :as parameters]
+            [reitit.interceptor.sieppari :as sieppari]
-   [reitit.interceptor.sieppari :as sieppari]
+            [reitit.swagger :as swagger]))
-   [reitit.swagger :as swagger]))
 
 (deftest parameters-test
   (let [app (http/ring-handler

test/clj/reitit/http_coercion_test.clj

@@ -1,19 +1,17 @@
 (ns reitit.http-coercion-test
-  (:require
+  (:require [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [jsonista.core :as j]
-   [jsonista.core :as j]
+            [muuntaja.interceptor]
-   [muuntaja.interceptor]
+            [reitit.coercion.malli :as malli]
-   [reitit.coercion.malli :as malli]
+            [reitit.coercion.schema :as schema]
-   [reitit.coercion.schema :as schema]
+            [reitit.coercion.spec :as spec]
-   [reitit.coercion.spec :as spec]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.http :as http]
-   [reitit.http :as http]
+            [reitit.http.coercion :as rrc]
-   [reitit.http.coercion :as rrc]
+            [reitit.interceptor.sieppari :as sieppari]
-   [reitit.interceptor.sieppari :as sieppari]
+            [schema.core :as s])
-   [schema.core :as s])
+  (:import (clojure.lang ExceptionInfo)
-  (:import
+           (java.io ByteArrayInputStream)))
-   (clojure.lang ExceptionInfo)
-   (java.io ByteArrayInputStream)))
 
 (defn mounted-interceptor [app path method]
   (->> app

test/clj/reitit/http_test.clj

@@ -1,16 +1,14 @@
 (ns reitit.http-test
   "just Clojure before Sieppari is ported into cljs"
-  (:require
+  (:require [clojure.core.async :as a]
-   [clojure.core.async :as a]
+            [clojure.set :as set]
-   [clojure.set :as set]
+            [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.http :as http]
-   [reitit.http :as http]
+            [reitit.interceptor :as interceptor]
-   [reitit.interceptor :as interceptor]
+            [reitit.interceptor.sieppari :as sieppari]
-   [reitit.interceptor.sieppari :as sieppari]
+            [reitit.ring :as ring])
-   [reitit.ring :as ring])
+  (:import (clojure.lang ExceptionInfo)))
-  (:import
-   (clojure.lang ExceptionInfo)))
 
 (defn interceptor [name]
   {:enter (fn [ctx] (update-in ctx [:request ::i] (fnil conj []) name))})

test/clj/reitit/pedestal_test.clj

@@ -1,11 +1,10 @@
 (ns reitit.pedestal-test
-  (:require
+  (:require [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [io.pedestal.http]
-   [io.pedestal.http]
+            [io.pedestal.test]
-   [io.pedestal.test]
+            [reitit.http :as http]
-   [reitit.http :as http]
+            [reitit.http.interceptors.exception :as exception]
-   [reitit.http.interceptors.exception :as exception]
+            [reitit.pedestal :as pedestal]))
-   [reitit.pedestal :as pedestal]))
 
 (deftest arities-test
   (is (= #{0} (#'pedestal/arities (fn []))))

test/clj/reitit/ring/middleware/exception_test.clj

@@ -1,16 +1,14 @@
 (ns reitit.ring.middleware.exception-test
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [muuntaja.core :as m]
-   [muuntaja.core :as m]
+            [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [reitit.coercion.spec]
-   [reitit.coercion.spec]
+            [reitit.ring :as ring]
-   [reitit.ring :as ring]
+            [reitit.ring.coercion]
-   [reitit.ring.coercion]
+            [reitit.ring.middleware.exception :as exception]
-   [reitit.ring.middleware.exception :as exception]
+            [ring.util.http-response :as http-response])
-   [ring.util.http-response :as http-response])
+  (:import (java.sql SQLException SQLWarning)))
-  (:import
-   (java.sql SQLException SQLWarning)))
 
 (derive ::kikka ::kukka)
 

test/clj/reitit/ring/middleware/muuntaja_test.clj

@@ -1,10 +1,9 @@
 (ns reitit.ring.middleware.muuntaja-test
-  (:require
+  (:require [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [muuntaja.core :as m]
-   [muuntaja.core :as m]
+            [reitit.ring :as ring]
-   [reitit.ring :as ring]
+            [reitit.ring.middleware.muuntaja :as muuntaja]
-   [reitit.ring.middleware.muuntaja :as muuntaja]
+            [reitit.swagger :as swagger]))
-   [reitit.swagger :as swagger]))
 
 (deftest muuntaja-test
   (let [data {:kikka "kukka"}

test/clj/reitit/ring/middleware/parameters_test.clj

@@ -1,9 +1,8 @@
 (ns reitit.ring.middleware.parameters-test
-  (:require
+  (:require [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [reitit.ring :as ring]
-   [reitit.ring :as ring]
+            [reitit.ring.middleware.parameters :as parameters]
-   [reitit.ring.middleware.parameters :as parameters]
+            [reitit.swagger :as swagger]))
-   [reitit.swagger :as swagger]))
 
 (deftest parameters-test
   (let [app (ring/ring-handler

test/cljc/reitit/coercion_test.cljc

@@ -1,17 +1,15 @@
 (ns reitit.coercion-test
-  (:require
+  (:require [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [malli.experimental.lite :as l]
-   [malli.experimental.lite :as l]
+            [reitit.coercion :as coercion]
-   [reitit.coercion :as coercion]
+            [reitit.coercion.malli]
-   [reitit.coercion.malli]
+            [reitit.coercion.schema]
-   [reitit.coercion.schema]
+            [reitit.coercion.spec]
-   [reitit.coercion.spec]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [schema.core :as s]
-   [schema.core :as s]
+            [spec-tools.data-spec :as ds])
-   [spec-tools.data-spec :as ds])
   #?(:clj
-     (:import
+     (:import (clojure.lang ExceptionInfo))))
-      (clojure.lang ExceptionInfo))))
 
 (deftest coercion-test
   (let [r (r/router

test/cljc/reitit/core_test.cljc

@@ -1,12 +1,10 @@
 (ns reitit.core-test
-  (:require
+  (:require [clojure.test :refer [are deftest is testing]]
-   [clojure.test :refer [are deftest is testing]]
+            [reitit.core :as r #?@(:cljs [:refer [Router]])]
-   [reitit.core :as r #?@(:cljs [:refer [Router]])]
+            [reitit.impl :as impl])
-   [reitit.impl :as impl])
   #?(:clj
-     (:import
+     (:import (clojure.lang ExceptionInfo)
-      (clojure.lang ExceptionInfo)
+              (reitit.core Router))))
-      (reitit.core Router))))
 
 (deftest reitit-test
 

test/cljc/reitit/dependency_test.cljc

@@ -1,9 +1,7 @@
 (ns reitit.dependency-test
-  (:require
+  (:require [clojure.test :refer [are deftest is testing]]
-   [clojure.test :refer [are deftest is testing]]
+            [reitit.dependency :as rc])
-   [reitit.dependency :as rc])
+  #?(:clj (:import [clojure.lang ExceptionInfo])))
-  #?(:clj (:import
-           [clojure.lang ExceptionInfo])))
 
 (deftest post-order-test
   (let [base-middlewares [{:name ::bar, :provides #{:bar}, :requires #{:foo}, :wrap identity}

test/cljc/reitit/exception_test.cljc

@@ -1,14 +1,12 @@
 (ns reitit.exception-test
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [clojure.test :refer [are deftest is testing]]
-   [clojure.test :refer [are deftest is testing]]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.dev.pretty :as pretty]
-   [reitit.dev.pretty :as pretty]
+            [reitit.exception :as exception]
-   [reitit.exception :as exception]
+            [reitit.spec :as rs])
-   [reitit.spec :as rs])
   #?(:clj
-     (:import
+     (:import (clojure.lang ExceptionInfo))))
-      (clojure.lang ExceptionInfo))))
 
 (s/def ::role #{:admin :manager})
 (s/def ::roles (s/coll-of ::role :into #{}))

test/cljc/reitit/impl_test.cljc

@@ -1,7 +1,6 @@
 (ns reitit.impl-test
-  (:require
+  (:require [clojure.test :refer [are deftest is testing]]
-   [clojure.test :refer [are deftest is testing]]
+            [reitit.impl :as impl]))
-   [reitit.impl :as impl]))
 
 (deftest strip-nils-test
   (is (= {:a 1, :c false} (impl/strip-nils {:a 1, :b nil, :c false}))))

test/cljc/reitit/interceptor_test.cljc

@@ -1,11 +1,9 @@
 (ns reitit.interceptor-test
-  (:require
+  (:require [clojure.test :refer [are deftest is testing]]
-   [clojure.test :refer [are deftest is testing]]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.interceptor :as interceptor])
-   [reitit.interceptor :as interceptor])
   #?(:clj
-     (:import
+     (:import (clojure.lang ExceptionInfo))))
-      (clojure.lang ExceptionInfo))))
 
 (def ctx (interceptor/context []))
 

test/cljc/reitit/middleware_test.cljc

@@ -1,11 +1,9 @@
 (ns reitit.middleware-test
-  (:require
+  (:require [clojure.test :refer [are deftest is testing]]
-   [clojure.test :refer [are deftest is testing]]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.middleware :as middleware])
-   [reitit.middleware :as middleware])
   #?(:clj
-     (:import
+     (:import (clojure.lang ExceptionInfo))))
-      (clojure.lang ExceptionInfo))))
 
 (def request [])
 

test/cljc/reitit/ring_coercion_test.cljc

@@ -1,21 +1,19 @@
 (ns reitit.ring-coercion-test
-  (:require
+  (:require [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [malli.experimental.lite :as l]
-   [malli.experimental.lite :as l]
+            #?@(:clj [[muuntaja.middleware]
-   #?@(:clj [[muuntaja.middleware]
              [jsonista.core :as j]])
-   [reitit.coercion.malli :as malli]
+            [reitit.coercion.malli :as malli]
-   [reitit.coercion.schema :as schema]
+            [reitit.coercion.schema :as schema]
-   [reitit.coercion.spec :as spec]
+            [reitit.coercion.spec :as spec]
-   [reitit.core :as r]
+            [reitit.core :as r]
-   [reitit.ring :as ring]
+            [reitit.ring :as ring]
-   [reitit.ring.coercion :as rrc]
+            [reitit.ring.coercion :as rrc]
-   [schema.core :as s]
+            [schema.core :as s]
-   [spec-tools.data-spec :as ds])
+            [spec-tools.data-spec :as ds])
   #?(:clj
-     (:import
+     (:import (clojure.lang ExceptionInfo)
-      (clojure.lang ExceptionInfo)
+              (java.io ByteArrayInputStream))))
-      (java.io ByteArrayInputStream))))
 
 (defn mounted-middleware [app path method]
   (->> app

test/cljc/reitit/ring_spec_test.cljc

@@ -1,15 +1,13 @@
 (ns reitit.ring-spec-test
-  (:require
+  (:require [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [reitit.coercion.spec]
-   [reitit.coercion.spec]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.ring :as ring]
-   [reitit.ring :as ring]
+            [reitit.ring.coercion :as rrc]
-   [reitit.ring.coercion :as rrc]
+            [reitit.ring.spec :as rrs])
-   [reitit.ring.spec :as rrs])
   #?(:clj
-     (:import
+     (:import (clojure.lang ExceptionInfo))))
-      (clojure.lang ExceptionInfo))))
 
 (s/def ::role #{:admin :user})
 (s/def ::roles (s/and (s/coll-of ::role :into #{}) set?))

test/cljc/reitit/ring_test.cljc

@@ -1,14 +1,12 @@
 (ns reitit.ring-test
-  (:require
+  (:require [clojure.set :as set]
-   [clojure.set :as set]
+            [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.middleware :as middleware]
-   [reitit.middleware :as middleware]
+            [reitit.ring :as ring]
-   [reitit.ring :as ring]
+            [reitit.trie :as trie])
-   [reitit.trie :as trie])
   #?(:clj
-     (:import
+     (:import (clojure.lang ExceptionInfo))))
-      (clojure.lang ExceptionInfo))))
 
 (defn mw [handler name]
   (fn

test/cljc/reitit/spec_test.cljc

@@ -1,13 +1,11 @@
 (ns reitit.spec-test
-  (:require
+  (:require [#?(:clj clojure.spec.test.alpha :cljs cljs.spec.test.alpha) :as stest]
-   [#?(:clj clojure.spec.test.alpha :cljs cljs.spec.test.alpha) :as stest]
+            [clojure.spec.alpha :as s]
-   [clojure.spec.alpha :as s]
+            [clojure.test :refer [are deftest is testing use-fixtures]]
-   [clojure.test :refer [are deftest is testing use-fixtures]]
+            [reitit.core :as r]
-   [reitit.core :as r]
+            [reitit.spec :as rs])
-   [reitit.spec :as rs])
   #?(:clj
-     (:import
+     (:import (clojure.lang ExceptionInfo))))
-      (clojure.lang ExceptionInfo))))
 
 (defn instrument-all [f]
   (try

test/cljc/reitit/swagger_test.clj

@@ -1,16 +1,15 @@
 (ns reitit.swagger-test
-  (:require
+  (:require [clojure.test :refer [deftest is testing]]
-   [clojure.test :refer [deftest is testing]]
+            [muuntaja.core :as m]
-   [muuntaja.core :as m]
+            [reitit.coercion.malli :as malli]
-   [reitit.coercion.malli :as malli]
+            [reitit.coercion.schema :as schema]
-   [reitit.coercion.schema :as schema]
+            [reitit.coercion.spec :as spec]
-   [reitit.coercion.spec :as spec]
+            [reitit.ring :as ring]
-   [reitit.ring :as ring]
+            [reitit.ring.coercion :as rrc]
-   [reitit.ring.coercion :as rrc]
+            [reitit.swagger :as swagger]
-   [reitit.swagger :as swagger]
+            [reitit.swagger-ui :as swagger-ui]
-   [reitit.swagger-ui :as swagger-ui]
+            [schema.core :as s]
-   [schema.core :as s]
+            [spec-tools.data-spec :as ds]))
-   [spec-tools.data-spec :as ds]))
 
 (def app
   (ring/ring-handler

test/cljc/reitit/trie_test.cljc

@@ -1,7 +1,6 @@
 (ns reitit.trie-test
-  (:require
+  (:require [clojure.test :refer [are deftest is testing]]
-   [clojure.test :refer [are deftest is testing]]
+            [reitit.trie :as trie]))
-   [reitit.trie :as trie]))
 
 (deftest into-set-test
   (is (= #{} (trie/into-set nil)))