From 14cf506c43d87e7c5ecb0d282a2478f7f049d5c4 Mon Sep 17 00:00:00 2001
From: Gian Merlino <gianmerlino@gmail.com>
Date: Mon, 25 Feb 2013 17:05:01 -0800
Subject: [PATCH] DefaultObjectMapper: Add GuavaModule

---
 common/pom.xml                                            | 8 ++++++--
 .../com/metamx/druid/jackson/DefaultObjectMapper.java     | 2 ++
 pom.xml                                                   | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index ef9c33b67e1..03483c15caa 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -80,8 +80,12 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
+          <groupId>com.fasterxml.jackson.datatype</groupId>
+          <artifactId>jackson-datatype-guava</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.datatype</groupId>
+          <artifactId>jackson-datatype-joda</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jdbi</groupId>
diff --git a/common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java b/common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java
index 293f80d900d..12079a77959 100644
--- a/common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java
+++ b/common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java
@@ -36,6 +36,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.datatype.joda.JodaModule;
 import com.google.common.base.Throwables;
 import com.metamx.common.Granularity;
@@ -171,6 +172,7 @@ public class DefaultObjectMapper extends ObjectMapper
         }
     );
     registerModule(serializerModule);
+    registerModule(new GuavaModule());
 
     configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     configure(MapperFeature.AUTO_DETECT_GETTERS, false);
diff --git a/pom.xml b/pom.xml
index 16d86ae8776..1f1afee50e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,6 +177,11 @@
               <artifactId>jackson-databind</artifactId>
               <version>2.1.4-mmx-2</version>
             </dependency>
+            <dependency>
+              <groupId>com.fasterxml.jackson.datatype</groupId>
+              <artifactId>jackson-datatype-guava</artifactId>
+              <version>2.1.2</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-joda</artifactId>