Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
adapt
ace
Commits
92cae73f
Commit
92cae73f
authored
Nov 11, 2016
by
Michael Ritter
Browse files
Update jackson version
parent
440a8a0c
Changes
11
Hide whitespace changes
Inline
Side-by-side
ace-am/pom.xml
View file @
92cae73f
...
...
@@ -117,9 +117,9 @@
<!-- for json -->
<dependency>
<groupId>
org.codehaus
.jackson
</groupId>
<artifactId>
jackson-
mapper-asl
</artifactId>
<version>
1
.8.1
</version>
<groupId>
com.fasterxml
.jackson
.core
</groupId>
<artifactId>
jackson-
core
</artifactId>
<version>
2
.8.1
</version>
</dependency>
<dependency>
...
...
ace-am/src/main/java/edu/umiacs/ace/remote/AceItem.java
View file @
92cae73f
...
...
@@ -31,10 +31,11 @@
package
edu.umiacs.ace.remote
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
com.fasterxml.jackson.databind.annotation.JsonDeserialize
;
import
edu.umiacs.util.Argument
;
import
java.util.Date
;
import
org.codehaus.jackson.annotate.JsonIgnoreProperties
;
import
org.codehaus.jackson.map.annotate.JsonDeserialize
;
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
AceItem
{
...
...
ace-am/src/main/java/edu/umiacs/ace/remote/CustomBooleanDeserializer.java
View file @
92cae73f
...
...
@@ -31,12 +31,13 @@
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
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;
public
class
CustomBooleanDeserializer
extends
JsonDeserializer
<
Boolean
>
{
@Override
public
Boolean
deserialize
(
JsonParser
arg0
,
DeserializationContext
arg1
)
public
Boolean
deserialize
(
JsonParser
arg0
,
DeserializationContext
arg1
)
throws
IOException
,
JsonProcessingException
{
...
...
ace-am/src/main/java/edu/umiacs/ace/remote/CustomCharDeserializer.java
View file @
92cae73f
...
...
@@ -31,12 +31,13 @@
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
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;
public
class
CustomCharDeserializer
extends
JsonDeserializer
<
Character
>
{
@Override
public
Character
deserialize
(
JsonParser
arg0
,
DeserializationContext
arg1
)
public
Character
deserialize
(
JsonParser
arg0
,
DeserializationContext
arg1
)
throws
IOException
,
JsonProcessingException
{
...
...
ace-am/src/main/java/edu/umiacs/ace/remote/CustomDateDeserializer.java
View file @
92cae73f
...
...
@@ -31,12 +31,13 @@
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.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;
public
class
CustomDateDeserializer
extends
JsonDeserializer
<
Date
>
{
@Override
public
Date
deserialize
(
JsonParser
arg0
,
DeserializationContext
arg1
)
throws
IOException
,
public
Date
deserialize
(
JsonParser
arg0
,
DeserializationContext
arg1
)
throws
IOException
,
JsonProcessingException
{
try
{
return
arg1
.
parseDate
(
arg0
.
getText
());
...
...
ace-am/src/main/java/edu/umiacs/ace/remote/CustomLongDeserializer.java
View file @
92cae73f
...
...
@@ -31,12 +31,13 @@
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
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;
public
class
CustomLongDeserializer
extends
JsonDeserializer
<
Long
>
{
@Override
public
Long
deserialize
(
JsonParser
arg0
,
DeserializationContext
arg1
)
throws
IOException
,
public
Long
deserialize
(
JsonParser
arg0
,
DeserializationContext
arg1
)
throws
IOException
,
JsonProcessingException
{
try
{
if
(
Strings
.
isEmpty
(
arg1
)
)
{
...
...
ace-am/src/main/java/edu/umiacs/ace/remote/JsonGateway.java
View file @
92cae73f
...
...
@@ -31,6 +31,8 @@
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.util.Strings
;
import
org.apache.http.HttpResponse
;
...
...
@@ -42,8 +44,6 @@ import org.apache.http.client.methods.HttpGet;
import
org.apache.http.impl.client.BasicCredentialsProvider
;
import
org.apache.http.impl.client.HttpClients
;
import
org.apache.log4j.Logger
;
import
org.codehaus.jackson.map.DeserializationConfig
;
import
org.codehaus.jackson.map.ObjectMapper
;
import
java.io.IOException
;
import
java.io.InputStream
;
...
...
@@ -78,7 +78,7 @@ public class JsonGateway {
mapper
=
new
ObjectMapper
();
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
()
{
...
...
ace-am/src/main/java/edu/umiacs/ace/remote/ParentChildBean.java
View file @
92cae73f
...
...
@@ -31,8 +31,9 @@
package
edu.umiacs.ace.remote
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
java.util.List
;
import
org.codehaus.jackson.annotate.JsonIgnoreProperties
;
/**
*
...
...
ace-am/src/main/java/edu/umiacs/ace/remote/ReportBean.java
View file @
92cae73f
...
...
@@ -31,10 +31,11 @@
package
edu.umiacs.ace.remote
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
com.fasterxml.jackson.databind.annotation.JsonDeserialize
;
import
java.io.Serializable
;
import
java.util.List
;
import
org.codehaus.jackson.annotate.JsonIgnoreProperties
;
import
org.codehaus.jackson.map.annotate.JsonDeserialize
;
/**
* representation of ace report json
...
...
ace-am/src/main/java/edu/umiacs/ace/remote/StatusBean.java
View file @
92cae73f
...
...
@@ -30,12 +30,13 @@
// $Id$
package
edu.umiacs.ace.remote
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
com.fasterxml.jackson.databind.annotation.JsonDeserialize
;
import
edu.umiacs.util.Argument
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
import
org.codehaus.jackson.annotate.JsonIgnoreProperties
;
import
org.codehaus.jackson.map.annotate.JsonDeserialize
;
/**
*
...
...
ace-am/src/main/java/edu/umiacs/ace/remote/SummaryBean.java
View file @
92cae73f
...
...
@@ -30,15 +30,16 @@
// $Id$
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
java.io.Serializable
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
org.codehaus.jackson.annotate.JsonAnySetter
;
import
org.codehaus.jackson.annotate.JsonIgnoreProperties
;
import
org.codehaus.jackson.map.annotate.JsonDeserialize
;
/**
*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment