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/25 15:24:10 UTC
[1/3] git commit: STREAMS-105 | Changed user_mentions so that we use
"handle" instead of "screenName" Altered the pom file so that the tests would
be able to run given the test package structure
Repository: incubator-streams
Updated Branches:
refs/heads/master 7216a6fdf -> c454d52f2
STREAMS-105 | Changed user_mentions so that we use "handle" instead of "screenName" Altered the pom file so that the tests would be able to run given the test package structure
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3416369e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3416369e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3416369e
Branch: refs/heads/master
Commit: 3416369e26d36e633b740b96144e3cfac4c7bcbd
Parents: b7e4c34
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Mon Jul 14 14:40:56 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Mon Jul 14 14:40:56 2014 -0500
----------------------------------------------------------------------
.../streams-provider-datasift/pom.xml | 2 +-
.../DatasiftTweetActivitySerializer.java | 55 +++++++++++++++-----
.../DatasiftActivitySerializerTest.java | 8 ---
3 files changed, 43 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3416369e/streams-contrib/streams-provider-datasift/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/pom.xml b/streams-contrib/streams-provider-datasift/pom.xml
index 5c5f674..3b9f96f 100644
--- a/streams-contrib/streams-provider-datasift/pom.xml
+++ b/streams-contrib/streams-provider-datasift/pom.xml
@@ -83,7 +83,7 @@
<build>
<sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
+ <testSourceDirectory>src/test/java17</testSourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3416369e/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 443aeec..e7b0a52 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
@@ -35,6 +35,7 @@ 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;
@@ -210,20 +211,48 @@ 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<Map<String,Object>> 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<Map<String,Object>> createUserMentions(Interaction interaction) {
+ ArrayList<String> mentions = (ArrayList<String>) interaction.getAdditionalProperties().get("mentions");
+ ArrayList<Long> mentionIds = (ArrayList<Long>) interaction.getAdditionalProperties().get("mention_ids");
+ ArrayList<Map<String,Object>> userMentions = new ArrayList<Map<String,Object>>();
+
+ if(mentions != null && !mentions.isEmpty()) {
+ for(int x = 0; x < mentions.size(); x ++) {
+ Map<String, Object> actor = new HashMap<String, Object>();
+ actor.put("displayName", mentions.get(x));
+ actor.put("handle", mentions.get(x));
+
+ userMentions.add(actor);
+ }
+ }
+ if(mentionIds != null && !mentionIds.isEmpty()) {
+ for(int x = 0; x < mentionIds.size(); x ++) {
+ Map<String, Object> actor = new HashMap<String, Object>();
+ actor.put("id", "id:twitter:" + mentionIds.get(x));
+
+ userMentions.add(actor);
+ }
+ }
+
+ return userMentions;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3416369e/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java
index f90b5ed..88dd2d6 100644
--- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java
+++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java
@@ -12,9 +12,6 @@ import java.util.Scanner;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-/**
- * Created by rebanks on 5/29/14.
- */
public class DatasiftActivitySerializerTest {
private static final DatasiftActivitySerializer SERIALIZER = new DatasiftActivitySerializer();
@@ -56,17 +53,12 @@ public class DatasiftActivitySerializerTest {
*/
private void testGeneralConversion(String json) throws Exception {
Activity activity = SERIALIZER.deserialize(json);
- assertNotNull(json, activity);
assertNotNull(json, activity.getId());
assertTrue(json, activity.getId().contains("datasift"));
-// assertNotNull(json, activity.getContent()); //Some facebook do not have content
assertNotNull(json, activity.getPublished());
assertNotNull(json, activity.getUrl());
Actor actor = activity.getActor();
assertNotNull(json, actor);
- //Not all interactions have authors
-// assertNotNull(json, actor.getId());
-// assertNotNull(json+"\n"+MAPPER.writeValueAsString(activity)+"\n", actor.getDisplayName());
}
[2/3] git commit: STREAMS-105 | Removed requirement for all data sift
tests to run, regardless if java 7 is being used or not
Posted by mf...@apache.org.
STREAMS-105 | Removed requirement for all data sift tests to run, regardless if java 7 is being used or not
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/ae18656b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/ae18656b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/ae18656b
Branch: refs/heads/master
Commit: ae18656bb83207362480572756fe52ed61faa97e
Parents: 3416369
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Mon Jul 14 18:02:07 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Mon Jul 14 18:02:07 2014 -0500
----------------------------------------------------------------------
streams-contrib/streams-provider-datasift/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ae18656b/streams-contrib/streams-provider-datasift/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/pom.xml b/streams-contrib/streams-provider-datasift/pom.xml
index 3b9f96f..5c5f674 100644
--- a/streams-contrib/streams-provider-datasift/pom.xml
+++ b/streams-contrib/streams-provider-datasift/pom.xml
@@ -83,7 +83,7 @@
<build>
<sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/test/java17</testSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
[3/3] git commit: Merge PR#56 from 'robdouglas/STREAMS-105'
Posted by mf...@apache.org.
Merge PR#56 from 'robdouglas/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/c454d52f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c454d52f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/c454d52f
Branch: refs/heads/master
Commit: c454d52f20c56caf69c287ea20d3608fbbeb3937
Parents: 7216a6f ae18656
Author: mfranklin <mf...@apache.org>
Authored: Fri Jul 25 09:14:32 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Fri Jul 25 09:14:32 2014 -0400
----------------------------------------------------------------------
.../DatasiftTweetActivitySerializer.java | 55 +++++++++++++++-----
.../DatasiftActivitySerializerTest.java | 8 ---
2 files changed, 42 insertions(+), 21 deletions(-)
----------------------------------------------------------------------