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

[#135 #128] Add support for java.time.Instant (@cnuernber)

Browse source
This commit is contained in:
Peter Taoussanis 2020-10-24 12:27:53 +02:00
parent 5502e0d479
commit 2203a4800c
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -106,8 +106,12 @@ nippy/stress-data
:ratio 22/7 :ratio 22/7
:uuid (java.util.UUID/randomUUID) :uuid (java.util.UUID/randomUUID)
:date (java.util.Date.) :date (java.util.Date.)
:time-instant (java.time.Instant/now) ; JVM 8+
:objects (object-array [1 "two" {:data "data"}])
:stress-record (StressRecord. "data") :stress-record (StressRecord. "data")
:stress-type (StressType. "data")
;; Serializable ;; Serializable
:throwable (Throwable. "Yolo") :throwable (Throwable. "Yolo")

22
src/taoensso/nippy.clj
View file

@ -210,6 +210,8 @@
67 :cached-sm 67 :cached-sm
68 :cached-md 68 :cached-md
79 :time-instant ; JVM 8+
;;; DEPRECATED (only support thawing) ;;; DEPRECATED (only support thawing)
5 :reader-lg2 ; == :reader-lg, used only for back-compatible thawing 5 :reader-lg2 ; == :reader-lg, used only for back-compatible thawing
1 :reader-depr1 ; v0.9.2 for +64k support 1 :reader-depr1 ; v0.9.2 for +64k support
@ -1190,6 +1192,12 @@
(-freeze-without-meta! fvalue out)))) (-freeze-without-meta! fvalue out))))
basis)))) basis))))
(enc/compile-if java.time.Instant
(id-freezer java.time.Instant id-time-instant
(.writeLong out (.getEpochSecond x))
(.writeInt out (.getNano x)))
nil)
(freezer Object (freezer Object
(when-debug (println (str "freeze-fallback: " (type x)))) (when-debug (println (str "freeze-fallback: " (type x))))
(if-let [ff *freeze-fallback*] (if-let [ff *freeze-fallback*]
@ -1666,6 +1674,15 @@
id-uri (URI. (thaw-from-in! in)) id-uri (URI. (thaw-from-in! in))
id-uuid (UUID. (.readLong in) (.readLong in)) id-uuid (UUID. (.readLong in) (.readLong in))
id-time-instant
(enc/compile-if java.time.Instant
(java.time.Instant/ofEpochSecond (.readLong in) (.readInt in))
{:nippy/unthawable
{:type :time-instant
:cause :needs-jvm8+
:class-name "java.time.Instant"
:content {:epoch-second (.readLong in) :nano (.readInt in)}}})
;; Deprecated ------------------------------------------------------ ;; Deprecated ------------------------------------------------------
id-boolean-depr1 (.readBoolean in) id-boolean-depr1 (.readBoolean in)
id-sorted-map-depr1 (read-kvs-depr1 (sorted-map) in) id-sorted-map-depr1 (read-kvs-depr1 (sorted-map) in)
@ -1990,6 +2007,11 @@
:uri (URI. "https://clojure.org/reference/data_structures") :uri (URI. "https://clojure.org/reference/data_structures")
:uuid (java.util.UUID/randomUUID) :uuid (java.util.UUID/randomUUID)
:date (java.util.Date.) :date (java.util.Date.)
:time-instant ; JVM 8+
(enc/compile-if java.time.Instant
(java.time.Instant/now)
nil)
:objects (object-array [1 "two" {:data "data"}]) :objects (object-array [1 "two" {:data "data"}])
:stress-record (StressRecord. "data") :stress-record (StressRecord. "data")