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/12/01 17:02:51 UTC
[1/2] incubator-streams git commit: resolves STREAMS-383
Repository: incubator-streams
Updated Branches:
refs/heads/master 3d9184cfd -> 064d9254b
resolves STREAMS-383
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/f246637f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/f246637f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/f246637f
Branch: refs/heads/master
Commit: f246637fc0b42f0cc253e683839701f83cd983a7
Parents: daca194
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Nov 17 16:42:28 2015 -0600
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Nov 17 16:42:28 2015 -0600
----------------------------------------------------------------------
pom.xml | 6 ++++++
streams-pojo/pom.xml | 5 +++++
.../java/org/apache/streams/jackson/StreamsJacksonMapper.java | 5 ++++-
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/f246637f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 306c7a3..405ebd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,6 +158,7 @@
<properties>
+ <scala.version>2.10</scala.version>
<datastax.version>1.0.3</datastax.version>
<zookeeper.version>3.4.5</zookeeper.version>
<json-path.version>0.9.1</json-path.version>
@@ -388,6 +389,11 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-scala_${scala.version}</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>${jackson.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/f246637f/streams-pojo/pom.xml
----------------------------------------------------------------------
diff --git a/streams-pojo/pom.xml b/streams-pojo/pom.xml
index 70e4541..b322e5a 100644
--- a/streams-pojo/pom.xml
+++ b/streams-pojo/pom.xml
@@ -57,6 +57,11 @@
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-scala_2.10</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/f246637f/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 fec7c20..ada50e8 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
@@ -24,8 +24,8 @@ 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.fasterxml.jackson.module.scala.DefaultScalaModule;
import com.google.common.collect.Lists;
import java.util.List;
@@ -68,18 +68,21 @@ public class StreamsJacksonMapper extends ObjectMapper {
*/
protected StreamsJacksonMapper() {
super();
+ registerModule(new DefaultScalaModule());
registerModule(new StreamsJacksonModule());
configure();
}
public StreamsJacksonMapper(String format) {
super();
+ registerModule(new DefaultScalaModule());
registerModule(new StreamsJacksonModule(Lists.newArrayList(format)));
configure();
}
public StreamsJacksonMapper(List<String> formats) {
super();
+ registerModule(new DefaultScalaModule());
registerModule(new StreamsJacksonModule(formats));
configure();
}
[2/2] incubator-streams git commit: Merge branch 'STREAMS-383'
Posted by sb...@apache.org.
Merge branch 'STREAMS-383'
* STREAMS-383:
resolves STREAMS-383
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/064d9254
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/064d9254
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/064d9254
Branch: refs/heads/master
Commit: 064d9254b025fdbe4f540d66fcc5eb4ef92fde0a
Parents: 3d9184c f246637
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Dec 1 10:02:09 2015 -0600
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Dec 1 10:02:09 2015 -0600
----------------------------------------------------------------------
pom.xml | 6 ++++++
streams-pojo/pom.xml | 5 +++++
.../java/org/apache/streams/jackson/StreamsJacksonMapper.java | 5 ++++-
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------