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/07/21 17:44:56 UTC

[10/47] git commit: STREAMS-105 | Code review feedback

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/STREAMS-46
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);
             }
         }