You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/07/14 19:31:19 UTC
[01/12] git commit: Merge pull request #4 from apache/master
Repository: incubator-streams
Updated Branches:
refs/heads/master 853ae3c7a -> b7e4c3467
Merge pull request #4 from apache/master
Merge Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/2ee31575
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/2ee31575
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/2ee31575
Branch: refs/heads/master
Commit: 2ee31575eba481bf77c98a9edfe3d04eae333f16
Parents: 829f805 a33c215
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Mon Jun 23 14:03:00 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Mon Jun 23 14:03:00 2014 -0500
----------------------------------------------------------------------
.../org/apache/streams/s3/S3PersistReader.java | 9 +-
.../streams/console/ConsolePersistReader.java | 23 +
.../streams/console/ConsolePersistWriter.java | 18 +
.../elasticsearch/ElasticsearchClient.java | 20 +-
.../ElasticsearchClientManager.java | 18 +
.../ElasticsearchConfigurator.java | 18 +
.../ElasticsearchPersistReader.java | 26 +-
.../ElasticsearchPersistUpdater.java | 18 +
.../ElasticsearchPersistWriter.java | 1 +
.../ElasticsearchPersistWriterTask.java | 18 +
.../elasticsearch/ElasticsearchQuery.java | 20 +-
.../elasticsearch/PercolateProcessor.java | 20 +-
.../apache/streams/hbase/HbaseConfigurator.java | 18 +
.../streams/hbase/HbasePersistWriter.java | 18 +
.../streams/hbase/HbasePersistWriterTask.java | 18 +
.../apache/streams/hdfs/HdfsConfigurator.java | 18 +
.../streams/hdfs/WebHdfsPersistReader.java | 27 +-
.../streams/hdfs/WebHdfsPersistReaderTask.java | 18 +
.../streams/hdfs/WebHdfsPersistWriter.java | 18 +
.../streams/hdfs/WebHdfsPersistWriterTask.java | 18 +
.../apache/streams/kafka/KafkaConfigurator.java | 18 +
.../streams/kafka/KafkaPersistReader.java | 23 +
.../streams/kafka/KafkaPersistReaderTask.java | 18 +
.../streams/kafka/KafkaPersistWriter.java | 18 +
.../streams/kafka/KafkaPersistWriterTask.java | 18 +
.../streams/kafka/StreamsPartitioner.java | 18 +
.../apache/streams/mongo/MongoConfigurator.java | 18 +
.../streams/mongo/MongoPersistWriter.java | 18 +
.../apache/streams/json/JsonPathExtractor.java | 5 +-
.../org/apache/streams/urls/LinkResolver.java | 3 +-
.../urls/LinkResolverHelperFunctions.java | 1 +
.../streams/urls/LinkResolverProcessor.java | 3 +-
.../streams/urls/LinkHelperFunctionsTest.java | 18 +
.../streams/urls/TestLinkUnwinderProcessor.java | 18 +
.../streams-provider-datasift/pom.xml | 12 +-
.../streams/datasift/csdl/DatasiftCsdlUtil.java | 114 +
.../datasift/provider/DatasiftConverter.java | 1 +
.../provider/DatasiftStreamConfigurator.java | 2 +-
.../provider/DatasiftStreamProvider.java | 7 +-
.../DatasiftTypeConverterProcessor.java | 75 +-
.../serializer/DatasiftActivitySerializer.java | 193 +-
.../DatasiftDefaultActivitySerializer.java | 211 +
.../DatasiftTweetActivitySerializer.java | 234 +
.../main/jsonschema/com/datasift/Datasift.json | 44 +-
.../com/datasift/test/DatasiftSerDeTest.java | 37 +-
.../provider/DatasiftStreamProviderTest.java | 18 +
.../DatasiftTypeConverterProcessorTest.java | 20 +-
.../datasift/provider/ErrorHandlerTest.java | 18 +
.../datasift/provider/SubscriptionTest.java | 18 +
.../DatasiftActivitySerializerTest.java | 74 +
.../src/test/resources/amazon_datasift_json.txt | 10 +
.../src/test/resources/blog_datasift_json.txt | 719 +++
.../src/test/resources/board_datasift_json.txt | 4160 ++++++++++++++++++
.../test/resources/facebook_datasift_json.txt | 1843 ++++++++
.../src/test/resources/part-r-00000.json | 1724 ++++----
.../resources/rand_sample_datasift_json.txt | 1547 +++++++
.../resources/random_sample_datasift_json.txt | 1547 +++++++
.../src/test/resources/reddit_datasift_json.txt | 33 +
.../test/resources/twitter_datasift_json.txt | 1000 +++++
.../test/resources/wikipedia_datasift_json.txt | 252 ++
.../test/resources/youtube_datasift_json.txt | 7 +
...FacebookPublicFeedXmlActivitySerializer.java | 18 +
.../FacebookPostActivitySerializerTest.java | 1 +
.../facebook/test/FacebookPostSerDeTest.java | 18 +
.../facebook/test/FacebookEDCSerDeTest.java | 18 +
.../gnip/flickr/test/FlickrEDCSerDeTest.java | 18 +
.../com/gplus/api/GPlusActivitySerializer.java | 18 +
.../com/gplus/api/GPlusEDCAsActivityTest.java | 18 +
.../com/instagram/test/InstagramSerDeTest.java | 18 +
.../reddit/api/RedditActivitySerializer.java | 18 +
.../reddit/api/RedditEDCAsActivityJSONTest.java | 18 +
.../java/com/gnip/test/YouTubeEDCSerDeTest.java | 20 +-
.../com/gnip/test/YoutubeEDCAsActivityTest.java | 2 +-
.../ActivityXMLActivitySerializer.java | 18 +
.../PowerTrackActivitySerializer.java | 18 +
.../test/PowerTrackDeserializationTest.java | 18 +
.../com/google/gmail/GMailConfigurator.java | 18 +
.../gmail/provider/GMailImapProviderTask.java | 18 +
.../GMailMessageActivitySerializer.java | 18 +
.../google/gmail/provider/GMailProvider.java | 26 +-
.../gmail/provider/GMailRssProviderTask.java | 18 +
.../gplus/provider/GPlusActivitySerializer.java | 18 +
.../gplus/provider/GPlusConfigurator.java | 18 +
.../gplus/provider/GPlusEventProcessor.java | 18 +
.../provider/GPlusHistoryProviderTask.java | 18 +
.../google/gplus/provider/GPlusProvider.java | 23 +
.../gmail/test/GMailMessageSerDeTest.java | 18 +
.../data/MoreoverJsonActivitySerializer.java | 18 +
.../data/MoreoverXmlActivitySerializer.java | 18 +
.../streams/data/moreover/MoreoverClient.java | 18 +
.../data/moreover/MoreoverConfigurator.java | 18 +
.../streams/data/moreover/MoreoverProvider.java | 23 +
.../data/moreover/MoreoverProviderTask.java | 18 +
.../streams/data/moreover/MoreoverResult.java | 18 +
.../data/moreover/MoreoverResultSetWrapper.java | 18 +
.../apache/streams/data/util/MoreoverUtils.java | 18 +
.../MoreoverJsonActivitySerializerTest.java | 1 +
.../data/MoreoverXmlActivitySerializerTest.java | 18 +
.../rss/provider/RssEventClassifier.java | 18 +
.../streams/rss/provider/RssEventProcessor.java | 18 +
.../rss/provider/RssStreamConfigurator.java | 18 +
.../streams/rss/provider/RssStreamProvider.java | 24 +
.../rss/provider/RssStreamProviderTask.java | 18 +
.../serializer/SyndEntryActivitySerializer.java | 18 +
.../streams/rss/test/Top100FeedsTest.java | 18 +
.../sysomos/config/SysomosConfigurator.java | 39 +
.../sysomos/proessor/SysomosTypeConverter.java | 56 -
.../sysomos/processor/SysomosTypeConverter.java | 56 +
.../sysomos/provider/ContentRequestBuilder.java | 1 +
.../provider/SysomosHeartbeatStream.java | 130 +-
.../sysomos/provider/SysomosProvider.java | 50 +-
.../streams/sysomos/util/SysomosUtils.java | 2 +-
.../com/sysomos/test/SysomosJsonSerDeTest.java | 18 +
.../com/sysomos/test/SysomosXmlSerDeTest.java | 18 +
.../processor/TwitterEventProcessor.java | 18 +
.../processor/TwitterProfileProcessor.java | 31 +-
.../twitter/processor/TwitterTypeConverter.java | 18 +
.../twitter/provider/TwitterErrorHandler.java | 20 +-
.../provider/TwitterEventClassifier.java | 18 +
.../provider/TwitterStreamConfigurator.java | 18 +
.../twitter/provider/TwitterStreamProvider.java | 23 +
.../provider/TwitterStreamProviderTask.java | 18 +
.../provider/TwitterTimelineProvider.java | 32 +-
.../provider/TwitterTimelineProviderTask.java | 18 +
.../TwitterUserInformationProvider.java | 12 +-
.../serializer/StreamsTwitterMapper.java | 18 +
.../TwitterJsonActivitySerializer.java | 18 +
.../TwitterJsonDeleteActivitySerializer.java | 18 +
.../TwitterJsonRetweetActivitySerializer.java | 18 +
.../TwitterJsonTweetActivitySerializer.java | 18 +
...erJsonUserstreameventActivitySerializer.java | 18 +
.../streams/twitter/test/SimpleTweetTest.java | 18 +
.../twitter/test/TweetActivitySerDeTest.java | 18 +
.../streams/twitter/test/TweetSerDeTest.java | 18 +
.../test/TwitterEventClassifierTest.java | 18 +
.../twitter/test/TwitterStreamProviderTest.java | 18 +
.../org/apache/streams/core/DatumStatus.java | 18 +
.../streams/core/DatumStatusCountable.java | 18 +
.../apache/streams/core/DatumStatusCounter.java | 18 +
.../org/apache/streams/core/StreamBuilder.java | 18 +
.../org/apache/streams/core/StreamHandler.java | 18 +
.../org/apache/streams/core/StreamState.java | 18 +
.../apache/streams/core/StreamsOperation.java | 18 +
.../apache/streams/core/StreamsProvider.java | 38 +-
.../apache/streams/data/util/RFC3339Utils.java | 5 +
.../ActivityDeserializerException.java | 18 +
.../exceptions/ActivitySerializerException.java | 18 +
.../jackson/StreamsDateTimeDeserializer.java | 20 +-
.../jackson/StreamsDateTimeSerializer.java | 18 +
.../streams/jackson/StreamsJacksonMapper.java | 22 +-
.../streams/jackson/StreamsJacksonModule.java | 18 +
.../jackson/StreamsPeriodDeserializer.java | 18 +
.../jackson/StreamsPeriodSerializer.java | 20 +-
.../data/data/util/DateTimeSerDeTest.java | 18 +
.../local/builders/InvalidStreamException.java | 18 +
.../local/builders/LocalStreamBuilder.java | 18 +
.../streams/local/builders/StreamComponent.java | 18 +
.../streams/local/tasks/BaseStreamsTask.java | 18 +
.../tasks/LocalStreamProcessMonitorThread.java | 18 +
.../tasks/StatusCounterMonitorRunnable.java | 18 +
.../local/tasks/StatusCounterMonitorThread.java | 18 +
.../streams/local/tasks/StreamsMergeTask.java | 18 +
.../local/tasks/StreamsPersistWriterTask.java | 18 +
.../local/tasks/StreamsProcessorTask.java | 18 +
.../local/tasks/StreamsProviderTask.java | 18 +
.../apache/streams/local/tasks/StreamsTask.java | 18 +
.../local/builders/LocalStreamBuilderTest.java | 18 +
.../local/builders/ToyLocalBuilderExample.java | 18 +
.../streams/local/tasks/BasicTasksTest.java | 18 +
.../test/processors/DoNothingProcessor.java | 18 +
.../PassthroughDatumCounterProcessor.java | 18 +
.../test/providers/EmptyResultSetProvider.java | 5 +
.../test/providers/NumericMessageProvider.java | 23 +
.../local/test/writer/DatumCounterWriter.java | 18 +
.../local/test/writer/DoNothingWriter.java | 18 +
.../local/test/writer/SystemOutWriter.java | 18 +
.../component/ExpectedDatumsPersistWriter.java | 18 +
.../test/component/FileReaderProvider.java | 23 +
.../test/component/StreamsDatumConverter.java | 18 +
.../component/StringToDocumentConverter.java | 18 +
.../tests/TestComponentsLocalStream.java | 18 +
.../tests/TestExpectedDatumsPersitWriter.java | 18 +
.../component/tests/TestFileReaderProvider.java | 18 +
.../trident/StreamsPersistWriterState.java | 18 +
.../storm/trident/StreamsProcessorFunction.java | 18 +
.../storm/trident/StreamsProviderSpout.java | 20 +-
.../org/apache/streams/util/ComponentUtils.java | 18 +
.../java/org/apache/streams/util/DateUtil.java | 18 +
.../apache/streams/util/SerializationUtil.java | 18 +
189 files changed, 15837 insertions(+), 1172 deletions(-)
----------------------------------------------------------------------
[03/12] git commit: STREAMS-105 | Ensured that the user_mentions
entries are correctly structured and that the activity object has the correct
ID and content
Posted by mf...@apache.org.
STREAMS-105 | Ensured that the user_mentions entries are correctly structured and that the activity object has the correct ID and content
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/c35c2ef7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c35c2ef7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/c35c2ef7
Branch: refs/heads/master
Commit: c35c2ef74df06779d50bdf80a79823ade57ac1c4
Parents: d71b159
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Fri Jun 27 16:46:07 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Fri Jun 27 16:46:07 2014 -0500
----------------------------------------------------------------------
.../DatasiftDefaultActivitySerializer.java | 7 +++--
.../DatasiftTweetActivitySerializer.java | 30 ++++++++++++--------
2 files changed, 23 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c35c2ef7/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftDefaultActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftDefaultActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftDefaultActivitySerializer.java
index b8c87e5..09126dc 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftDefaultActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftDefaultActivitySerializer.java
@@ -22,8 +22,8 @@ import java.util.Map;
import static org.apache.streams.data.util.ActivityUtil.ensureExtensions;
/**
-*
-*/
+ *
+ */
public class DatasiftDefaultActivitySerializer implements ActivitySerializer<Datasift>, Serializable {
private static final Logger LOGGER = LoggerFactory.getLogger(DatasiftDefaultActivitySerializer.class);
@@ -174,6 +174,9 @@ public class DatasiftDefaultActivitySerializer implements ActivitySerializer<Dat
ActivityObject actObj = new ActivityObject();
actObj.setObjectType(interaction.getContenttype());
actObj.setUrl(interaction.getLink());
+ actObj.setId(interaction.getId());
+ actObj.setContent(interaction.getContent());
+
return actObj;
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c35c2ef7/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
index 3406eb4..465196f 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
@@ -31,10 +31,12 @@ import org.apache.streams.datasift.twitter.Twitter;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Image;
+import org.apache.streams.twitter.pojo.UserMentions;
import org.apache.streams.twitter.serializer.util.TwitterActivityUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -204,8 +206,8 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
}
}
}
- extensions.put("hashtags", hashTags);
+ extensions.put("hashtags", hashTags);
if(retweet != null) {
Map<String, Object> rebroadcasts = Maps.newHashMap();
@@ -215,18 +217,22 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
}
if(interaction.getAdditionalProperties() != null) {
- Object mentionsObject = interaction.getAdditionalProperties().get("mentions");
- if(mentionsObject != null ) {
- if(mentionsObject instanceof List) {
- List mentions = (List) mentionsObject;
- List<Map<String, Object>> userMentions = Lists.newLinkedList();
- for(Object mention : mentions) {
- Map<String, Object> actor = Maps.newHashMap();
- actor.put("displayName", mention);
- userMentions.add(actor);
- }
- extensions.put("user_mentions", userMentions);
+ ArrayList<String> mentions = (ArrayList<String>) interaction.getAdditionalProperties().get("mentions");
+ ArrayList<Long> mentionIds = (ArrayList<Long>) interaction.getAdditionalProperties().get("mention_ids");
+ ArrayList<UserMentions> userMentions = new ArrayList<UserMentions>();
+
+ if(mentions != null && mentionIds != null && (mentionIds.size() == mentions.size()) && !mentions.isEmpty() && !mentionIds.isEmpty()) {
+ for(int x = 0; x < mentions.size(); x ++) {
+ UserMentions mention = new UserMentions();
+
+ mention.setIdStr("id:twitter:" + mentionIds.get(x));
+ mention.setId(mentionIds.get(x));
+ mention.setName(mentions.get(x));
+ mention.setScreenName(mentions.get(x));
+
+ userMentions.add(mention);
}
+ extensions.put("user_mentions", userMentions);
}
}
extensions.put("keywords", interaction.getContent());
[09/12] git commit: Merge pull request #7 from apache/master
Posted by mf...@apache.org.
Merge pull request #7 from apache/master
Merge Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/af1f2943
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/af1f2943
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/af1f2943
Branch: refs/heads/master
Commit: af1f2943c765536ac0424b008d9a5f92984ca984
Parents: 3b98df8 c50ce91
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Tue Jul 8 13:35:46 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Tue Jul 8 13:35:46 2014 -0500
----------------------------------------------------------------------
.../streams-persist-elasticsearch/README.md | 38 +++
.../ElasticsearchConfigurator.java | 14 +
.../elasticsearch/ElasticsearchQuery.java | 34 ++-
.../ElasticsearchReaderConfiguration.json | 5 +
.../src/main/resources/reference.json | 9 +
streams-contrib/streams-persist-mongo/README.md | 16 ++
.../streams/mongo/MongoPersistReader.java | 270 +++++++++++++++++++
.../src/main/resources/reference.json | 8 +
.../src/main/resources/reference.properties | 10 -
.../twitter/processor/TwitterTypeConverter.java | 2 +-
.../TwitterJsonActivitySerializer.java | 3 +
.../TwitterJsonUserActivitySerializer.java | 72 +++++
.../serializer/util/TwitterActivityUtil.java | 22 ++
.../streams/local/builders/StreamComponent.java | 2 +-
.../local/tasks/StreamsProviderTask.java | 3 +-
15 files changed, 490 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[05/12] git commit: STREAMS-105 | Code review feedback
Posted by mf...@apache.org.
STREAMS-105 | Code review feedback
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/949b6768
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/949b6768
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/949b6768
Branch: refs/heads/master
Commit: 949b676897aa87bba92613b694c4808efdea8c56
Parents: ce6e327
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Mon Jun 30 17:13:35 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Mon Jun 30 17:13:35 2014 -0500
----------------------------------------------------------------------
.../DatasiftTweetActivitySerializer.java | 29 ++++++--------------
1 file changed, 8 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/949b6768/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
index a9514ed..1fecc4b 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
@@ -231,36 +231,23 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
ArrayList<Long> mentionIds = (ArrayList<Long>) interaction.getAdditionalProperties().get("mention_ids");
ArrayList<UserMentions> userMentions = new ArrayList<UserMentions>();
- if(mentions != null && mentionIds != null && (mentionIds.size() == mentions.size()) && !mentions.isEmpty() && !mentionIds.isEmpty()) {
+ if(mentions != null && !mentions.isEmpty()) {
for(int x = 0; x < mentions.size(); x ++) {
UserMentions mention = new UserMentions();
-
- mention.setIdStr("id:twitter:" + mentionIds.get(x));
- mention.setId(Long.parseLong(String.valueOf(mentionIds.get(x))));
mention.setName(mentions.get(x));
mention.setScreenName(mentions.get(x));
userMentions.add(mention);
}
- } else if((mentions != null && !mentions.isEmpty()) || (mentionIds != null && !mentionIds.isEmpty())) {
- if(mentions != null && !mentions.isEmpty()) {
- for(int x = 0; x < mentions.size(); x ++) {
- UserMentions mention = new UserMentions();
- mention.setName(mentions.get(x));
- mention.setScreenName(mentions.get(x));
-
- userMentions.add(mention);
- }
- }
- if(mentionIds != null && !mentionIds.isEmpty()) {
- for(int x = 0; x < mentionIds.size(); x ++) {
- UserMentions mention = new UserMentions();
+ }
+ if(mentionIds != null && !mentionIds.isEmpty()) {
+ for(int x = 0; x < mentionIds.size(); x ++) {
+ UserMentions mention = new UserMentions();
- mention.setIdStr("id:twitter:" + mentionIds.get(x));
- mention.setId(Long.parseLong(String.valueOf(mentionIds.get(x))));
+ mention.setIdStr("id:twitter:" + mentionIds.get(x));
+ mention.setId(Long.parseLong(String.valueOf(mentionIds.get(x))));
- userMentions.add(mention);
- }
+ userMentions.add(mention);
}
}
[12/12] git commit: Merge PR47 branch 'rdouglas/STREAMS-105'
Posted by mf...@apache.org.
Merge PR47 branch 'rdouglas/STREAMS-105'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b7e4c346
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b7e4c346
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b7e4c346
Branch: refs/heads/master
Commit: b7e4c34672238bbcd5a28cede7c4965e4e9ab49c
Parents: 853ae3c fbb8ccf
Author: mfranklin <mf...@apache.org>
Authored: Mon Jul 14 13:01:41 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Mon Jul 14 13:01:41 2014 -0400
----------------------------------------------------------------------
.../serializer/DatasiftDefaultActivitySerializer.java | 7 +++++--
.../src/main/jsonschema/com/datasift/Datasift.json | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b7e4c346/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
----------------------------------------------------------------------
[06/12] git commit: Merge pull request #6 from apache/master
Posted by mf...@apache.org.
Merge pull request #6 from apache/master
Merge Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3b98df84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3b98df84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3b98df84
Branch: refs/heads/master
Commit: 3b98df844ca87e79bf9cb88f16fbad361d9959ad
Parents: d71b159 ba96627
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Tue Jul 1 09:56:26 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Tue Jul 1 09:56:26 2014 -0500
----------------------------------------------------------------------
.../ElasticsearchConfigurator.java | 4 +
.../ElasticsearchPersistUpdater.java | 35 -
.../ElasticsearchPersistWriter.java | 705 +++++++------------
.../ElasticsearchPersistWriterTask.java | 56 --
.../ElasticsearchWriterConfiguration.json | 5 +
.../provider/SysomosHeartbeatStream.java | 2 +-
.../local/tasks/StreamsProviderTask.java | 51 +-
.../local/builders/LocalStreamBuilderTest.java | 52 +-
.../local/test/processors/SlowProcessor.java | 50 ++
.../test/providers/EmptyResultSetProvider.java | 2 +-
.../test/providers/NumericMessageProvider.java | 63 +-
.../test/component/FileReaderProvider.java | 52 +-
12 files changed, 419 insertions(+), 658 deletions(-)
----------------------------------------------------------------------
[04/12] git commit: STREAMS-105 | Code review feedback
Posted by mf...@apache.org.
STREAMS-105 | Code review feedback
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/ce6e3276
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/ce6e3276
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/ce6e3276
Branch: refs/heads/master
Commit: ce6e3276e113251b15c4655335a6887082e13315
Parents: c35c2ef
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Mon Jun 30 11:38:32 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Mon Jun 30 11:38:32 2014 -0500
----------------------------------------------------------------------
.../DatasiftTweetActivitySerializer.java | 141 +++++++++++--------
.../main/jsonschema/com/datasift/Datasift.json | 2 +-
2 files changed, 86 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce6e3276/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
index 465196f..a9514ed 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
@@ -81,58 +81,32 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
return activity;
}
+ /**
+ * Returns the actor created from this particular event and Twitter object
+ *
+ * @param event
+ * @param twitter
+ * @return
+ */
public Actor buildActor(Datasift event, Twitter twitter) {
User user = twitter.getUser();
Actor actor = super.buildActor(event.getInteraction());
- if(user == null) {
- return retweetBuildActor(actor, twitter.getRetweet().getUser());
- }
-
- actor.setDisplayName(user.getName());
- actor.setId(formatId(Optional.fromNullable(
- user.getIdStr())
- .or(Optional.of(user.getId().toString()))
- .orNull()));
- actor.setSummary(user.getDescription());
- try {
- actor.setPublished(RFC3339Utils.parseToUTC(user.getCreatedAt()));
- } catch (Exception e) {
- LOGGER.warn("Exception trying to parse date : {}", e);
- }
- if(user.getUrl() != null) {
- actor.setUrl(user.getUrl());
- }
-
- Map<String, Object> extensions = new HashMap<String,Object>();
- extensions.put("location", user.getLocation());
- extensions.put("posts", user.getStatusesCount());
- extensions.put("followers", user.getFollowersCount());
- extensions.put("screenName", user.getScreenName());
- if(user.getAdditionalProperties() != null) {
- extensions.put("favorites", user.getAdditionalProperties().get("favourites_count"));
- }
-
- Image profileImage = new Image();
- String profileUrl = null;
- profileUrl = event.getInteraction().getAuthor().getAvatar();
- if(profileUrl == null && user.getAdditionalProperties() != null) {
- Object url = user.getAdditionalProperties().get("profile_image_url_https");
- if(url instanceof String)
- profileUrl = (String) url;
- }
- if(profileUrl == null) {
- profileUrl = user.getProfileImageUrl();
+ if (user == null) {
+ return userBuildActor(actor, twitter.getRetweet().getUser());
+ } else {
+ return userBuildActor(actor, user);
}
- profileImage.setUrl(profileUrl);
- actor.setImage(profileImage);
-
- actor.setAdditionalProperty("extensions", extensions);
- return actor;
}
- //Need to make retweet user and tweet user the same object.
- public Actor retweetBuildActor(Actor actor, org.apache.streams.datasift.twitter.User user) {
+ /**
+ * Build an actor object given a User
+ *
+ * @param actor
+ * @param user
+ * @return
+ */
+ private Actor userBuildActor(Actor actor, User user) {
actor.setDisplayName(user.getName());
actor.setId(formatId(Optional.fromNullable(
@@ -169,13 +143,22 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
if(actor.getImage() == null && profileUrl == null) {
profileUrl = user.getProfileImageUrl();
}
- profileImage.setUrl(profileUrl);
- actor.setImage(profileImage);
+
+ if(profileUrl != null) {
+ profileImage.setUrl(profileUrl);
+ actor.setImage(profileImage);
+ }
actor.setAdditionalProperty("extensions", extensions);
return actor;
}
+ /**
+ * Adds location attributes from the given Twitter object
+ *
+ * @param activity
+ * @param twitter
+ */
public void addLocationExtension(Activity activity, Twitter twitter) {
Map<String, Object> extensions = ensureExtensions(activity);
Map<String, Object> location = Maps.newHashMap();
@@ -187,6 +170,13 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
extensions.put("location", location);
}
+ /**
+ * Creates and adds Twitter Extensions from given interaction
+ *
+ * @param activity
+ * @param twitter
+ * @param interaction
+ */
public void addTwitterExtensions(Activity activity, Twitter twitter, Interaction interaction) {
Retweet retweet = twitter.getRetweet();
Map<String, Object> extensions = ensureExtensions(activity);
@@ -217,24 +207,63 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
}
if(interaction.getAdditionalProperties() != null) {
- ArrayList<String> mentions = (ArrayList<String>) interaction.getAdditionalProperties().get("mentions");
- ArrayList<Long> mentionIds = (ArrayList<Long>) interaction.getAdditionalProperties().get("mention_ids");
- ArrayList<UserMentions> userMentions = new ArrayList<UserMentions>();
+ ArrayList<UserMentions> userMentions = createUserMentions(interaction);
+
+ if(userMentions.size() > 0)
+ extensions.put("user_mentions", userMentions);
+ }
+
+ extensions.put("keywords", interaction.getContent());
+ }
+
+ /**
+ * Returns an ArrayList of all UserMentions in this interaction
+ * Note: The ID list and the handle lists do not necessarily correspond 1:1 for this provider
+ * If those lists are the same size, then they will be merged into individual UserMention
+ * objects. However, if they are not the same size, a new UserMention object will be created
+ * for each entry in both lists.
+ *
+ * @param interaction
+ * @return
+ */
+ private ArrayList<UserMentions> createUserMentions(Interaction interaction) {
+ ArrayList<String> mentions = (ArrayList<String>) interaction.getAdditionalProperties().get("mentions");
+ ArrayList<Long> mentionIds = (ArrayList<Long>) interaction.getAdditionalProperties().get("mention_ids");
+ ArrayList<UserMentions> userMentions = new ArrayList<UserMentions>();
- if(mentions != null && mentionIds != null && (mentionIds.size() == mentions.size()) && !mentions.isEmpty() && !mentionIds.isEmpty()) {
+ if(mentions != null && mentionIds != null && (mentionIds.size() == mentions.size()) && !mentions.isEmpty() && !mentionIds.isEmpty()) {
+ for(int x = 0; x < mentions.size(); x ++) {
+ UserMentions mention = new UserMentions();
+
+ mention.setIdStr("id:twitter:" + mentionIds.get(x));
+ mention.setId(Long.parseLong(String.valueOf(mentionIds.get(x))));
+ mention.setName(mentions.get(x));
+ mention.setScreenName(mentions.get(x));
+
+ userMentions.add(mention);
+ }
+ } else if((mentions != null && !mentions.isEmpty()) || (mentionIds != null && !mentionIds.isEmpty())) {
+ if(mentions != null && !mentions.isEmpty()) {
for(int x = 0; x < mentions.size(); x ++) {
UserMentions mention = new UserMentions();
-
- mention.setIdStr("id:twitter:" + mentionIds.get(x));
- mention.setId(mentionIds.get(x));
mention.setName(mentions.get(x));
mention.setScreenName(mentions.get(x));
userMentions.add(mention);
}
- extensions.put("user_mentions", userMentions);
+ }
+ if(mentionIds != null && !mentionIds.isEmpty()) {
+ for(int x = 0; x < mentionIds.size(); x ++) {
+ UserMentions mention = new UserMentions();
+
+ mention.setIdStr("id:twitter:" + mentionIds.get(x));
+ mention.setId(Long.parseLong(String.valueOf(mentionIds.get(x))));
+
+ userMentions.add(mention);
+ }
}
}
- extensions.put("keywords", interaction.getContent());
+
+ return userMentions;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ce6e3276/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
index e7b664a..c30fa8f 100644
--- a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
+++ b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
@@ -738,7 +738,7 @@
"type": "array",
"items": [
{
- "type": "integer"
+ "type": "string"
}
]
},
[10/12] git commit: Merge pull request #8 from apache/master
Posted by mf...@apache.org.
Merge pull request #8 from apache/master
Merge Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/5c9a531d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/5c9a531d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/5c9a531d
Branch: refs/heads/master
Commit: 5c9a531d9227f44133fe67aea3f90ebbaf3de020
Parents: af1f294 38ed41a
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Thu Jul 10 10:15:52 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Thu Jul 10 10:15:52 2014 -0500
----------------------------------------------------------------------
.../ElasticsearchPersistReader.java | 3 +-
.../DatasiftTypeConverterProcessor.java | 12 +-----
.../DatasiftTweetActivitySerializer.java | 42 +++++++++++++++++++-
.../provider/SysomosHeartbeatStream.java | 10 +++++
.../sysomos/provider/SysomosProvider.java | 4 +-
5 files changed, 57 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[11/12] git commit: Merge branch 'master' into STREAMS-105
Posted by mf...@apache.org.
Merge branch 'master' into STREAMS-105
Conflicts:
streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/fbb8ccff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/fbb8ccff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/fbb8ccff
Branch: refs/heads/master
Commit: fbb8ccffc0db8de0f2d591d1e6a3251b6ff96053
Parents: abaf5b0 5c9a531
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Thu Jul 10 10:24:27 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Thu Jul 10 10:24:27 2014 -0500
----------------------------------------------------------------------
.../streams-persist-elasticsearch/README.md | 38 +
.../ElasticsearchConfigurator.java | 18 +
.../ElasticsearchPersistReader.java | 3 +-
.../ElasticsearchPersistUpdater.java | 35 -
.../ElasticsearchPersistWriter.java | 705 +++++++------------
.../ElasticsearchPersistWriterTask.java | 56 --
.../elasticsearch/ElasticsearchQuery.java | 34 +-
.../ElasticsearchReaderConfiguration.json | 5 +
.../ElasticsearchWriterConfiguration.json | 5 +
.../src/main/resources/reference.json | 9 +
streams-contrib/streams-persist-mongo/README.md | 16 +
.../streams/mongo/MongoPersistReader.java | 270 +++++++
.../src/main/resources/reference.json | 8 +
.../src/main/resources/reference.properties | 10 -
.../DatasiftTypeConverterProcessor.java | 12 +-
.../DatasiftTweetActivitySerializer.java | 180 ++---
.../provider/SysomosHeartbeatStream.java | 12 +-
.../sysomos/provider/SysomosProvider.java | 4 +-
.../twitter/processor/TwitterTypeConverter.java | 2 +-
.../TwitterJsonActivitySerializer.java | 3 +
.../TwitterJsonUserActivitySerializer.java | 72 ++
.../serializer/util/TwitterActivityUtil.java | 22 +
.../streams/local/builders/StreamComponent.java | 2 +-
.../local/tasks/StreamsProviderTask.java | 54 +-
.../local/builders/LocalStreamBuilderTest.java | 52 +-
.../local/test/processors/SlowProcessor.java | 50 ++
.../test/providers/EmptyResultSetProvider.java | 2 +-
.../test/providers/NumericMessageProvider.java | 63 +-
.../test/component/FileReaderProvider.java | 52 +-
29 files changed, 1024 insertions(+), 770 deletions(-)
----------------------------------------------------------------------
[02/12] git commit: Merge pull request #5 from apache/master
Posted by mf...@apache.org.
Merge pull request #5 from apache/master
Merge From Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d71b159d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d71b159d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d71b159d
Branch: refs/heads/master
Commit: d71b159d1996a939cccede70b509c1767478aa72
Parents: 2ee3157 34c95a6
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Fri Jun 27 16:43:57 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Fri Jun 27 16:43:57 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
streams-contrib/streams-provider-google/google-gmail/pom.xml | 2 +-
.../apache/streams/sysomos/provider/SysomosHeartbeatStream.java | 4 +++-
streams-contrib/streams-provider-twitter/pom.xml | 5 +++--
4 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[07/12] git commit: STREAMS-105 | Code review feedback
Posted by mf...@apache.org.
STREAMS-105 | Code review feedback
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/26f3614f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/26f3614f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/26f3614f
Branch: refs/heads/master
Commit: 26f3614fd7d72be4526fc9589e75dfb32dda6588
Parents: 949b676
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Wed Jul 2 10:11:16 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Wed Jul 2 10:11:16 2014 -0500
----------------------------------------------------------------------
.../datasift/serializer/DatasiftDefaultActivitySerializer.java | 2 +-
.../datasift/serializer/DatasiftTweetActivitySerializer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/26f3614f/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftDefaultActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftDefaultActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftDefaultActivitySerializer.java
index 09126dc..4095df6 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftDefaultActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftDefaultActivitySerializer.java
@@ -174,7 +174,7 @@ public class DatasiftDefaultActivitySerializer implements ActivitySerializer<Dat
ActivityObject actObj = new ActivityObject();
actObj.setObjectType(interaction.getContenttype());
actObj.setUrl(interaction.getLink());
- actObj.setId(interaction.getId());
+ actObj.setId(formatId("post",interaction.getId()));
actObj.setContent(interaction.getContent());
return actObj;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/26f3614f/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
index 1fecc4b..0482235 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
@@ -165,7 +165,7 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
double[] coordiantes = new double[] { twitter.getGeo().getLongitude(), twitter.getGeo().getLatitude() };
Map<String, Object> coords = Maps.newHashMap();
coords.put("coordinates", coordiantes);
- coords.put("type", "geo_point");
+ coords.put("type", "point");
location.put("coordinates", coords);
extensions.put("location", location);
}
[08/12] git commit: STREAMS-105 | Code review feedback
Posted by mf...@apache.org.
STREAMS-105 | Code review feedback
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/abaf5b00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/abaf5b00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/abaf5b00
Branch: refs/heads/master
Commit: abaf5b00b3cfb196ff736029a8dc44d3c90b7a86
Parents: 26f3614
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Mon Jul 7 13:23:11 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Mon Jul 7 13:23:11 2014 -0500
----------------------------------------------------------------------
.../datasift/serializer/DatasiftTweetActivitySerializer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/abaf5b00/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
index 0482235..158d027 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
@@ -165,7 +165,7 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
double[] coordiantes = new double[] { twitter.getGeo().getLongitude(), twitter.getGeo().getLatitude() };
Map<String, Object> coords = Maps.newHashMap();
coords.put("coordinates", coordiantes);
- coords.put("type", "point");
+ coords.put("type", "Point");
location.put("coordinates", coords);
extensions.put("location", location);
}