Merge pull request #3 from tmatyashovsky/jackson-upgrade-PR

Upgraded to jackson 2.2.2

Author: tbronder

pom.xml

@@ -8,7 +8,7 @@
     <groupId>com.opower.unitsofmeasure</groupId>
     <artifactId>jackson-module-unitsofmeasure</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.1</version>
+    <version>1.1.0</version>
 
     <name>Jackson Unit of Measure Module</name>
     <description>Contains custom serializers and deserializers for org.unitsofmeasure classes.</description>
@@ -41,14 +41,14 @@
         <!-- Jackson library for JSON-parsing                                                                            -->
         <!-- =========================================================================================================== -->
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-            <version>1.9.7</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.2.2</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.7</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.2.2</version>
         </dependency>
 
         <dependency>

src/main/java/com/opower/unitsofmeasure/UnitJacksonModule.java

@@ -3,15 +3,16 @@
 import java.io.IOException;
 import java.text.ParsePosition;
 
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.Version;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.SerializerProvider;
-import org.codehaus.jackson.map.deser.std.StdScalarDeserializer;
-import org.codehaus.jackson.map.module.SimpleModule;
-import org.codehaus.jackson.map.ser.std.ScalarSerializerBase;
+import com.fasterxml.jackson.core.JsonGenerator;
+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.SerializerProvider;
+import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
+
 import org.jscience.physics.unit.formats.UCUMFormat;
 import org.unitsofmeasurement.unit.Unit;
 
@@ -27,7 +28,7 @@ public UnitJacksonModule() {
         addDeserializer(Unit.class, new UnitJsonDeserializer());
     }
 
-    private class UnitJsonSerializer extends ScalarSerializerBase<Unit> {
+    private class UnitJsonSerializer extends StdScalarSerializer<Unit> {
         protected UnitJsonSerializer() {
             super(Unit.class);
         }
@@ -61,8 +62,8 @@ public Unit deserialize(JsonParser jsonParser, DeserializationContext deserializ
                 return UCUMFormat.getCaseInsensitiveInstance().parse(jsonParser.getText(), new ParsePosition(0));
             }
             throw deserializationContext.wrongTokenException(jsonParser,
-                                                             JsonToken.VALUE_STRING,
-                                                             "Expected unit value in String format");
+                    JsonToken.VALUE_STRING,
+                    "Expected unit value in String format");
         }
     }
 }

src/test/java/com/opower/unitsofmeasure/TestUnitJacksonModule.java

@@ -3,14 +3,15 @@
 import java.io.IOException;
 import java.io.StringWriter;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.jscience.physics.unit.SI;
 import org.jscience.physics.unit.UCUM;
 import org.unitsofmeasurement.unit.Unit;
@@ -42,14 +43,14 @@ public void testSerializeArea() throws Exception {
     @Test
     public void testSerializeTemperature() throws Exception {
         assertEquals("Expected JSON with a UCUM representation of the temperature unit",
-                     "\"[degF]\"", serialize(UCUM.FAHRENHEIT));
+                "\"[degF]\"", serialize(UCUM.FAHRENHEIT));
         assertEquals("Expected JSON with a UCUM representation of the temperature unit",
-                     "\"Cel\"", serialize(SI.CELSIUS));
+                "\"Cel\"", serialize(SI.CELSIUS));
     }
     @Test
     public void testSerializeLength() throws Exception {
         assertEquals("Expected JSON with a UCUM representation of the length unit",
-                     "\"[mi_i]\"", serialize(UCUM.MILE_INTERNATIONAL));
+                "\"[mi_i]\"", serialize(UCUM.MILE_INTERNATIONAL));
 
         assertEquals("Expected JSON with a UCUM representation of the length unit", "\"km\"", serialize(KILO(SI.METRE)));
     }