From da77b3d5826380288bd133ceb2eccd29374e87a9 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Tue, 29 Sep 2015 11:33:49 +0700 Subject: [PATCH] NB: Remove (long-deprecated) freezing legacy mode --- src/taoensso/nippy.clj | 7 ++----- test/taoensso/nippy/tests/main.clj | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/taoensso/nippy.clj b/src/taoensso/nippy.clj index e9e4c5d..89eaa34 100644 --- a/src/taoensso/nippy.clj +++ b/src/taoensso/nippy.clj @@ -27,7 +27,7 @@ ;; { * 1-byte type id. ;; * 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) ;; * Nippy version check (=> supports changes to data schema over time) ;; * Supports :auto thaw compressor, encryptor @@ -420,10 +420,7 @@ :or {compressor :auto encryptor aes128-encryptor} :as opts}] - (let [legacy-mode? (:legacy-mode opts) ; DEPRECATED Nippy v1-compatible freeze - compressor (if legacy-mode? snappy-compressor compressor) - encryptor (when password (if-not legacy-mode? encryptor nil)) - skip-header? (or skip-header? legacy-mode?) + (let [encryptor (when password encryptor) zero-copy-mode? (and (nil? compressor) (nil? encryptor)) baos (ByteArrayOutputStream. 64) dos (DataOutputStream. baos)] diff --git a/test/taoensso/nippy/tests/main.clj b/test/taoensso/nippy/tests/main.clj index d060abf..a05e17a 100644 --- a/test/taoensso/nippy/tests/main.clj +++ b/test/taoensso/nippy/tests/main.clj @@ -17,8 +17,8 @@ (expect (do (println (str "Clojure version: " *clojure-version*)) true)) (expect test-data ((comp thaw freeze) test-data)) -(expect test-data ((comp #(thaw % {}) - #(freeze % {:legacy-mode true})) +(expect test-data ((comp #(thaw % {:compressor nippy/lz4-compressor}) + #(freeze % {:skip-header? true})) test-data)) (expect test-data ((comp #(thaw % {:password [:salted "p"]}) #(freeze % {:password [:salted "p"]}))