Merge pull request xively#16 from paulbellamy/byte-array-will-payload

parse will payload as byte array not string

README.md

@@ -11,7 +11,7 @@ In the project.clj file at the top level of your project, add clj-mqtt as a depe
 ```clj
 (defproject my-project "1.0.0"
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [clj-mqtt "0.4.0-alpha"]])
+                 [clj-mqtt "0.4.1-alpha"]])
 ```
 
 ## Documentation

project.clj

@@ -1,4 +1,4 @@
-(defproject clj-mqtt "0.4.0-alpha"
+(defproject clj-mqtt "0.4.1-alpha"
 
   :description "Clojure MQTT Codec for Netty"
 

src/mqtt/decoding_utils.clj

@@ -52,10 +52,19 @@
   [in & kvs]
   (do-parse-flags (parse-unsigned-byte in) {} 8 kvs))
 
+(defn parse-short-prefixed-bytes
+  "Decode a short, then as many bytes as the short says."
+  [^ByteBuf in]
+  (let [len (int (parse-unsigned-short in))]
+    (assert-readable-bytes in len)
+    (let [bs (byte-array len)]
+      (.readBytes in bs)
+      bs)))
+
 (defn parse-string
   "Decode a utf-8 encoded string. Strings are preceeded by 2 bytes describing
   the length of the remaining content."
   [^ByteBuf in]
   (let [len (int (parse-unsigned-short in))]
     (assert-readable-bytes in len)
-    (.toString (.readBytes in len) (Charset/forName "UTF-8"))))
+    (.toString (.readSlice in len) (Charset/forName "UTF-8"))))

src/mqtt/packets/connect.clj

@@ -103,7 +103,7 @@
 (defn- decode-will-payload
   [{:keys [has-will] :as packet} in]
   (if has-will
-    (assoc packet :will-payload (parse-string in))
+    (assoc packet :will-payload (parse-short-prefixed-bytes in))
     packet))
 
 (defn- decode-username

test/mqtt/packets/connect_test.clj

@@ -207,7 +207,7 @@
         (is (= "topic" (:will-topic decoded))))
 
       (testing "should set the payload of the will packet"
-        (is (= "hello" (:will-payload decoded))))))
+        (is (= "hello" (String. (:will-payload decoded)))))))
 
   (testing "when parsing a Connect packet with a username and password"
     (let [decoder (make-decoder)
@@ -375,7 +375,7 @@
         (is (= "will_topic" (:will-topic decoded))))
 
       (testing "should set the will payload"
-        (is (= "will_payload" (:will-payload decoded))))
+        (is (= "will_payload" (String. (:will-payload decoded)))))
 
       (testing "should have a username"
         (is (= "user0123456789" (:username decoded))))