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

Add native support for java.time.Duration

Browse source
This commit is contained in:
Peter Taoussanis 2020-11-06 14:06:15 +01:00
parent 5097e16727
commit 6dd21e0e15
2 changed files with 42 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -107,8 +107,10 @@ nippy/stress-data
:ratio 22/7
:uuid (java.util.UUID/randomUUID)
:date (java.util.Date.)
:time-instant (java.time.Instant/now) ; JVM 8+
:time-instant (java.time.Instant/now) ; JVM 8+
:time-duration (java.time.Duration/ofSeconds 100) ; ''
:objects (object-array [1 "two" {:data "data"}])
:stress-record (StressRecord. "data")
@ -117,7 +119,7 @@ nippy/stress-data
;; Serializable
:throwable (Throwable. "Yolo")
:exception (try (/ 1 0) (catch Exception e e))
:ex-info (ex-info "ExInfo" {:data "data"})}
:ex-info (ex-info "ExInfo" {:data "data"})}
```
Serialize it:

45
src/taoensso/nippy.clj
View file

@ -210,7 +210,8 @@
67 :cached-sm
68 :cached-md
79 :time-instant ; JVM 8+
79 :time-instant ; JVM 8+
83 :time-duration ; ''
;;; DEPRECATED (only support thawing)
5 :reader-lg2 ; == :reader-lg, used only for back-compatible thawing
@ -1198,6 +1199,12 @@
(.writeInt out (.getNano x)))
nil)
(enc/compile-if java.time.Duration
(id-freezer java.time.Duration id-time-duration
(.writeLong out (.getSeconds x))
(.writeInt out (.getNano x)))
nil)
(freezer Object
(when-debug (println (str "freeze-fallback: " (type x))))
(if-let [ff *freeze-fallback*]
@ -1675,14 +1682,30 @@
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 :class
:cause :class-not-found
(let [secs (.readLong in)
nanos (.readInt in)]
:class-name "java.time.Instant"
:content {:epoch-second (.readLong in) :nano (.readInt in)}}})
(enc/compile-if java.time.Instant
(java.time.Instant/ofEpochSecond secs nanos)
{:nippy/unthawable
{:type :class
:cause :class-not-found
:class-name "java.time.Instant"
:content {:epoch-second secs :nano nanos}}}))
id-time-duration
(let [secs (.readLong in)
nanos (.readInt in)]
(enc/compile-if java.time.Duration
(java.time.Duration/ofSeconds secs nanos)
{:nippy/unthawable
{:type :class
:cause :class-not-found
:class-name "java.time.Duration"
:content {:seconds secs :nanos nanos}}}))
;; Deprecated ------------------------------------------------------
id-boolean-depr1 (.readBoolean in)
@ -2008,11 +2031,17 @@
:uri (URI. "https://clojure.org/reference/data_structures")
:uuid (java.util.UUID/randomUUID)
:date (java.util.Date.)
:time-instant ; JVM 8+
(enc/compile-if java.time.Instant
(java.time.Instant/now)
nil)
:time-duration ; JVM 8+
(enc/compile-if java.time.Duration
(java.time.Duration/ofSeconds 100 100)
nil)
:objects (object-array [1 "two" {:data "data"}])
:stress-record (StressRecord. "data")