Repository: incubator-streams Updated Branches: refs/heads/master 6f5caa238 -> 4168beb81
Trivial fixes, this closes apache/incubator-streams#312 Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/4168beb8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/4168beb8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/4168beb8 Branch: refs/heads/master Commit: 4168beb8137d2220d9246cac331a244fe6e730c8 Parents: 6f5caa2 Author: smarthi <[email protected]> Authored: Sat Oct 22 14:07:01 2016 -0400 Committer: smarthi <[email protected]> Committed: Sat Oct 22 14:07:01 2016 -0400 ---------------------------------------------------------------------- .../processor/GooglePlusCommentProcessor.java | 13 +++---- .../gplus/provider/GPlusEventProcessor.java | 11 +++--- .../provider/GPlusUserActivityCollector.java | 2 -- .../provider/GPlusUserActivityProvider.java | 7 ++-- .../InstagramMediaFeedDataConverter.java | 6 ---- .../InstagramUserInfoDataConverter.java | 11 ++---- .../serializer/util/InstagramActivityUtil.java | 37 +++++++++----------- .../data/InstagramMediaFeedDataConverterIT.java | 22 +++++------- 8 files changed, 39 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4168beb8/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusCommentProcessor.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusCommentProcessor.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusCommentProcessor.java index d095b32..d926541 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusCommentProcessor.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusCommentProcessor.java @@ -19,19 +19,16 @@ package com.google.gplus.processor; -import com.google.api.client.util.Lists; import com.google.api.services.plus.model.Comment; -import com.google.api.services.plus.model.Person; -import com.google.gplus.serializer.util.GPlusActivityDeserializer; import com.google.gplus.serializer.util.GooglePlusActivityUtil; +import java.util.ArrayList; +import java.util.List; import org.apache.streams.core.StreamsDatum; import org.apache.streams.core.StreamsProcessor; import org.apache.streams.pojo.json.Activity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; - public class GooglePlusCommentProcessor implements StreamsProcessor { private final static String STREAMS_ID = "GooglePlusCommentProcessor"; private final static Logger LOGGER = LoggerFactory.getLogger(GooglePlusCommentProcessor.class); @@ -57,8 +54,8 @@ public class GooglePlusCommentProcessor implements StreamsProcessor { String activityId = getGPlusID(activity.getId()); //Call Google Plus API to get list of comments for this activity ID - /**TODO: FILL ME OUT WITH THE API CALL**/ - List<Comment> comments = Lists.newArrayList(); + /* TODO: FILL ME OUT WITH THE API CALL **/ + List<Comment> comments = new ArrayList<>(); googlePlusActivityUtil.updateActivity(comments, activity); result = new StreamsDatum(activity); @@ -71,7 +68,7 @@ public class GooglePlusCommentProcessor implements StreamsProcessor { if( result != null ) return com.google.common.collect.Lists.newArrayList(result); else - return com.google.common.collect.Lists.newArrayList(); + return new ArrayList<>(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4168beb8/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusEventProcessor.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusEventProcessor.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusEventProcessor.java index 6ed2ae1..1f1ee2f 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusEventProcessor.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusEventProcessor.java @@ -25,6 +25,7 @@ import org.apache.streams.pojo.json.Activity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Objects; import java.util.Queue; import java.util.Random; import java.util.concurrent.BlockingQueue; @@ -38,17 +39,15 @@ public class GPlusEventProcessor implements Runnable { private BlockingQueue<String> inQueue; private Queue<StreamsDatum> outQueue; - private Class inClass; private Class outClass; private GPlusActivitySerializer gPlusActivitySerializer = new GPlusActivitySerializer(); - public final static String TERMINATE = new String("TERMINATE"); + private final static String TERMINATE = "TERMINATE"; public GPlusEventProcessor(BlockingQueue<String> inQueue, Queue<StreamsDatum> outQueue, Class inClass, Class outClass) { this.inQueue = inQueue; this.outQueue = outQueue; - this.inClass = inClass; this.outClass = outClass; } @@ -65,7 +64,7 @@ public class GPlusEventProcessor implements Runnable { try { String item = inQueue.take(); Thread.sleep(new Random().nextInt(100)); - if(item==TERMINATE) { + if(Objects.equals(item, TERMINATE)) { LOGGER.info("Terminating!"); break; } @@ -78,7 +77,7 @@ public class GPlusEventProcessor implements Runnable { outQueue.offer(new StreamsDatum(item)); else { // convert to desired format - com.google.api.services.plus.model.Activity gplusActivity = (com.google.api.services.plus.model.Activity)mapper.readValue(item, com.google.api.services.plus.model.Activity.class); + com.google.api.services.plus.model.Activity gplusActivity = mapper.readValue(item, com.google.api.services.plus.model.Activity.class); Activity streamsActivity = gPlusActivitySerializer.deserialize(gplusActivity); @@ -91,4 +90,4 @@ public class GPlusEventProcessor implements Runnable { } } -}; +} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4168beb8/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java index bf8d20f..f475e5d 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java @@ -132,6 +132,4 @@ public class GPlusUserActivityCollector extends GPlusDataCollector { } } - - } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4168beb8/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java index ab77973..e6b2223 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java @@ -37,7 +37,6 @@ import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.PrintStream; -import java.util.Iterator; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; @@ -59,7 +58,7 @@ import java.util.concurrent.TimeUnit; */ public class GPlusUserActivityProvider extends AbstractGPlusProvider{ - public final static String STREAMS_ID = "GPlusUserActivityProvider"; + private final static String STREAMS_ID = "GPlusUserActivityProvider"; public GPlusUserActivityProvider() { super(); @@ -104,9 +103,7 @@ public class GPlusUserActivityProvider extends AbstractGPlusProvider{ provider.startStream(); do { Uninterruptibles.sleepUninterruptibly(streamsConfiguration.getBatchFrequencyMs(), TimeUnit.MILLISECONDS); - Iterator<StreamsDatum> iterator = provider.readCurrent().iterator(); - while(iterator.hasNext()) { - StreamsDatum datum = iterator.next(); + for (StreamsDatum datum : provider.readCurrent()) { String json; if (datum.getDocument() instanceof String) json = (String) datum.getDocument(); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4168beb8/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramMediaFeedDataConverter.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramMediaFeedDataConverter.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramMediaFeedDataConverter.java index 0122248..8795e2c 100644 --- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramMediaFeedDataConverter.java +++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramMediaFeedDataConverter.java @@ -18,19 +18,13 @@ package org.apache.streams.instagram.serializer; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import org.apache.commons.lang.NotImplementedException; import org.apache.streams.data.ActivityConverter; -import org.apache.streams.data.ActivitySerializer; import org.apache.streams.exceptions.ActivityConversionException; -import org.apache.streams.exceptions.ActivitySerializerException; -import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.json.Activity; import org.jinstagram.entity.users.feed.MediaFeedData; -import java.io.IOException; import java.io.Serializable; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4168beb8/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramUserInfoDataConverter.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramUserInfoDataConverter.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramUserInfoDataConverter.java index eee5674..4fa680c 100644 --- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramUserInfoDataConverter.java +++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramUserInfoDataConverter.java @@ -18,15 +18,9 @@ package org.apache.streams.instagram.serializer; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import org.apache.streams.data.ActivityObjectConverter; -import org.apache.streams.data.ActivitySerializer; import org.apache.streams.exceptions.ActivityConversionException; -import org.apache.streams.exceptions.ActivitySerializerException; -import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Image; import org.apache.streams.pojo.json.Provider; import org.jinstagram.entity.users.basicinfo.UserInfoData; @@ -34,9 +28,8 @@ import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.commons.lang.NotImplementedException; -import java.util.List; +import java.util.HashMap; import java.util.Map; /** @@ -82,7 +75,7 @@ public class InstagramUserInfoDataConverter implements ActivityObjectConverter<U activityObject.setAdditionalProperty("handle", serialized.getUsername()); activityObject.setDisplayName(serialized.getFullName()); activityObject.setUrl(serialized.getWebsite()); - Map<String, Object> extensions = Maps.newHashMap(); + Map<String, Object> extensions = new HashMap<>(); activityObject.setAdditionalProperty("extensions", extensions); extensions.put("screenName", serialized.getUsername()); extensions.put("posts", serialized.getCounts().getMedia()); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4168beb8/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java index 62aac93..bf3f233 100644 --- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java +++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java @@ -48,8 +48,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.apache.streams.data.util.ActivityUtil.ensureExtensions; - /** * Provides utilities for working with Activity objects within the context of Instagram */ @@ -59,7 +57,7 @@ public class InstagramActivityUtil { * Updates the given Activity object with the values from the item * @param item the object to use as the source * @param activity the target of the updates. Will receive all values from the tweet. - * @throws ActivitySerializerException + * @throws ActivityConversionException */ public static void updateActivity(MediaFeedData item, Activity activity) throws ActivityConversionException { activity.setActor(buildActor(item)); @@ -109,7 +107,7 @@ public class InstagramActivityUtil { Counts counts = item.getCounts(); - Map<String, Object> extensions = new HashMap<String, Object>(); + Map<String, Object> extensions = new HashMap<>(); extensions.put("followers", counts.getFollowedBy()); extensions.put("follows", counts.getFollows()); @@ -143,7 +141,7 @@ public class InstagramActivityUtil { Image image = new Image(); image.setUrl(item.getUser().getProfilePictureUrl()); - Map<String, Object> extensions = new HashMap<String, Object>(); + Map<String, Object> extensions = new HashMap<>(); extensions.put("screenName", item.getUser().getUserName()); actor.setDisplayName(item.getUser().getFullName()); @@ -175,13 +173,13 @@ public class InstagramActivityUtil { Image standardResolution = new Image(); if(item.getType().equals("image") && item.getImages() != null) { ImageData standardResolutionData = item.getImages().getStandardResolution(); - standardResolution.setHeight(new Long(standardResolutionData.getImageHeight())); - standardResolution.setWidth(new Long(standardResolutionData.getImageWidth())); + standardResolution.setHeight((long) standardResolutionData.getImageHeight()); + standardResolution.setWidth((long) standardResolutionData.getImageWidth()); standardResolution.setUrl(standardResolutionData.getImageUrl()); } else if(item.getType().equals("video") && item.getVideos() != null) { VideoData standardResolutionData = item.getVideos().getStandardResolution(); - standardResolution.setHeight(new Long(standardResolutionData.getHeight())); - standardResolution.setWidth(new Long(standardResolutionData.getWidth())); + standardResolution.setHeight((long) standardResolutionData.getHeight()); + standardResolution.setWidth((long) standardResolutionData.getWidth()); standardResolution.setUrl(standardResolutionData.getUrl()); } @@ -197,7 +195,7 @@ public class InstagramActivityUtil { * @return */ public static List<ActivityObject> buildActivityObjectAttachments(MediaFeedData item) { - List<ActivityObject> attachments = new ArrayList<ActivityObject>(); + List<ActivityObject> attachments = new ArrayList<>(); addImageObjects(attachments, item); addVideoObjects(attachments, item); @@ -221,16 +219,16 @@ public class InstagramActivityUtil { ActivityObject thumbnailObject = new ActivityObject(); Image thumbnailImage = new Image(); thumbnailImage.setUrl(thumbnail.getImageUrl()); - thumbnailImage.setHeight(new Long(thumbnail.getImageHeight())); - thumbnailImage.setWidth(new Long(thumbnail.getImageWidth())); + thumbnailImage.setHeight((long) thumbnail.getImageHeight()); + thumbnailImage.setWidth((long) thumbnail.getImageWidth()); thumbnailObject.setImage(thumbnailImage); thumbnailObject.setObjectType("image"); ActivityObject lowResolutionObject = new ActivityObject(); Image lowResolutionImage = new Image(); lowResolutionImage.setUrl(lowResolution.getImageUrl()); - lowResolutionImage.setHeight(new Long(lowResolution.getImageHeight())); - lowResolutionImage.setWidth(new Long(lowResolution.getImageWidth())); + lowResolutionImage.setHeight((long) lowResolution.getImageHeight()); + lowResolutionImage.setWidth((long) lowResolution.getImageWidth()); lowResolutionObject.setImage(lowResolutionImage); lowResolutionObject.setObjectType("image"); @@ -257,8 +255,8 @@ public class InstagramActivityUtil { ActivityObject lowResolutionVideoObject = new ActivityObject(); Image lowResolutionVideoImage = new Image(); lowResolutionVideoImage.setUrl(lowResolutionVideo.getUrl()); - lowResolutionVideoImage.setHeight(new Long(lowResolutionVideo.getHeight())); - lowResolutionVideoImage.setWidth(new Long(lowResolutionVideo.getWidth())); + lowResolutionVideoImage.setHeight((long) lowResolutionVideo.getHeight()); + lowResolutionVideoImage.setWidth((long) lowResolutionVideo.getWidth()); lowResolutionVideoObject.setImage(lowResolutionVideoImage); lowResolutionVideoObject.setObjectType("video"); @@ -275,8 +273,7 @@ public class InstagramActivityUtil { * @return a list of links corresponding to the expanded URL */ public static List<String> getLinks(MediaFeedData item) { - List<String> links = Lists.newArrayList(); - return links; + return new ArrayList<>(); } /** @@ -288,7 +285,7 @@ public class InstagramActivityUtil { Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity); if(item.getLocation() != null) { - Map<String, Object> coordinates = new HashMap<String, Object>(); + Map<String, Object> coordinates = new HashMap<>(); coordinates.put("type", "Point"); coordinates.put("coordinates", "[" + item.getLocation().getLongitude() + "," + item.getLocation().getLatitude() + "]"); @@ -328,7 +325,7 @@ public class InstagramActivityUtil { addLocationExtension(activity, item); if(item.getLikes() != null) { - Map<String, Object> likes = new HashMap<String, Object>(); + Map<String, Object> likes = new HashMap<>(); likes.put("count", item.getLikes().getCount()); extensions.put("likes", likes); } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4168beb8/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramMediaFeedDataConverterIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramMediaFeedDataConverterIT.java b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramMediaFeedDataConverterIT.java index a54cfdb..af99c14 100644 --- a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramMediaFeedDataConverterIT.java +++ b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/instagram/test/data/InstagramMediaFeedDataConverterIT.java @@ -20,29 +20,23 @@ package org.apache.streams.instagram.test.data; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintStream; import org.apache.commons.lang.StringUtils; import org.apache.streams.data.ActivityConverter; -import org.apache.streams.data.ActivityObjectConverter; import org.apache.streams.instagram.serializer.InstagramMediaFeedDataConverter; -import org.apache.streams.instagram.serializer.InstagramUserInfoDataConverter; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.json.Activity; -import org.apache.streams.pojo.json.ActivityObject; -import org.jinstagram.entity.users.basicinfo.UserInfoData; import org.jinstagram.entity.users.feed.MediaFeedData; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedOutputStream; -import java.io.BufferedReader; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.PrintStream; -import java.util.Map; - import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; @@ -62,12 +56,12 @@ public class InstagramMediaFeedDataConverterIT { private ObjectMapper mapper = StreamsJacksonMapper.getInstance(); @Test - public void InstagramMediaFeedDataConverterIT() throws Exception { + public void InstagramMediaFeedDataConverterITCase() throws Exception { InputStream is = InstagramMediaFeedDataConverterIT.class.getResourceAsStream("/testMediaFeedObjects.txt"); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); - PrintStream outStream = new PrintStream(new BufferedOutputStream(new FileOutputStream("target/test-classes/InstagramMediaFeedDataConverterIT.txt"))); + PrintStream outStream = new PrintStream(new BufferedOutputStream(new FileOutputStream("target/test-classes/InstagramMediaFeedDataConverterITCase.txt"))); try { while (br.ready()) {
