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

NB: Remove (long-deprecated) freezing legacy mode

Browse source
This commit is contained in:
Peter Taoussanis 2015-09-29 11:33:49 +07:00
parent 89c9328596
commit da77b3d582
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/taoensso/nippy.clj
View file

@ -27,7 +27,7 @@
;; { * 1-byte type id. ;; { * 1-byte type id.
;; * Arb-length payload. } ... ;; * Arb-length payload. } ...
;; ;;
;; [1] Inclusion of header is strongly recommended. Purpose: ;; [1] Inclusion of header is *strongly* recommended. Purpose:
;; * Sanity check (confirm that data appears to be Nippy data) ;; * Sanity check (confirm that data appears to be Nippy data)
;; * Nippy version check (=> supports changes to data schema over time) ;; * Nippy version check (=> supports changes to data schema over time)
;; * Supports :auto thaw compressor, encryptor ;; * Supports :auto thaw compressor, encryptor
@ -420,10 +420,7 @@
:or {compressor :auto :or {compressor :auto
encryptor aes128-encryptor} encryptor aes128-encryptor}
:as opts}] :as opts}]
(let [legacy-mode? (:legacy-mode opts) ; DEPRECATED Nippy v1-compatible freeze (let [encryptor (when password encryptor)
compressor (if legacy-mode? snappy-compressor compressor)
encryptor (when password (if-not legacy-mode? encryptor nil))
skip-header? (or skip-header? legacy-mode?)
zero-copy-mode? (and (nil? compressor) (nil? encryptor)) zero-copy-mode? (and (nil? compressor) (nil? encryptor))
baos (ByteArrayOutputStream. 64) baos (ByteArrayOutputStream. 64)
dos (DataOutputStream. baos)] dos (DataOutputStream. baos)]

4
test/taoensso/nippy/tests/main.clj
View file

@ -17,8 +17,8 @@
(expect (do (println (str "Clojure version: " *clojure-version*)) true)) (expect (do (println (str "Clojure version: " *clojure-version*)) true))
(expect test-data ((comp thaw freeze) test-data)) (expect test-data ((comp thaw freeze) test-data))
(expect test-data ((comp #(thaw % {}) (expect test-data ((comp #(thaw % {:compressor nippy/lz4-compressor})
#(freeze % {:legacy-mode true})) #(freeze % {:skip-header? true}))
test-data)) test-data))
(expect test-data ((comp #(thaw % {:password [:salted "p"]}) (expect test-data ((comp #(thaw % {:password [:salted "p"]})
#(freeze % {:password [:salted "p"]})) #(freeze % {:password [:salted "p"]}))