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 2014/08/08 22:06:14 UTC
[1/2] git commit: resolves STREAMS-141
Repository: incubator-streams
Updated Branches:
refs/heads/master a538352fc -> 41a80ed2e
resolves STREAMS-141
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/72cca372
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/72cca372
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/72cca372
Branch: refs/heads/master
Commit: 72cca372821fd26787f12d8c82ca33d7d10b05a6
Parents: c2d59a2
Author: sblackmon <sb...@w2odigital.com>
Authored: Mon Aug 4 15:28:43 2014 -0500
Committer: sblackmon <sb...@w2odigital.com>
Committed: Mon Aug 4 15:28:43 2014 -0500
----------------------------------------------------------------------
.../twitter/serializer/StreamsTwitterMapper.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/72cca372/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/StreamsTwitterMapper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/StreamsTwitterMapper.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/StreamsTwitterMapper.java
index b0683a3..2ed16ba 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/StreamsTwitterMapper.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/StreamsTwitterMapper.java
@@ -27,6 +27,9 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
+import org.apache.streams.data.util.RFC3339Utils;
+import org.apache.streams.jackson.StreamsDateTimeDeserializer;
+import org.apache.streams.jackson.StreamsDateTimeSerializer;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.jackson.StreamsJacksonModule;
import org.joda.time.DateTime;
@@ -68,7 +71,14 @@ public class StreamsTwitterMapper extends StreamsJacksonMapper {
addDeserializer(DateTime.class, new StdDeserializer<DateTime>(DateTime.class) {
@Override
public DateTime deserialize(JsonParser jpar, DeserializationContext context) throws IOException, JsonProcessingException {
- return TWITTER_FORMAT.parseDateTime(jpar.getValueAsString());
+ DateTime result = null;
+ try {
+ result = TWITTER_FORMAT.parseDateTime(jpar.getValueAsString());
+ } catch( Exception e ) { }
+ try {
+ result = RFC3339Utils.getInstance().parseToUTC(jpar.getValueAsString());
+ } catch( Exception e ) { }
+ return result;
}
});
}
[2/2] git commit: Merge remote-tracking branch 'apache/STREAMS-141'
Posted by sb...@apache.org.
Merge remote-tracking branch 'apache/STREAMS-141'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/41a80ed2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/41a80ed2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/41a80ed2
Branch: refs/heads/master
Commit: 41a80ed2e622c551a2b87622acc4ffa77217158b
Parents: a538352 72cca37
Author: sblackmon <sb...@w2odigital.com>
Authored: Fri Aug 8 14:57:47 2014 -0500
Committer: sblackmon <sb...@w2odigital.com>
Committed: Fri Aug 8 14:57:47 2014 -0500
----------------------------------------------------------------------
.../twitter/serializer/StreamsTwitterMapper.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------