Upgrade test-json dep from jackson 1.x to 2.x

cowtowncoder · cowtowncoder · commit 234f32304813 · 2017-02-13T20:16:21.000-08:00
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ which would read text from file "input.txt", sort using about 20 megs of heap (n
 Project jar is packaged such that it can be used as a primitive 'sort' tool like so:
 
 ```java
-java -jar java-merge-sort-1.0.0.jar [input-file]
+java -jar java-merge-sort-1.0.1.jar [input-file]
 ```
 
 where sorted output gets printed to `stdout`; and argument is optional (if missing, reads input from stdout).
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
   <groupId>com.fasterxml.util</groupId>
   <artifactId>java-merge-sort</artifactId>
   <name>java-merge-sort</name>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <description>Basic configurable disk-backed N-way merge sort
   </description>
@@ -39,6 +39,18 @@
     <javac.target.version>1.6</javac.target.version>
   </properties>
 
+  <dependencyManagement>
+   <dependencies>
+    <dependency>
+      <groupId>com.fasterxml.jackson</groupId>
+      <artifactId>jackson-bom</artifactId>
+      <type>pom</type>
+      <version>2.8.6</version>
+      <scope>import</scope>
+    </dependency>
+   </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <!-- only test dependencies; zero-dep for production -->
     <dependency>
@@ -49,13 +61,18 @@
     </dependency>
 
     <!--  Let's also test JSON-based sorting -->
-    <!-- TODO: upgrade to Jackson 2 -->
+
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.9.13</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/src/main/java/com/fasterxml/sort/std/TextFileSorter.java b/src/main/java/com/fasterxml/sort/std/TextFileSorter.java
@@ -94,5 +94,6 @@ public void run() {
             } 
         }).start();
         sorter.sort(in, System.out);
+        sorter.close();
     }
 }
diff --git a/src/test/java/com/fasterxml/sort/JsonFileSorter.java b/src/test/java/com/fasterxml/sort/JsonFileSorter.java
@@ -2,9 +2,8 @@
 
 import java.io.*;
 
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.map.*;
-import org.codehaus.jackson.type.JavaType;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.*;
 
 import com.fasterxml.sort.std.StdComparator;
 
@@ -21,7 +20,7 @@ public JsonFileSorter(Class<T> entryType, SortConfig config, ObjectMapper mapper
     public JsonFileSorter(JavaType entryType, SortConfig config, ObjectMapper mapper)
         throws IOException
     {
-        super(config, new ReaderFactory<T>(mapper.reader(entryType)),
+        super(config, new ReaderFactory<T>(mapper.readerFor(entryType)),
                 new WriterFactory<T>(mapper),
                 new StdComparator<T>());
     }
@@ -90,7 +89,7 @@ static class Writer<E> extends DataWriter<E>
 
         public Writer(ObjectMapper mapper, OutputStream out) throws IOException {
             _mapper = mapper;
-            _generator = _mapper.getJsonFactory().createJsonGenerator(out);
+            _generator = _mapper.getFactory().createGenerator(out);
         }
 
         @Override

Original file line number	Diff line number	Diff line change
`@@ -94,5 +94,6 @@ public void run() {`
`94`	`94`	`}`
`95`	`95`	`}).start();`
`96`	`96`	`sorter.sort(in, System.out);`
	`97`	`+ sorter.close();`
`97`	`98`	`}`
`98`	`99`	`}`