You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2015/06/19 22:28:27 UTC
[1/2] incubator-streams git commit: resolves STREAMS-328 #328
Repository: incubator-streams
Updated Branches:
refs/heads/master 665003049 -> bea7a504c
resolves STREAMS-328 #328
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/6841f449
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/6841f449
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/6841f449
Branch: refs/heads/master
Commit: 6841f44934ecbb943b8ca4d764dc5f1df6f480e0
Parents: 6a05779
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Sun May 24 15:47:56 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Sun May 24 15:47:56 2015 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
.../org/apache/streams/jackson/StreamsJacksonMapper.java | 3 +++
.../org/apache/streams/data/data/util/ActivitySerDeTest.java | 8 +++++++-
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6841f449/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a67e0e0..5d351ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,7 @@
<!-- Library Dependency Versions -->
<org.osgi.service.http.port>8080</org.osgi.service.http.port>
<org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure>
- <jackson.version>2.3.2</jackson.version>
+ <jackson.version>2.5.3</jackson.version>
<jackson-xml-databind.version>0.6.2</jackson-xml-databind.version>
<aalto.version>0.9.9</aalto.version>
<joda-time.version>2.2</joda-time.version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6841f449/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonMapper.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonMapper.java b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonMapper.java
index 30b5615..fec7c20 100644
--- a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonMapper.java
+++ b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonMapper.java
@@ -19,10 +19,12 @@
package org.apache.streams.jackson;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationConfig;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.google.common.collect.Lists;
@@ -95,6 +97,7 @@ public class StreamsJacksonMapper extends ObjectMapper {
configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, Boolean.FALSE);
configure(SerializationFeature.WRITE_NULL_MAP_VALUES, Boolean.FALSE);
setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.DEFAULT);
+ setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6841f449/streams-pojo/src/test/java/org/apache/streams/data/data/util/ActivitySerDeTest.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/test/java/org/apache/streams/data/data/util/ActivitySerDeTest.java b/streams-pojo/src/test/java/org/apache/streams/data/data/util/ActivitySerDeTest.java
index a0b0f8e..c7a5958 100644
--- a/streams-pojo/src/test/java/org/apache/streams/data/data/util/ActivitySerDeTest.java
+++ b/streams-pojo/src/test/java/org/apache/streams/data/data/util/ActivitySerDeTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.ActivityObject;
import org.junit.Test;
import org.reflections.Reflections;
import org.reflections.scanners.SubTypesScanner;
@@ -33,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.InputStream;
+import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -62,8 +62,12 @@ public class ActivitySerDeTest {
InputStream testActivityFileStream = ActivitySerDeTest.class.getClassLoader()
.getResourceAsStream("activities/" + file);
Activity activity = MAPPER.readValue(testActivityFileStream, Activity.class);
+ activity.setGenerator(null);
+ activity.setLinks(new LinkedList<String>());
String activityString = MAPPER.writeValueAsString(activity);
LOGGER.info("Deserialized: " + activityString );
+ assert( !activityString.contains("null") );
+ assert( !activityString.contains("[]") );
}
}
@@ -93,6 +97,8 @@ public class ActivitySerDeTest {
activity = MAPPER.convertValue(MAPPER.readValue(testActivityFileStream, verbClass), Activity.class);
String activityString = MAPPER.writeValueAsString(activity);
LOGGER.info("Deserialized: " + activityString );
+ assert( !activityString.contains("null") );
+ assert( !activityString.contains("[]") );
}
}
}
[2/2] incubator-streams git commit: Merge commit
'6841f44934ecbb943b8ca4d764dc5f1df6f480e0'
Posted by sb...@apache.org.
Merge commit '6841f44934ecbb943b8ca4d764dc5f1df6f480e0'
* commit '6841f44934ecbb943b8ca4d764dc5f1df6f480e0':
resolves STREAMS-328 #328
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/bea7a504
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/bea7a504
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/bea7a504
Branch: refs/heads/master
Commit: bea7a504c76e371292b72f168c57c8fa92016045
Parents: 6650030 6841f44
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Fri Jun 19 15:28:14 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Fri Jun 19 15:28:14 2015 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
.../org/apache/streams/jackson/StreamsJacksonMapper.java | 3 +++
.../org/apache/streams/data/data/util/ActivitySerDeTest.java | 8 +++++++-
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------