Drop slingshot use

Still supports catching slingshotted exceptions with :exception
:handlers. Catching slingshotted exceptions is tested.

Author: Deraen

project.clj

@@ -30,6 +30,7 @@
                              [lein-ring "0.9.7"]
                              [funcool/codeina "0.3.0"]]
                    :dependencies [[org.clojure/clojure "1.7.0"]
+                                  [slingshot "0.12.2"]
                                   [peridot "0.4.2"]
                                   [javax.servlet/servlet-api "2.5"]
                                   [midje "1.8.3"]

src/compojure/api/meta.clj

@@ -9,7 +9,6 @@
             [ring.swagger.common :refer :all]
             [ring.swagger.json-schema :as js]
             [ring.util.http-response :refer [internal-server-error]]
-            [slingshot.slingshot :refer [throw+]]
             [schema.core :as s]
             [schema.coerce :as sc]
             [schema.utils :as su]
@@ -88,7 +87,8 @@
           (let [coerce (coercer (value-of schema) matcher)
                 body (coerce (:body response))]
             (if (su/error? body)
-              (throw+ (assoc body :type ::ex/response-validation))
+              (throw (ex-info "Response validation error"
+                              (assoc body :type ::ex/response-validation)))
               (assoc response
                 ::serializable? true
                 :body body)))
@@ -105,7 +105,7 @@
        (let [coerce# (~+compojure-api-coercer+ ~schema matcher#)
              result# (coerce# value#)]
          (if (su/error? result#)
-           (throw+ (assoc result# :type ::ex/request-validation))
+           (throw (ex-info "Request validation failed" (assoc result# :type ::ex/request-validation)))
            result#))
        value#)))
 

src/compojure/api/middleware.clj

@@ -12,7 +12,6 @@
             [ring.swagger.middleware :as rsm]
             [ring.swagger.coerce :as rsc]
             [ring.util.http-response :refer :all]
-            [slingshot.slingshot :refer [try+ throw+]]
             [schema.core :as s])
   (:import [com.fasterxml.jackson.core JsonParseException]
            [org.yaml.snakeyaml.parser ParserException]))
@@ -55,18 +54,17 @@
   (let [default-handler (get handlers ::ex/default ex/safe-handler)]
     (assert (fn? default-handler) "Default exception handler must be a function.")
     (fn [request]
-      (try+
+      (try
         (handler request)
-        (catch (get % :type) {:keys [type] :as data}
-          (let [type (or (get ex/legacy-exception-types type) type)]
-            (if-let [handler (get handlers type)]
-              (call-error-handler handler (:throwable &throw-context) data request)
-              (call-error-handler default-handler (:throwable &throw-context) data request))))
-        (catch Object _
-          ; FIXME: Used for validate
-          (if (rethrow-exceptions? request)
-            (throw+)
-            (call-error-handler default-handler (:throwable &throw-context) nil request)))))))
+        (catch Throwable e
+          (let [{:keys [type] :as data} (ex-data e)
+                type (or (get ex/legacy-exception-types type) type)]
+            ; FIXME: Used for validate
+            (if (rethrow-exceptions? request)
+              (throw e)
+              (if-let [handler (get handlers type)]
+                (call-error-handler handler e data request)
+                (call-error-handler default-handler e data request)))))))))
 
 ;;
 ;; Component integration
@@ -144,8 +142,8 @@
   ;; i.e. (handler req) is inside try-catch. If r-m-f was changed to catch only
   ;; exceptions from parsing the request, we wouldn't need to check the exception class.
   (if (or (instance? JsonParseException e) (instance? ParserException e))
-    (throw+ {:type ::ex/request-parsing} e)
-    (throw+ e)))
+    (throw (ex-info "Error parsing request" {:type ::ex/request-parsing} e))
+    (throw e)))
 
 (defn serializable?
   "Predicate which return true if the response body is serializable.

test/compojure/api/middleware_test.clj

@@ -3,7 +3,8 @@
             [midje.sweet :refer :all]
             [ring.util.http-response :refer [ok]]
             [ring.util.http-status :as status]
-            ring.util.test)
+            ring.util.test
+            [slingshot.slingshot :refer [throw+]])
   (:import [java.io PrintStream ByteArrayOutputStream]))
 
 (defmacro without-err
@@ -49,4 +50,12 @@
         (fact "converts exceptions into safe internal server errors"
           (handler {}) => (contains {:status status/internal-server-error
                                      :body (contains {:class exception-class
-                                                      :type "unknown-exception"})}))))))
+                                                      :type "unknown-exception"})})))))
+
+  (with-out-str
+   (without-err
+     (fact "Slingshot exception map type can be matched"
+       (let [handler (-> (fn [_] (throw+ {:type ::test} (RuntimeException. "kosh")))
+                         (wrap-exceptions {:handlers {::test (fn [ex _ _] {:status 500 :body "hello"})}}))]
+         (handler {}) => (contains {:status status/internal-server-error
+                                    :body "hello"}))))))