march_hare 2.21.0-java → 2.22.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 028be0b1555a16e2fb8b74494c70ab50911fe2bc
-  data.tar.gz: a9ea1d2d1959eec838b0c47bea9c69ebfa3716b7
+  metadata.gz: a889247b3117153a7ad84bd1ec2e4782e3d6a2ee
+  data.tar.gz: 9351d6dc9dfeae13a3d69c7cf0cfa4db2e83d4b8
 SHA512:
-  metadata.gz: 1a28e14c1594711de0ca9909465197868a534a79fcc97911983930d533297e96becfd93335129ed95660c9156414a499f114306af4a61303f2534d1e81ef708e
-  data.tar.gz: 1d66a5bea34d3c78914eeed8956b0b0887b118d0a51fc88ecce4d9dc757883e31b4991b13de6def6d8813c058df4838d0e433aa162ff94bcea233171d98940f0
+  metadata.gz: b0adce10eeff54a014a666f1df771ab98488515cd3c8b723cae40004db9e937de6df1a11c3665953e73df01542a50e388308f1ba0ba36dfc4461c26931740603
+  data.tar.gz: e0ab94b741fb34fc7ce7a676a0befeabb18acc88120547105ad151e17db783db1221a2bb9879d17829dad427d55b5de3a69e35b90a34af671082846bcf08c738

data/lib/march_hare/channel.rb

@@ -813,7 +813,7 @@ module MarchHare
     # Waits until all outstanding publisher confirms arrive.
     #
     # Takes an optional timeout in milliseconds. Will raise
-    # an exception in timeout has occured.
+    # an exception in case a timeout has occured.
     #
     # @param [Integer] timeout Timeout in milliseconds
     # @return [Boolean] true if all confirms were positive,

data/lib/march_hare/metadata.rb

@@ -43,7 +43,6 @@ module MarchHare
         :content_encoding,
         :content_type,
         :content_encoding,
-        :headers,
         :delivery_mode,
         :priority,
         :correlation_id,
@@ -60,6 +59,10 @@ module MarchHare
       end # each
     end
 
+    def headers
+      deep_normalize_headers(@properties.headers)
+    end
+
     def persistent?
       delivery_mode == 2
     end
@@ -71,6 +74,25 @@ module MarchHare
     def redelivery?
       redeliver
     end
+
+    # Turns LongString instances into String
+    private
+    LONG_STRING_TYPE = com.rabbitmq.client.LongString
+    def deep_normalize_headers(value)
+      if value.is_a?(java.util.Map)
+        new_map = {}
+        value.each {|k,v| new_map[k] = deep_normalize_headers(v)}
+        new_map
+      elsif value.is_a?(java.util.List)
+        value.map {|v| deep_normalize_headers(v)}
+      else
+        if value.java_kind_of?(LONG_STRING_TYPE)
+          value.to_s
+        else
+          value
+        end
+      end
+    end
   end # Headers
 
 

data/lib/march_hare/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module MarchHare
-  VERSION = "2.21.0"
+  VERSION = "2.22.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.22.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-01-14 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email: