Revision: 18119
http://sourceforge.net/p/gate/code/18119
Author: markagreenwood
Date: 2014-06-23 12:46:09 +0000 (Mon, 23 Jun 2014)
Log Message:
-----------
upgraded the Jackson annotations to use the ones from the latest version and
not some deprecated ones
Modified Paths:
--------------
gate/trunk/plugins/Format_DataSift/src/gate/corpora/DataSiftFormat.java
gate/trunk/plugins/Format_DataSift/src/gate/corpora/datasift/DataSift.java
gate/trunk/plugins/Format_DataSift/src/gate/corpora/datasift/Interaction.java
Modified:
gate/trunk/plugins/Format_DataSift/src/gate/corpora/DataSiftFormat.java
===================================================================
--- gate/trunk/plugins/Format_DataSift/src/gate/corpora/DataSiftFormat.java
2014-06-23 12:42:11 UTC (rev 18118)
+++ gate/trunk/plugins/Format_DataSift/src/gate/corpora/DataSiftFormat.java
2014-06-23 12:46:09 UTC (rev 18119)
@@ -13,8 +13,6 @@
import gate.AnnotationSet;
import gate.DocumentContent;
-import gate.Factory;
-import gate.FeatureMap;
import gate.Resource;
import gate.corpora.datasift.DataSift;
import gate.corpora.datasift.Interaction;
@@ -38,6 +36,8 @@
@CreoleResource(name = "GATE DataSift JSON Document Format", isPrivate = true,
autoinstances = {@AutoInstance(hidden = true)}, comment = "Format parser for
DataSift JSON files")
public class DataSiftFormat extends TextualDocumentFormat {
+ private static final long serialVersionUID = -1768496491819413313L;
+
/** Initialise this resource, and return it. */
public Resource init() throws ResourceInstantiationException {
// Register ad hoc MIME-type
Modified:
gate/trunk/plugins/Format_DataSift/src/gate/corpora/datasift/DataSift.java
===================================================================
--- gate/trunk/plugins/Format_DataSift/src/gate/corpora/datasift/DataSift.java
2014-06-23 12:42:11 UTC (rev 18118)
+++ gate/trunk/plugins/Format_DataSift/src/gate/corpora/datasift/DataSift.java
2014-06-23 12:46:09 UTC (rev 18119)
@@ -13,10 +13,10 @@
package gate.corpora.datasift;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize.Inclusion;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
-@JsonSerialize(include = Inclusion.NON_NULL)
+@JsonInclude(value = Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class DataSift {
private Interaction interaction;
Modified:
gate/trunk/plugins/Format_DataSift/src/gate/corpora/datasift/Interaction.java
===================================================================
---
gate/trunk/plugins/Format_DataSift/src/gate/corpora/datasift/Interaction.java
2014-06-23 12:42:11 UTC (rev 18118)
+++
gate/trunk/plugins/Format_DataSift/src/gate/corpora/datasift/Interaction.java
2014-06-23 12:46:09 UTC (rev 18119)
@@ -18,11 +18,11 @@
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize.Inclusion;
-@JsonSerialize(include = Inclusion.NON_NULL)
+@JsonInclude(value = Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class Interaction {
private String content, type, link, id, created;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
