💄 Improve json namespace API (and fix linter).

backend/src/app/db.clj

@@ -27,14 +27,16 @@
    com.zaxxer.hikari.HikariConfig
    com.zaxxer.hikari.HikariDataSource
    com.zaxxer.hikari.metrics.prometheus.PrometheusMetricsTrackerFactory
+   java.io.InputStream
+   java.io.OutputStream
    java.lang.AutoCloseable
    java.sql.Connection
    java.sql.Savepoint
    org.postgresql.PGConnection
    org.postgresql.geometric.PGpoint
+   org.postgresql.jdbc.PgArray
    org.postgresql.largeobject.LargeObject
    org.postgresql.largeobject.LargeObjectManager
-   org.postgresql.jdbc.PgArray
    org.postgresql.util.PGInterval
    org.postgresql.util.PGobject))
 
@@ -356,7 +358,7 @@
         val (.getValue o)]
     (if (or (= typ "json")
             (= typ "jsonb"))
-      (json/decode-str val)
+      (json/read val)
       val)))
 
 (defn decode-transit-pgobject
@@ -392,7 +394,7 @@
   [data]
   (doto (org.postgresql.util.PGobject.)
     (.setType "jsonb")
-    (.setValue (json/encode-str data))))
+    (.setValue (json/write-str data))))
 
 ;; --- Locks
 

backend/src/app/http/middleware.clj

@@ -13,7 +13,6 @@
    [app.util.json :as json]
    [buddy.core.codecs :as bc]
    [buddy.core.hash :as bh]
-   [clojure.java.io :as io]
    [ring.middleware.cookies :refer [wrap-cookies]]
    [ring.middleware.keyword-params :refer [wrap-keyword-params]]
    [ring.middleware.multipart-params :refer [wrap-multipart-params]]
@@ -36,8 +35,7 @@
               (t/read! reader)))
 
           (parse-json [body]
-            (let [reader (io/reader body)]
+            (json/read body))
-              (json/read reader)))
 
           (parse [type body]
             (try

backend/src/app/loggers/loki.clj

@@ -68,7 +68,7 @@
                                 :timeout 6000
                                 :method :post
                                 :headers {"content-type" "application/json"}
-                                :body (json/encode payload)})]
+                                :body (json/write payload)})]
       (cond
         (= (:status response) 204)
         true

backend/src/app/loggers/mattermost.clj

@@ -31,7 +31,7 @@
           rsp  (http/send! {:uri uri
                             :method :post
                             :headers {"content-type" "application/json"}
-                            :body (json/encode-str {:text text})})]
+                            :body (json/write-str {:text text})})]
       (when (not= (:status rsp) 200)
         (l/error :hint "error on sending data to mattermost"
                  :response (pr-str rsp))))

backend/src/app/loggers/zmq.clj

@@ -15,8 +15,7 @@
    [clojure.core.async :as a]
    [clojure.spec.alpha :as s]
    [cuerdas.core :as str]
-   [integrant.core :as ig]
+   [integrant.core :as ig])
-   [jsonista.core :as j])
   (:import
    org.zeromq.SocketType
    org.zeromq.ZMQ$Socket
@@ -54,8 +53,8 @@
   [_ f]
   (a/close! (::buffer (meta f))))
 
-(def json-mapper
+(def ^:private json-mapper
-  (j/object-mapper
+  (json/mapper
    {:encode-key-fn str/camel
     :decode-key-fn (comp keyword str/kebab)}))
 
@@ -70,7 +69,7 @@
      (.. socket (setReceiveTimeOut 5000))
      (loop []
        (let [msg (.recv ^ZMQ$Socket socket)
-             msg (ex/ignoring (j/read-value msg json-mapper))
+             msg (ex/ignoring (json/read msg json-mapper))
              msg (if (nil? msg) :empty msg)]
          (if (a/>!! out msg)
            (recur)
@@ -78,7 +77,6 @@
              (.close ^java.lang.AutoCloseable socket)
              (.close ^java.lang.AutoCloseable zctx))))))))
 
-
 (s/def ::logger-name string?)
 (s/def ::level string?)
 (s/def ::thread string?)

backend/src/app/msgbus.clj

@@ -179,18 +179,18 @@
     ;; Add a unique listener to connection
     (.addListener sub-conn
                   (reify RedisPubSubListener
-                    (message [it pattern topic message])
+                    (message [_ _pattern _topic _message])
-                    (message [it topic message]
+                    (message [_ topic message]
                       ;; There are no back pressure, so we use a slidding
                       ;; buffer for cases when the pubsub broker sends
                       ;; more messages that we can process.
                       (let [val {:topic topic :message (blob/decode message)}]
                         (when-not (a/offer! rcv-ch val)
                           (l/warn :msg "dropping message on subscription loop"))))
-                    (psubscribed [it pattern count])
+                    (psubscribed [_ _pattern _count])
-                    (punsubscribed [it pattern count])
+                    (punsubscribed [_ _pattern _count])
-                    (subscribed [it topic count])
+                    (subscribed [_ _topic _count])
-                    (unsubscribed [it topic count])))
+                    (unsubscribed [_ _topic _count])))
 
     (letfn [(subscribe-to-single-topic [nsubs topic chan]
               (let [nsubs (if (nil? nsubs) #{chan} (conj nsubs chan))]

backend/src/app/storage/impl.clj

@@ -117,11 +117,11 @@
       io/IOFactory
       (make-reader [_ opts]
 	    (io/make-reader path opts))
-      (make-writer [_ opts]
+      (make-writer [_ _]
         (throw (UnsupportedOperationException. "not implemented")))
       (make-input-stream [_ opts]
         (io/make-input-stream path opts))
-      (make-output-stream [_ opts]
+      (make-output-stream [_ _]
         (throw (UnsupportedOperationException. "not implemented")))
       clojure.lang.Counted
       (count [_] size)
@@ -138,11 +138,11 @@
       io/IOFactory
       (make-reader [_ opts]
 	    (io/make-reader bais opts))
-      (make-writer [_ opts]
+      (make-writer [_ _]
         (throw (UnsupportedOperationException. "not implemented")))
       (make-input-stream [_ opts]
         (io/make-input-stream bais opts))
-      (make-output-stream [_ opts]
+      (make-output-stream [_ _]
         (throw (UnsupportedOperationException. "not implemented")))
 
       clojure.lang.Counted
@@ -159,11 +159,11 @@
     io/IOFactory
     (make-reader [_ opts]
       (io/make-reader is opts))
-    (make-writer [_ opts]
+    (make-writer [_ _]
       (throw (UnsupportedOperationException. "not implemented")))
     (make-input-stream [_ opts]
       (io/make-input-stream is opts))
-    (make-output-stream [_ opts]
+    (make-output-stream [_ _]
       (throw (UnsupportedOperationException. "not implemented")))
 
     clojure.lang.Counted

backend/src/app/tasks/telemetry.clj

@@ -59,7 +59,7 @@
         response    (http/send! {:method :post
                                  :uri (:uri cfg)
                                  :headers {"content-type" "application/json"}
-                                 :body (json/encode-str data)})]
+                                 :body (json/write-str data)})]
     (when (> (:status response) 206)
       (ex/raise :type :internal
                 :code :invalid-response

backend/src/app/util/json.clj

@@ -9,22 +9,27 @@
   (:require
    [jsonista.core :as j]))
 
-(defn encode-str
+(defn mapper
-  [v]
+  [params]
-  (j/write-value-as-string v j/keyword-keys-object-mapper))
+  (j/object-mapper params))
+
+(defn write
+  ([v] (j/write-value-as-bytes v j/keyword-keys-object-mapper))
+  ([v mapper] (j/write-value-as-bytes v mapper)))
+
+(defn write-str
+  ([v] (j/write-value-as-string v j/keyword-keys-object-mapper))
+  ([v mapper] (j/write-value-as-string v mapper)))
+
+(defn read
+  ([v] (j/read-value v j/keyword-keys-object-mapper))
+  ([v mapper] (j/read-value v mapper)))
 
 (defn encode
   [v]
   (j/write-value-as-bytes v j/keyword-keys-object-mapper))
 
-(defn decode-str
-  [v]
-  (j/read-value v j/keyword-keys-object-mapper))
-
 (defn decode
   [v]
   (j/read-value v j/keyword-keys-object-mapper))
 
-(defn read
-  [v]
-  (j/read-value v j/keyword-keys-object-mapper))