From 9f75df63f34d469ae27ab965425f0f0cebc6b984 Mon Sep 17 00:00:00 2001
From: fjy <fangjinyang@gmail.com>
Date: Sun, 19 Oct 2014 16:38:21 -0700
Subject: [PATCH] fix more things

---
 rabbitmq/pom.xml                              | 11 ++---
 .../JacksonifiedConnectionFactory.java        | 40 +++++++++++++------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml
index e0d2e693414..a35f3b16c15 100644
--- a/rabbitmq/pom.xml
+++ b/rabbitmq/pom.xml
@@ -18,11 +18,6 @@
             <groupId>io.druid</groupId>
             <artifactId>druid-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.druid</groupId>
-            <artifactId>druid-processing</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.rabbitmq</groupId>
             <artifactId>amqp-client</artifactId>
@@ -45,5 +40,11 @@
             <artifactId>commons-cli</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.druid</groupId>
+            <artifactId>druid-processing</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java b/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java
index a4a39bcc9cd..28f1d0d14d1 100644
--- a/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java
+++ b/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/JacksonifiedConnectionFactory.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Maps;
 import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.LongString;
 
 import java.util.Map;
 
@@ -37,6 +38,24 @@ public class JacksonifiedConnectionFactory extends ConnectionFactory
     return new JacksonifiedConnectionFactory(null, 0, null, null, null, null, 0, 0, 0, 0, null);
   }
 
+  private static Map<String, Object> getSerializableClientProperties(final Map<String, Object> clientProperties)
+  {
+    return Maps.transformEntries(
+        clientProperties,
+        new Maps.EntryTransformer<String, Object, Object>()
+        {
+          @Override
+          public Object transformEntry(String key, Object value)
+          {
+            if (value instanceof LongString) {
+              return value.toString();
+            }
+            return value;
+          }
+        }
+    );
+  }
+
   private final String host;
   private final int port;
   private final String username;
@@ -164,19 +183,9 @@ public class JacksonifiedConnectionFactory extends ConnectionFactory
   }
 
   @JsonProperty("clientProperties")
-  public Map<String, Object> getClientPropertiesForSerde()
+  public Map<String, Object> getSerializableClientProperties()
   {
-    return Maps.transformEntries(
-        super.getClientProperties(),
-        new Maps.EntryTransformer<String, Object, Object>()
-        {
-          @Override
-          public Object transformEntry(String key, Object value)
-          {
-            return value.toString();
-          }
-        }
-    );
+    return getSerializableClientProperties(clientProperties);
   }
 
   @Override
@@ -206,7 +215,12 @@ public class JacksonifiedConnectionFactory extends ConnectionFactory
     if (requestedHeartbeat != that.requestedHeartbeat) {
       return false;
     }
-    if (clientProperties != null ? Maps.difference(clientProperties, that.clientProperties).areEqual() : that.clientProperties != null) {
+    if (clientProperties != null
+        ? !Maps.difference(
+        getSerializableClientProperties(clientProperties),
+        getSerializableClientProperties(that.clientProperties)
+    ).areEqual()
+        : that.clientProperties != null) {
       return false;
     }
     if (host != null ? !host.equals(that.host) : that.host != null) {