luciano/monger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #234 from tuliolima/feat/supporting_newer_data_json_versions

Browse source 
Feat: supporting 3-ary clojure.data.json/write in newer versions
This commit is contained in:
Michael Klishin 2024-04-07 21:30:25 -04:00 committed by GitHub
commit 182a3a6f0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
project.clj
View file

@ -36,7 +36,7 @@
:dev {:resource-paths ["test/resources"] :dev {:resource-paths ["test/resources"]
:dependencies [[clj-time "0.15.1" :exclusions [org.clojure/clojure]] :dependencies [[clj-time "0.15.1" :exclusions [org.clojure/clojure]]
[cheshire "5.8.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/tools.cli "0.4.1" :exclusions [org.clojure/clojure]]
[org.clojure/core.cache "0.7.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]] [ring/ring-core "1.7.1" :exclusions [org.clojure/clojure]]

14
src/clojure/monger/json.clj
View file

@ -70,13 +70,19 @@
(try (try
(extend-protocol clojure.data.json/JSONWriter (extend-protocol clojure.data.json/JSONWriter
ObjectId 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 (extend-protocol clojure.data.json/JSONWriter
BSONTimestamp 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 _ (catch Throwable _
false)) false))