From 6322bb99f19b6d5f82d039bedb6588bae6112e41 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 16 Oct 2018 22:51:43 +0900 Subject: [PATCH 1/2] Resolve reflection warnings --- .../src/reitit/http/interceptors/exception.clj | 4 ++-- .../src/reitit/ring/middleware/exception.clj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj b/modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj index 2bced558..7ee909ab 100644 --- a/modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj +++ b/modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj @@ -66,9 +66,9 @@ :headers {"Content-Type" "text/plain"} :body (str "Malformed " (-> e ex-data :format pr-str) " request.")}) -(defn wrap-log-to-console [handler e {:keys [uri request-method] :as req}] +(defn wrap-log-to-console [handler ^Throwable e {:keys [uri request-method] :as req}] (print! *out* (Instant/now) request-method (pr-str uri) "=>" (.getMessage e)) - (.printStackTrace e *out*) + (.printStackTrace e ^PrintWriter *out*) (handler e req)) ;; diff --git a/modules/reitit-middleware/src/reitit/ring/middleware/exception.clj b/modules/reitit-middleware/src/reitit/ring/middleware/exception.clj index f61aa3db..81f691f0 100644 --- a/modules/reitit-middleware/src/reitit/ring/middleware/exception.clj +++ b/modules/reitit-middleware/src/reitit/ring/middleware/exception.clj @@ -86,9 +86,9 @@ :headers {"Content-Type" "text/plain"} :body (str "Malformed " (-> e ex-data :format pr-str) " request.")}) -(defn wrap-log-to-console [handler e {:keys [uri request-method] :as req}] +(defn wrap-log-to-console [handler ^Throwable e {:keys [uri request-method] :as req}] (print! *out* (Instant/now) request-method (pr-str uri) "=>" (.getMessage e)) - (.printStackTrace e *out*) + (.printStackTrace e ^PrintWriter *out*) (handler e req)) ;; From a00798a0f5590928aceb0dceabc4207bea68cd0c Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 16 Oct 2018 22:57:33 +0900 Subject: [PATCH 2/2] Adjust tests to allow string keys --- test/cljc/reitit/ring_spec_test.cljc | 4 +--- test/cljc/reitit/spec_test.cljc | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/test/cljc/reitit/ring_spec_test.cljc b/test/cljc/reitit/ring_spec_test.cljc index 73c41c5c..8509bb14 100644 --- a/test/cljc/reitit/ring_spec_test.cljc +++ b/test/cljc/reitit/ring_spec_test.cljc @@ -99,9 +99,7 @@ :coercion reitit.coercion.spec/coercion} :validate rrs/validate-spec!}))) - (is (thrown-with-msg? - ExceptionInfo - #"Invalid route data" + (is (r/router? (ring/router ["/api" ["/plus/:e" diff --git a/test/cljc/reitit/spec_test.cljc b/test/cljc/reitit/spec_test.cljc index 38988e77..9c6d00e2 100644 --- a/test/cljc/reitit/spec_test.cljc +++ b/test/cljc/reitit/spec_test.cljc @@ -116,9 +116,9 @@ :header {:d string?} :path {:e string?}}})) - (is (not (s/valid? - ::rs/parameters - {:parameters {:header {"d" string?}}}))) + (is (s/valid? + ::rs/parameters + {:parameters {:header {"d" string?}}})) (is (s/valid? ::rs/responses