Refactor params

Author: bsless

ring-core/src/ring/middleware/params.clj

@@ -8,25 +8,35 @@
   (let [params (codec/form-decode params encoding)]
     (if (map? params) params {})))
 
+(defn merge2
+  [x y]
+  (if y
+    (reduce-kv assoc (or x {}) y)
+    (or x {})))
+
+(defn- annotate
+  ([m v k]
+   (assoc m k (if-let [v' (k m)] (merge2 v' v) v)))
+  ([m v k1 k2]
+   (-> m (annotate v k1) (annotate v k2))))
+
 (defn assoc-query-params
   "Parse and assoc parameters from the query string with the request."
   {:added "1.3"}
   [request encoding]
-  (merge-with merge request
-    (if-let [query-string (:query-string request)]
-      (let [params (parse-params query-string encoding)]
-        {:query-params params, :params params})
-      {:query-params {}, :params {}})))
+  (if-let [query-string (:query-string request)]
+    (let [params (parse-params query-string encoding)]
+      (annotate request params :query-params :params))
+    (annotate request {} :query-params :params)))
 
 (defn assoc-form-params
   "Parse and assoc parameters from the request body with the request."
   {:added "1.2"}
   [request encoding]
-  (merge-with merge request
-    (if-let [body (and (req/urlencoded-form? request) (:body request))]
-      (let [params (parse-params (slurp body :encoding encoding) encoding)]
-        {:form-params params, :params params})
-      {:form-params {}, :params {}})))
+  (if-let [body (and (req/urlencoded-form? request) (:body request))]
+    (let [params (parse-params (slurp body :encoding encoding) encoding)]
+      (annotate request params :form-params :params))
+    (annotate request {} :form-params :params)))
 
 (defn params-request
   "Adds parameters from the query string and the request body to the request