Skip to content

Commit 1cdbe35

Browse files
committed
Re-use wrap-request in with-middleware
This improves consistenty for how the request function is built.
1 parent 2173932 commit 1cdbe35

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/clj_http/client.clj

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,11 +1128,10 @@
11281128
"Returns a batteries-included HTTP request function corresponding to the given
11291129
core client. See default-middleware for the middleware wrappers that are used
11301130
by default"
1131-
[request]
1132-
(reduce (fn wrap-request* [request middleware]
1133-
(middleware request))
1134-
request
1135-
default-middleware))
1131+
([request]
1132+
(wrap-request request default-middleware))
1133+
([request middleware]
1134+
(reduce #(%2 %1) request middleware)))
11361135

11371136
(def ^:dynamic request
11381137
"Executes the HTTP request corresponding to the given map and returns
@@ -1241,9 +1240,7 @@
12411240
[middleware & body]
12421241
`(let [m# ~middleware]
12431242
(binding [*current-middleware* m#
1244-
clj-http.client/request (reduce #(%2 %1)
1245-
clj-http.core/request
1246-
m#)]
1243+
clj-http.client/request (wrap-request clj-http.core/request m#)]
12471244
~@body)))
12481245

12491246
(defmacro with-additional-middleware

0 commit comments

Comments
 (0)