Unify bb and clj behavior in cheshire and support :key-fn in read

src/babashka/json/internal/cheshire.clj

@@ -1,10 +1,6 @@
 (ns babashka.json.internal.cheshire
-  (:require [cheshire.core :as cheshire]
-            [cheshire.factory :as factory]
-            [cheshire.parse :as cheshire-parse])
-  (:refer-clojure :exclude [read])
-  (:import [com.fasterxml.jackson.core JsonFactory]
-           [java.io Reader]))
+  (:require [cheshire.core :as cheshire])
+  (:refer-clojure :exclude [read]))
 
 (defn read-str
   ([s] (read-str s nil))
@@ -14,16 +10,9 @@
   ([s] (write-str s nil))
   ([s _opts] (cheshire/generate-string s)))
 
-(defn ->json-reader
-  ([rdr] (->json-reader rdr nil))
-  ([rdr _opts]
-   (.createParser ^JsonFactory (or factory/*json-factory*
-                                   factory/json-factory)
-                  ^Reader rdr)))
-
 (defn read
   ([reader] (read reader nil))
-  ([reader _opts]
-   (cheshire-parse/parse-strict reader true nil nil)))
+  ([reader {:keys [key-fn]}]
+   (cheshire/parse-stream reader (or key-fn keyword))))
 
-(def fns ['cheshire/cheshire read-str write-str ->json-reader read])
+(def fns ['cheshire/cheshire read-str write-str identity read])

test/babashka/json_test.clj

@@ -13,9 +13,11 @@
     (is (= [1 2 3] (json/read-str (json/write-str [1 2 3]))))
     (is (= {:a 1} (json/read-str (json/write-str {:a 1})))))
   (testing "read json"
-    (let [rdr (json/->json-reader (java.io.StringReader. "{\"a\": 1} {\"b\": 2}"))]
-      (is (= {:a 1} (json/read rdr)))
-      #_(is (= {:b 2} (json/read rdr))))))
+    (let [rdr (json/->json-reader (java.io.StringReader. "{\"a\": 1}"))]
+      (is (= {:a 1} (json/read rdr))))
+    (testing "without keywords"
+      (let [rdr (json/->json-reader (java.io.StringReader. "{\"a\": 1}"))]
+        (is (= {"a" 1} (json/read rdr {:key-fn str})))))))
 
 (deftest provider-test
   (let [prop (some-> (System/getProperty "babashka.json.provider") not-empty symbol)]