Nippy thaw to return a message map instead of defrecord

gojek · Aug 13, 2021 · 6dfcb14 · 6dfcb14
1 parent 863e5cd
commit 6dfcb14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/ziggurat/messaging/consumer.clj b/src/ziggurat/messaging/consumer.clj
@@ -19,7 +19,8 @@
 (defn- nippy-deserialize
   [frozen]
   (try
-    (nippy/thaw frozen)
+    (let [thaw (nippy/thaw frozen)]
+      (into {} thaw))                                       ;Converting defrecord into map, since proto does not understand defrecord
     (catch Exception e
       (log/error e "Failed to deserialize nippy message"))))
 

diff --git a/test/ziggurat/messaging/consumer_test.clj b/test/ziggurat/messaging/consumer_test.clj
@@ -329,16 +329,16 @@
             converted-message-payload        (consumer/convert-and-ack-message nil {:delivery-tag 1} proto-serialized-message-payload false "default")]
         (is (= "class [B" (str (type (:message converted-message-payload)))))
         (is (= (bytes-to-str converted-message-payload) (bytes-to-str message-payload)))))
-    (testing "should return a ziggurat.message_payload/->MessagePayload if serialized using nippy"
-      (let [expected-message-payload         (assoc (zmp/->MessagePayload proto-message topic-entity) :retry-count 4)
-            nippy-serialized-message-payload (nippy/freeze expected-message-payload)
+    (testing "should return a map and not ziggurat.message_payload/->MessagePayload if original message was a ziggurat.message_payload/->MessagePayload and serialized using nippy"
+      (let [nippy-message-payload         (assoc (zmp/->MessagePayload proto-message topic-entity) :retry-count 3)
+            nippy-serialized-message-payload (nippy/freeze nippy-message-payload)
             converted-message-payload        (consumer/convert-and-ack-message nil {:delivery-tag 1} nippy-serialized-message-payload false "default")]
-        (is (= (bytes-to-str converted-message-payload) (bytes-to-str expected-message-payload)))))
-    (testing "should return a ziggurat.mapper/->MessagePayload if serialized using nippy"
-      (let [expected-message-payload         (assoc (mpr/->MessagePayload proto-message topic-entity) :retry-count 4)
-            nippy-serialized-message-payload (nippy/freeze expected-message-payload)
+        (is (= (bytes-to-str converted-message-payload) (bytes-to-str message-payload)))))
+    (testing "should return a map and not ziggurat.mapper/->MessagePayload if original message was a ziggurat.mapper/->MessagePayload and serialized using nippy"
+      (let [nippy-message-payload         (assoc (mpr/->MessagePayload proto-message topic-entity) :retry-count 3)
+            nippy-serialized-message-payload (nippy/freeze nippy-message-payload)
             converted-message-payload        (consumer/convert-and-ack-message nil {:delivery-tag 1} nippy-serialized-message-payload false "default")]
-        (is (= (bytes-to-str converted-message-payload) (bytes-to-str expected-message-payload)))))
+        (is (= (bytes-to-str converted-message-payload) (bytes-to-str message-payload)))))
     (testing "should return a clojure map if serialized using nippy"
       (let [random-bytes-as-message-payload     (.getBytes (String. "Hello World"))
             converted-message-payload           (consumer/convert-and-ack-message nil {:delivery-tag 1} random-bytes-as-message-payload false "default")]