Update dependencies in ring-http-exchange (#10765)

Also updated executor and hikaricp connection settings

Co-authored-by: jj <keistaslogairkosulys@gmail.com>

Author: ruroru

frameworks/Clojure/ring-http-exchange/project.clj

@@ -6,11 +6,11 @@
 
   :dependencies [[org.clojure/clojure "1.12.3"]
                  [org.clojure/tools.logging "1.3.0"]
-                 [org.clojars.jj/ring-http-exchange "1.2.16"]
+                 [org.clojars.jj/ring-http-exchange "1.4.1"]
                  [seancorfield/next.jdbc "1.2.659"]
-                 [org.clojars.jj/majavat "1.18.0"]
+                 [org.clojars.jj/majavat "1.19.0"]
                  [hikari-cp "3.3.0"]
-                 [org.clojars.jj/boa-sql "1.0.1"]
+                 [org.clojars.jj/boa-sql "1.0.3"]
                  [org.postgresql/postgresql "42.7.8"]
                  [metosin/jsonista "0.3.13"]
                  ]

frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/benchmark.clj

@@ -11,8 +11,8 @@
 
 (def db-spec {:idle-timeout      15000
               :max-lifetime      60000
-              :minimum-idle      0
-              :maximum-pool-size 1024
+              :minimum-idle      (* 3 (.availableProcessors (Runtime/getRuntime)))
+              :maximum-pool-size (* 3 (.availableProcessors (Runtime/getRuntime)))
               :jdbcUrl           "jdbc:postgresql://tfb-database/hello_world?user=benchmarkdbuser&password=benchmarkdbpass&tlsnowait=true"})
 
 (defn -main
@@ -29,6 +29,7 @@
       (if use-inputstream?
         (input-stream-handler/get-handler datasource)
         (string-handler/get-handler datasource))
-      {:port     8080
-       :host     "0.0.0.0"
-       :executor (Executors/newCachedThreadPool)})))
+      {:port               8080
+       :host               "0.0.0.0"
+       :lazy-request-map?  true
+       :executor           (Executors/newFixedThreadPool (* 3 (.availableProcessors (Runtime/getRuntime))))})))

frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/input_stream_handler.clj

@@ -2,32 +2,22 @@
   (:require
     [jj.majavat :as majavat]
     [jj.majavat.renderer :refer [->InputStreamRenderer]]
-    [jj.sql.boa :as boa])
+    [ring-http-exchange.model :as model])
   (:import (java.io ByteArrayInputStream)))
 
 (defrecord Response [body status headers])
 
-(def query-fortunes (boa/build-query (boa/->NextJdbcAdapter) "fortune.sql"))
-
 (def ^:private hello-world-bytes (.getBytes "Hello, World!"))
-
 (def ^:private ^:const fortune-headers {"Server"       "ring-http-exchange"
                                         "Content-Type" "text/html; charset=UTF-8"})
 
 (def ^:private render-fortune (majavat/build-html-renderer "fortune.html"
                                                            {:renderer (->InputStreamRenderer)}))
 
-(defn- get-body [datasource]
-  (let [context (as-> (query-fortunes datasource) fortunes
-                      (conj fortunes {:id      0
-                                      :message "Additional fortune added at request time."})
-                      (sort-by :message fortunes))]
-    (render-fortune {:messages context})))
-
 (defn get-handler [data-source]
   (fn [req]
     (case (req :uri)
-      "/fortunes" (Response. (get-body data-source) 200 fortune-headers)
+      "/fortunes" (Response. (render-fortune (model/fortunes-body data-source)) 200 fortune-headers)
       (Response. (ByteArrayInputStream. hello-world-bytes) 200 {"Server"       "ring-http-exchange"
                                                                 "Content-Type" "text/plain"}))))
 

frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/model.clj

@@ -0,0 +1,17 @@
+(ns ring-http-exchange.model
+  (:require [jj.sql.boa :as boa]
+            [jj.sql.boa.query.next-jdbc :as next-jdbc-adapter]
+            [jsonista.core :as json]))
+
+(def ^:const hello-world "Hello, World!")
+(def query-fortunes (boa/build-query (next-jdbc-adapter/->NextJdbcAdapter) "fortune.sql"))
+
+(defn json-body []
+  (json/write-value-as-string {:message hello-world}))
+
+(defn fortunes-body [data-source]
+  {:messages (as-> (query-fortunes data-source) fortunes
+                   (conj fortunes {:id      0
+                                   :message "Additional fortune added at request time."})
+                   (sort-by :message fortunes))})
+

frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/string_handler.clj

@@ -1,15 +1,9 @@
 (ns ring-http-exchange.string-handler
   (:require
     [jj.majavat :as majavat]
-    [jj.sql.boa :as boa]
-    [jsonista.core :as json]))
+    [ring-http-exchange.model :as model]))
 
 (defrecord Response [body status headers])
-
-(def query-fortunes (boa/build-query (boa/->NextJdbcAdapter) "fortune.sql"))
-
-(def ^:private ^:const hello-world "Hello, World!")
-
 (def ^:private ^:const fortune-headers {"Server"       "ring-http-exchange"
                                         "Content-Type" "text/html; charset=UTF-8"})
 (def ^:private ^:const json-headers {"Server"       "ring-http-exchange"
@@ -19,19 +13,12 @@
 
 (def ^:private render-fortune (majavat/build-html-renderer "fortune.html"))
 
-(defn- get-body [datasource]
-  (let [context (as-> (query-fortunes datasource) fortunes
-                      (conj fortunes {:id      0
-                                      :message "Additional fortune added at request time."})
-                      (sort-by :message fortunes))]
-    (render-fortune {:messages context})))
-
 (defn get-handler [data-source]
   (fn [req]
     (case (req :uri)
-      "/plaintext" (Response. hello-world 200 plain-text-headers)
-      "/json" (Response. (json/write-value-as-string {:message hello-world}) 200 json-headers)
-      "/fortunes" (Response. (get-body data-source) 200 fortune-headers)
-      (Response. hello-world 200 {"Server"       "ring-http-exchange"
-                                  "Content-Type" "text/plain"}))))
+      "/plaintext" (Response. model/hello-world 200 plain-text-headers)
+      "/json" (Response. (model/json-body) 200 json-headers)
+      "/fortunes" (Response. (render-fortune (model/fortunes-body  data-source)) 200 fortune-headers)
+      (Response. model/hello-world 200 {"Server"       "ring-http-exchange"
+                                        "Content-Type" "text/plain"}))))