Support Jackson 1.x. Specifically 1.9.2+.

Author: swquinn

pom.xml

@@ -11,50 +11,43 @@
   <groupId>com.fasterxml.jackson.datatype</groupId>
   <artifactId>jackson-datatype-json-lib</artifactId>
   <name>Jackson-datatype-json-lib</name>
-  <version>2.2.3</version>
+  <version>1.9.2</version>
+  <packaging>jar</packaging>
   <description>Support for datatypes of "net.sf.json" JSON library (see http://json-lib.sourceforge.net),
 mainly to make it easier to upgrade code to Jackson, using automated conversions.
   </description>
   <url>http://wiki.fasterxml.com/JacksonModuleProjects</url>
-  <packaging>jar</packaging>
   <scm>
     <connection>scm:git:[email protected]:swquinn/jackson-datatype-json-lib.git</connection>
     <developerConnection>scm:git:[email protected]:swquinn/jackson-datatype-json-lib.git</developerConnection>
     <url>https://github.com/swquinn/jackson-datatype-json-lib</url>    
-    <tag>jackson-datatype-json-lib-2.2.3</tag>
+    <tag>jackson-datatype-json-lib-1.9.2</tag>
   </scm>
   <properties>
-    <version.jackson>2.2.3</version.jackson>
+    <version.jackson>1.9.2</version.jackson>
+
     <!-- Generate PackageVersion.java into this directory. -->
     <packageVersion.dir>com/fasterxml/jackson/datatype/jsonlib</packageVersion.dir>
     <packageVersion.package>${project.groupId}.jsonlib</packageVersion.package>
-    <osgi.import>com.fasterxml.jackson.core
-,com.fasterxml.jackson.core.util
-,com.fasterxml.jackson.databind
-,com.fasterxml.jackson.databind.deser
-,com.fasterxml.jackson.databind.deser.std
-,com.fasterxml.jackson.databind.jsontype
-,com.fasterxml.jackson.databind.module
-,com.fasterxml.jackson.databind.node
-,com.fasterxml.jackson.databind.ser
-,com.fasterxml.jackson.databind.ser.std
+    <osgi.import>org.codehaus.jackson
+,org.codehaus.jackson.map
+,org.codehaus.jackson.map.deser
+,org.codehaus.jackson.map.module
+,org.codehaus.jackson.map.ser
+,org.codehaus.jackson.node
 ,net.sf.json
     </osgi.import>
     <osgi.export>${project.groupId}.jsonlib.*;version=${project.version}</osgi.export>
   </properties>
 
   <dependencies>
-    <!-- Extends Jackson mapper, 2.x -->
+    <!-- Extends Jackson mapper; tested to work with 1.9 or above -->
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${version.jackson}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>${version.jackson}</version>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.9.2</version>
     </dependency>
+
     <!-- And support net.sf.json-lib/java types -->
     <dependency>
       <groupId>net.sf.json-lib</groupId>

src/main/java/com/fasterxml/jackson/datatype/jsonlib/JSONArrayDeserializer.java

@@ -21,11 +21,11 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonProcessingException;
+import org.codehaus.jackson.JsonToken;
+import org.codehaus.jackson.map.DeserializationContext;
+import org.codehaus.jackson.map.deser.std.StdDeserializer;
 
 /**
  * A datatype deserializer for the JSON-Lib {@link JSONArray} object.

src/main/java/com/fasterxml/jackson/datatype/jsonlib/JSONArraySerializer.java

@@ -23,12 +23,12 @@
 import net.sf.json.JSONObject;
 import net.sf.json.util.JSONUtils;
 
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.SerializerProvider;
+import org.codehaus.jackson.map.TypeSerializer;
 
 public class JSONArraySerializer extends JSONBaseSerializer<JSONArray>
 {

src/main/java/com/fasterxml/jackson/datatype/jsonlib/JSONBaseSerializer.java

@@ -16,9 +16,9 @@
  */
 package com.fasterxml.jackson.datatype.jsonlib;
 
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.codehaus.jackson.map.ser.std.SerializerBase;
 
-abstract class JSONBaseSerializer<T> extends StdSerializer<T>
+abstract class JSONBaseSerializer<T> extends SerializerBase<T>
 {
     protected JSONBaseSerializer(Class<T> cls) { super(cls); }
 }

src/main/java/com/fasterxml/jackson/datatype/jsonlib/JSONObjectDeserializer.java

@@ -19,14 +19,13 @@
 import java.io.IOException;
 
 import net.sf.json.JSONException;
-import net.sf.json.JSONNull;
 import net.sf.json.JSONObject;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonProcessingException;
+import org.codehaus.jackson.JsonToken;
+import org.codehaus.jackson.map.DeserializationContext;
+import org.codehaus.jackson.map.deser.std.StdDeserializer;
 
 public class JSONObjectDeserializer extends StdDeserializer<JSONObject>
 {

src/main/java/com/fasterxml/jackson/datatype/jsonlib/JSONObjectSerializer.java

@@ -25,13 +25,13 @@
 import net.sf.json.JSONObject;
 import net.sf.json.util.JSONUtils;
 
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.SerializationConfig;
+import org.codehaus.jackson.map.SerializerProvider;
+import org.codehaus.jackson.map.TypeSerializer;
 
 public class JSONObjectSerializer extends JSONBaseSerializer<JSONObject>
 {
@@ -81,7 +81,7 @@ protected void serializeContents(JSONObject value, JsonGenerator jgen, Serialize
                 throw new JsonGenerationException(e);
             }
             if (ob == null || JSONUtils.isNull(ob)) {
-                if (provider.isEnabled(SerializationFeature.WRITE_NULL_MAP_VALUES)) {
+                if (provider.isEnabled(SerializationConfig.Feature.WRITE_NULL_MAP_VALUES)) {
                     jgen.writeNullField(key);
                 }
                 continue;

src/main/java/com/fasterxml/jackson/datatype/jsonlib/JsonLibModule.java

@@ -19,14 +19,16 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
-import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.codehaus.jackson.Version;
+import org.codehaus.jackson.map.module.SimpleModule;
 
 public class JsonLibModule extends SimpleModule
 {
-    private static final long serialVersionUID = 1;
-
     private final static String NAME = "JsonLibModule";
-    
+
+    // Should externalize this somehow
+    private final static Version VERSION = new Version(1, 9, 2, null);
+
     /*
     /**********************************************************
     /* Life-cycle
@@ -35,6 +37,7 @@ public class JsonLibModule extends SimpleModule
 
     public JsonLibModule()
     {
+        //super(NAME, VERSION);
         super(NAME, PackageVersion.VERSION);
         addDeserializer(JSONArray.class, JSONArrayDeserializer.instance);
         addDeserializer(JSONObject.class, JSONObjectDeserializer.instance);

src/main/java/com/fasterxml/jackson/datatype/jsonlib/PackageVersion.java.in

@@ -16,21 +16,21 @@
  */
 package @package@;
 
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.core.Versioned;
-import com.fasterxml.jackson.core.util.VersionUtil;
+import org.codehaus.jackson.Version;
+import org.codehaus.jackson.Versioned;
+import org.codehaus.jackson.util.VersionUtil;
 
 /**
  * Automatically generated from PackageVersion.java.in during
  * packageVersion-generate execution of maven-replacer-plugin in
  * pom.xml.
  */
 public final class PackageVersion implements Versioned {
-    public final static Version VERSION = VersionUtil.parseVersion(
-        "@projectversion@", "@projectgroupid@", "@projectartifactid@");
 
-    @Override
+    public final static Version VERSION = VersionUtil.parseVersion("@projectversion@");
+        
+	@Override
     public Version version() {
         return VERSION;
-    }
+    }    
 }

src/test/java/com/fasterxml/jackson/datatype/jsonlib/SimpleReadTest.java

@@ -17,11 +17,10 @@
 package com.fasterxml.jackson.datatype.jsonlib;
 
 import net.sf.json.JSONArray;
-import net.sf.json.JSONNull;
 import net.sf.json.JSONObject;
 import net.sf.json.util.JSONUtils;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.codehaus.jackson.map.ObjectMapper;
 
 public class SimpleReadTest extends TestBase
 {

src/test/java/com/fasterxml/jackson/datatype/jsonlib/SimpleWriteTest.java

@@ -20,7 +20,7 @@
 import net.sf.json.JSONObject;
 import net.sf.json.util.JSONTokener;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.codehaus.jackson.map.ObjectMapper;
 
 public class SimpleWriteTest extends TestBase
 {

src/test/java/com/fasterxml/jackson/datatype/jsonlib/TestVersions.java

@@ -18,8 +18,8 @@
 
 import java.io.IOException;
 
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.core.Versioned;
+import org.codehaus.jackson.Version;
+import org.codehaus.jackson.Versioned;
 
 public class TestVersions extends TestBase
 {

src/test/java/com/fasterxml/jackson/datatype/jsonlib/TypeInformationTest.java

@@ -20,7 +20,7 @@
 import net.sf.json.JSONObject;
 import net.sf.json.util.JSONTokener;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.codehaus.jackson.map.ObjectMapper;
 
 /**
  * Tests to verify that we can also use JSONObject and JSONArray