Merge pull request #234 from tuliolima/feat/supporting_newer_data_jso…

…n_versions Feat: supporting 3-ary clojure.data.json/write in newer versions
michaelklishin · Apr 8, 2024 · 182a3a6 · 182a3a6
2 parents 84170f7 + 5852a5f
commit 182a3a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/project.clj b/project.clj
@@ -36,7 +36,7 @@
              :dev {:resource-paths ["test/resources"]
                    :dependencies  [[clj-time               "0.15.1" :exclusions [org.clojure/clojure]]
                                    [cheshire               "5.8.1" :exclusions [org.clojure/clojure]]
-                                   [org.clojure/data.json  "0.2.6" :exclusions [org.clojure/clojure]]
+                                   [org.clojure/data.json  "2.5.0" :exclusions [org.clojure/clojure]]
                                    [org.clojure/tools.cli  "0.4.1" :exclusions [org.clojure/clojure]]
                                    [org.clojure/core.cache "0.7.1" :exclusions [org.clojure/clojure]]
                                    [ring/ring-core         "1.7.1" :exclusions [org.clojure/clojure]]

diff --git a/src/clojure/monger/json.clj b/src/clojure/monger/json.clj
@@ -70,13 +70,19 @@
             (try
               (extend-protocol clojure.data.json/JSONWriter
                 ObjectId
-                (-write [^ObjectId object out]
+                (-write
-                  (clojure.data.json/write (.toString object) out)))
+                  ([^ObjectId object out]
+                   (clojure.data.json/write (.toString object) out))
+                  ([^ObjectId object out options]
+                   (clojure.data.json/write (.toString object) out options))))
 
               (extend-protocol clojure.data.json/JSONWriter
                 BSONTimestamp
-                  (-write [^BSONTimestamp object out]
+                (-write
-                    (clojure.data.json/write {:time (.getTime object) :inc (.getInc object)} out)))
+                  ([^BSONTimestamp object out]
+                   (clojure.data.json/write {:time (.getTime object) :inc (.getInc object)} out))
+                  ([^BSONTimestamp object out options]
+                   (clojure.data.json/write {:time (.getTime object) :inc (.getInc object)} out options))))
 
               (catch Throwable _
                 false))