Upgrade jackson and jersey

hraven-core/pom.xml

@@ -29,7 +29,7 @@
   <version>0.9.16-SNAPSHOT</version>
   <name>hRaven - core</name>
   <description>Core components of hRaven, including model classes and data access layer</description>
- 
+
   <properties>
     <jetty.version>6.1.26</jetty.version>
   </properties>
@@ -277,8 +277,12 @@
           <groupId>oro</groupId>
           <artifactId>oro</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-mapper-asl</artifactId>
+        </exclusion>
       </exclusions>
-    </dependency> 
+    </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase</artifactId>
@@ -334,23 +338,28 @@
       <version>${jersey.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
       <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
       <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-jaxrs</artifactId>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId> jackson-jaxrs-json-provider</artifactId>
       <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-xc</artifactId>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jaxb-annotations</artifactId>
       <version>${jackson.version}</version>
     </dependency>
     <dependency>
@@ -370,8 +379,14 @@
       <artifactId>hadoop-test</artifactId>
       <version>${hadoop.version}</version>
       <scope>test</scope>
+        <exclusions>
+        <exclusion>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+        </exclusion>
+    </exclusions>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase</artifactId>

hraven-core/src/main/java/com/twitter/hraven/AppKey.java

@@ -16,10 +16,11 @@
 
 package com.twitter.hraven;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang.builder.CompareToBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
+
 
 public class AppKey implements Comparable<Object> {
 

hraven-core/src/main/java/com/twitter/hraven/AppSummary.java

@@ -19,7 +19,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 
 import com.twitter.hraven.datasource.ProcessingException;
 

hraven-core/src/main/java/com/twitter/hraven/ClientObjectMapper.java

@@ -18,13 +18,14 @@
 import java.io.IOException;
 
 import org.apache.hadoop.conf.Configuration;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.JsonDeserializer;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.deser.CustomDeserializerFactory;
-import org.codehaus.jackson.map.deser.StdDeserializerProvider;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
 
 /**
  * Custom Jackson ObjectMapper factory that knows how to deserialize json back into objects. This
@@ -38,12 +39,11 @@ public class ClientObjectMapper {
 
   public static ObjectMapper createCustomMapper() {
     ObjectMapper result = new ObjectMapper();
-    CustomDeserializerFactory deserializerFactory = new CustomDeserializerFactory();
-
-    deserializerFactory.addSpecificMapping(Configuration.class, new ConfigurationDeserializer());
-    deserializerFactory.addSpecificMapping(CounterMap.class, new CounterDeserializer());
-
-    result.setDeserializerProvider(new StdDeserializerProvider(deserializerFactory));
+    SimpleModule module = new SimpleModule("Custom JsonDeserializer", new Version(1, 0, 0,
+        "FINAL", null, null));
+    module.addDeserializer(Configuration.class, new ConfigurationDeserializer());
+    module.addDeserializer(CounterMap.class, new CounterDeserializer());
+    result.registerModule(module);
     return result;
   } 
 

hraven-core/src/main/java/com/twitter/hraven/CounterMap.java

@@ -21,7 +21,8 @@
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 
 @JsonSerialize(
   include=JsonSerialize.Inclusion.NON_NULL

hraven-core/src/main/java/com/twitter/hraven/Flow.java

@@ -18,9 +18,9 @@
 import org.apache.commons.lang.builder.CompareToBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 import java.util.ArrayList;
 import java.util.List;

hraven-core/src/main/java/com/twitter/hraven/FlowKey.java

@@ -17,8 +17,9 @@
 
 import org.apache.commons.lang.builder.CompareToBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 
 public class FlowKey extends AppKey implements Comparable<Object> {
 

hraven-core/src/main/java/com/twitter/hraven/HdfsStats.java

@@ -20,7 +20,7 @@
 import org.apache.commons.lang.builder.CompareToBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.hadoop.hbase.client.Result;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 
 /**

hraven-core/src/main/java/com/twitter/hraven/HdfsStatsKey.java

@@ -16,8 +16,8 @@
 package com.twitter.hraven;
 import org.apache.commons.lang.builder.CompareToBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Represents a unique hdfs stats record

hraven-core/src/main/java/com/twitter/hraven/JobDetails.java

@@ -28,11 +28,11 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.apache.commons.lang.NotImplementedException;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.twitter.hraven.datasource.JobHistoryService;
 
 /**

hraven-core/src/main/java/com/twitter/hraven/JobId.java

@@ -17,8 +17,9 @@
 
 import org.apache.commons.lang.builder.CompareToBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Job identifier with individual elements of the jobtracker assigned ID parsed

hraven-core/src/main/java/com/twitter/hraven/JobKey.java

@@ -17,8 +17,9 @@
 
 import org.apache.commons.lang.builder.CompareToBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Represents the row key for a given job. Row keys are stored as: username !

hraven-core/src/main/java/com/twitter/hraven/QualifiedJobId.java

@@ -15,8 +15,9 @@
 */
 package com.twitter.hraven;
 
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * The job ID should be relatively unique, unless two clusters start at the same

hraven-core/src/main/java/com/twitter/hraven/QualifiedPathKey.java

@@ -18,7 +18,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.CompareToBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 /**
  * The cluster + path qualifier for hdfs stats

hraven-core/src/main/java/com/twitter/hraven/TaskDetails.java

@@ -22,11 +22,11 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
 
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.twitter.hraven.datasource.JobHistoryService;
 
 /**

hraven-core/src/main/java/com/twitter/hraven/TaskKey.java

@@ -17,9 +17,10 @@
 
 import org.apache.commons.lang.builder.CompareToBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 
 /**

hraven-core/src/main/java/com/twitter/hraven/rest/ObjectMapperProvider.java

@@ -15,6 +15,7 @@
 */
 package com.twitter.hraven.rest;
 
+
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
@@ -23,17 +24,17 @@
 import javax.ws.rs.ext.Provider;
 
 import org.apache.hadoop.conf.Configuration;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.Version;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig.Feature;
-import org.codehaus.jackson.map.SerializerProvider;
-import org.codehaus.jackson.map.module.SimpleModule;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.base.Predicate;
 import com.twitter.hraven.AppSummary;
 import com.twitter.hraven.Constants;
@@ -65,7 +66,7 @@ public ObjectMapper getContext(Class<?> type) {
 
   public static ObjectMapper createCustomMapper() {
     ObjectMapper result = new ObjectMapper();
-    result.configure(Feature.INDENT_OUTPUT, true);
+    result.configure(SerializationFeature.INDENT_OUTPUT, true);
     SimpleModule module = new SimpleModule("hRavenModule", new Version(0, 4, 0, null));
     addJobMappings(module);
     module.addSerializer(Flow.class, new FlowSerializer());

hraven-core/src/main/java/com/twitter/hraven/rest/client/HRavenRestClient.java

@@ -27,9 +27,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.twitter.hraven.Flow;
 import com.twitter.hraven.JobDetails;
 import com.twitter.hraven.TaskDetails;

hraven-core/src/main/java/com/twitter/hraven/rest/client/UrlDataLoader.java

@@ -8,8 +8,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.codehaus.jackson.type.TypeReference;
 
+
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.twitter.hraven.util.JSONUtil;
 
 class UrlDataLoader<T> {

hraven-core/src/main/java/com/twitter/hraven/util/JSONUtil.java

@@ -20,11 +20,10 @@
 import java.io.PrintWriter;
 import java.io.Writer;
 
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.type.TypeReference;
-
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.twitter.hraven.ClientObjectMapper;
 import com.twitter.hraven.rest.ObjectMapperProvider;
 
@@ -44,8 +43,8 @@ public class JSONUtil {
   public static void writeJson(Writer writer, Object object) throws IOException {
     ObjectMapper om = ObjectMapperProvider.createCustomMapper();
 
-    om.configure(SerializationConfig.Feature.INDENT_OUTPUT, true);
-    om.configure(SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS, false);
+    om.configure(SerializationFeature.INDENT_OUTPUT, true);
+    om.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 
     writer.write(om.writeValueAsString(object));
     writer.write("\n");
@@ -58,8 +57,7 @@ public static void writeJson(String fileName, Object object) throws IOException
 
   public static Object readJson(InputStream inputStream, TypeReference type) throws IOException {
     ObjectMapper om = ClientObjectMapper.createCustomMapper();
-    om.getDeserializationConfig().set(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES,
-      false);
+    om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     return om.readValue(inputStream, type);
   }
 }