Commit 92cae73f authored by Michael Ritter's avatar Michael Ritter
Browse files

Update jackson version

parent 440a8a0c
...@@ -117,9 +117,9 @@ ...@@ -117,9 +117,9 @@
<!-- for json --> <!-- for json -->
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-core</artifactId>
<version>1.8.1</version> <version>2.8.1</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -31,10 +31,11 @@ ...@@ -31,10 +31,11 @@
package edu.umiacs.ace.remote; package edu.umiacs.ace.remote;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import edu.umiacs.util.Argument; import edu.umiacs.util.Argument;
import java.util.Date; import java.util.Date;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonDeserialize;
@JsonIgnoreProperties(ignoreUnknown=true) @JsonIgnoreProperties(ignoreUnknown=true)
public class AceItem { public class AceItem {
......
...@@ -31,12 +31,13 @@ ...@@ -31,12 +31,13 @@
package edu.umiacs.ace.remote; package edu.umiacs.ace.remote;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import edu.umiacs.util.Strings; import edu.umiacs.util.Strings;
import java.io.IOException; import java.io.IOException;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.JsonDeserializer;
/** /**
* *
...@@ -45,7 +46,7 @@ import org.codehaus.jackson.map.JsonDeserializer; ...@@ -45,7 +46,7 @@ import org.codehaus.jackson.map.JsonDeserializer;
public class CustomBooleanDeserializer extends JsonDeserializer<Boolean> { public class CustomBooleanDeserializer extends JsonDeserializer<Boolean> {
@Override @Override
public Boolean deserialize( JsonParser arg0, DeserializationContext arg1 ) public Boolean deserialize(JsonParser arg0, DeserializationContext arg1 )
throws IOException, throws IOException,
JsonProcessingException { JsonProcessingException {
......
...@@ -31,12 +31,13 @@ ...@@ -31,12 +31,13 @@
package edu.umiacs.ace.remote; package edu.umiacs.ace.remote;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import edu.umiacs.util.Strings; import edu.umiacs.util.Strings;
import java.io.IOException; import java.io.IOException;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.JsonDeserializer;
/** /**
* *
...@@ -45,7 +46,7 @@ import org.codehaus.jackson.map.JsonDeserializer; ...@@ -45,7 +46,7 @@ import org.codehaus.jackson.map.JsonDeserializer;
public class CustomCharDeserializer extends JsonDeserializer<Character> { public class CustomCharDeserializer extends JsonDeserializer<Character> {
@Override @Override
public Character deserialize( JsonParser arg0, DeserializationContext arg1 ) public Character deserialize(JsonParser arg0, DeserializationContext arg1 )
throws IOException, throws IOException,
JsonProcessingException { JsonProcessingException {
......
...@@ -31,12 +31,13 @@ ...@@ -31,12 +31,13 @@
package edu.umiacs.ace.remote; package edu.umiacs.ace.remote;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException; import java.io.IOException;
import java.util.Date; import java.util.Date;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.JsonDeserializer;
/** /**
* *
...@@ -45,7 +46,7 @@ import org.codehaus.jackson.map.JsonDeserializer; ...@@ -45,7 +46,7 @@ import org.codehaus.jackson.map.JsonDeserializer;
public class CustomDateDeserializer extends JsonDeserializer<Date> { public class CustomDateDeserializer extends JsonDeserializer<Date> {
@Override @Override
public Date deserialize( JsonParser arg0, DeserializationContext arg1 ) throws IOException, public Date deserialize(JsonParser arg0, DeserializationContext arg1 ) throws IOException,
JsonProcessingException { JsonProcessingException {
try { try {
return arg1.parseDate(arg0.getText()); return arg1.parseDate(arg0.getText());
......
...@@ -31,12 +31,13 @@ ...@@ -31,12 +31,13 @@
package edu.umiacs.ace.remote; package edu.umiacs.ace.remote;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import edu.umiacs.util.Strings; import edu.umiacs.util.Strings;
import java.io.IOException; import java.io.IOException;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.JsonDeserializer;
/** /**
* *
...@@ -45,7 +46,7 @@ import org.codehaus.jackson.map.JsonDeserializer; ...@@ -45,7 +46,7 @@ import org.codehaus.jackson.map.JsonDeserializer;
public class CustomLongDeserializer extends JsonDeserializer<Long> { public class CustomLongDeserializer extends JsonDeserializer<Long> {
@Override @Override
public Long deserialize( JsonParser arg0, DeserializationContext arg1 ) throws IOException, public Long deserialize(JsonParser arg0, DeserializationContext arg1 ) throws IOException,
JsonProcessingException { JsonProcessingException {
try { try {
if ( Strings.isEmpty(arg1) ) { if ( Strings.isEmpty(arg1) ) {
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
package edu.umiacs.ace.remote; package edu.umiacs.ace.remote;
import com.fasterxml.jackson.databind.DeserializationConfig;
import com.fasterxml.jackson.databind.ObjectMapper;
import edu.umiacs.ace.monitor.peers.PartnerSite; import edu.umiacs.ace.monitor.peers.PartnerSite;
import edu.umiacs.util.Strings; import edu.umiacs.util.Strings;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
...@@ -42,8 +44,6 @@ import org.apache.http.client.methods.HttpGet; ...@@ -42,8 +44,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.HttpClients;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.ObjectMapper;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
...@@ -78,7 +78,7 @@ public class JsonGateway { ...@@ -78,7 +78,7 @@ public class JsonGateway {
mapper = new ObjectMapper(); mapper = new ObjectMapper();
DeserializationConfig cfg = mapper.getDeserializationConfig(); DeserializationConfig cfg = mapper.getDeserializationConfig();
cfg.setDateFormat(new SimpleDateFormat("EEE MMM dd hh:mm:ss zzz yyyy")); cfg.with(new SimpleDateFormat("EEE MMM dd hh:mm:ss zzz yyyy"));
} }
public static final JsonGateway getGateway() { public static final JsonGateway getGateway() {
......
...@@ -31,8 +31,9 @@ ...@@ -31,8 +31,9 @@
package edu.umiacs.ace.remote; package edu.umiacs.ace.remote;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.util.List; import java.util.List;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
/** /**
* *
......
...@@ -31,10 +31,11 @@ ...@@ -31,10 +31,11 @@
package edu.umiacs.ace.remote; package edu.umiacs.ace.remote;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonDeserialize;
/** /**
* representation of ace report json * representation of ace report json
......
...@@ -30,12 +30,13 @@ ...@@ -30,12 +30,13 @@
// $Id$ // $Id$
package edu.umiacs.ace.remote; package edu.umiacs.ace.remote;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import edu.umiacs.util.Argument; import edu.umiacs.util.Argument;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonDeserialize;
/** /**
* *
......
...@@ -30,15 +30,16 @@ ...@@ -30,15 +30,16 @@
// $Id$ // $Id$
package edu.umiacs.ace.remote; package edu.umiacs.ace.remote;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import edu.umiacs.util.Argument; import edu.umiacs.util.Argument;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonDeserialize;
/** /**
* *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment