Created SimpleCollationJSONMessageBodyReader based on JSONProcessor c…

…ode. Removed Jackson 1 dependency and CollateXModule.
interedition · May 5, 2015 · d5c19ee · d5c19ee
1 parent 6767cbe
commit d5c19ee
Show file tree

Hide file tree

Showing 8 changed files with 196 additions and 296 deletions.
diff --git a/collatex-servlet/pom.xml b/collatex-servlet/pom.xml
@@ -24,14 +24,9 @@
     <version>2.17</version>
 </dependency>
 <dependency>
-    <groupId>org.glassfish.jersey.media</groupId>
-    <artifactId>jersey-media-json-jackson1</artifactId>
-    <version>2.17</version>
-</dependency>
-<dependency>
-    <groupId>org.glassfish.jersey.media</groupId>
-    <artifactId>jersey-media-json-processing</artifactId>
-    <version>2.17</version>
+	<groupId>org.glassfish.jersey.media</groupId>
+	<artifactId>jersey-media-json-processing</artifactId>
+	<version>2.17</version>
 </dependency>
 </dependencies>
 </project>
diff --git a/collatex-servlet/src/main/java/eu/interedition/collatex/http/CollateApplication.java b/collatex-servlet/src/main/java/eu/interedition/collatex/http/CollateApplication.java
@@ -1,7 +1,8 @@
 package eu.interedition.collatex.http;
 
+import eu.interedition.collatex.io.IOExceptionMapper;
+import eu.interedition.collatex.io.SimpleCollationJSONMessageBodyReader;
 import eu.interedition.collatex.io.VariantGraphJSONMessageBodyWriter;
-import org.glassfish.jersey.jackson1.Jackson1Feature;
 
 import javax.ws.rs.core.Application;
 import java.util.HashSet;
@@ -15,11 +16,9 @@ public class CollateApplication extends Application {
     @Override
     public Set<Class<?>> getClasses() {
         Set<Class<?>> s = new HashSet<>();
+        s.add(SimpleCollationJSONMessageBodyReader.class);
         s.add(VariantGraphJSONMessageBodyWriter.class);
-        //TODO: remove depdendency on Jackson 1
-        //TODO: To remove this.. use JSON read code from JSONProcessor class.
-        s.add(ObjectMapperProvider.class);
-        s.add(Jackson1Feature.class);
+        s.add(IOExceptionMapper.class);
         return s;
     }
 

diff --git a/collatex-servlet/src/main/java/eu/interedition/collatex/http/ObjectMapperProvider.java b/collatex-servlet/src/main/java/eu/interedition/collatex/http/ObjectMapperProvider.java
diff --git a/collatex-servlet/src/main/java/eu/interedition/collatex/io/CollateXModule.java b/collatex-servlet/src/main/java/eu/interedition/collatex/io/CollateXModule.java
diff --git a/...tion/collatex/http/IOExceptionMapper.java → ...dition/collatex/io/IOExceptionMapper.java b/...tion/collatex/http/IOExceptionMapper.java → ...dition/collatex/io/IOExceptionMapper.java
@@ -17,7 +17,7 @@
  * along with CollateX.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package eu.interedition.collatex.http;
+package eu.interedition.collatex.io;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;

diff --git a/collatex-servlet/src/main/java/eu/interedition/collatex/io/JsonToken.java b/collatex-servlet/src/main/java/eu/interedition/collatex/io/JsonToken.java
diff --git a/collatex-servlet/src/main/java/eu/interedition/collatex/io/SimpleCollationDeserializer.java b/collatex-servlet/src/main/java/eu/interedition/collatex/io/SimpleCollationDeserializer.java