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/08/25 18:42:51 UTC
[4/8] git commit: STREAMS-145 | Updated comments
STREAMS-145 | Updated comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d75fac66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d75fac66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d75fac66
Branch: refs/heads/master
Commit: d75fac66e0bdc3028b2f762bde4f8db82e2cf4ba
Parents: b85dfa7
Author: Ryan Ebanks <re...@Informations-MacBook-Pro-3.local>
Authored: Thu Aug 14 15:33:35 2014 -0500
Committer: Ryan Ebanks <re...@Informations-MacBook-Pro-3.local>
Committed: Thu Aug 14 15:33:35 2014 -0500
----------------------------------------------------------------------
.../streams/instagram/provider/InstagramAbstractProvider.java | 7 ++-----
.../streams/instagram/provider/InstagramDataCollector.java | 4 ++--
.../provider/userinfo/InstagramUserInfoCollector.java | 3 ++-
.../provider/userinfo/InstagramUserInfoProvider.java | 3 ++-
4 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d75fac66/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramAbstractProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramAbstractProvider.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramAbstractProvider.java
index 9eb6e6f..e08dc04 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramAbstractProvider.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramAbstractProvider.java
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
/**
- * Instagram {@link org.apache.streams.core.StreamsProvider} that provides the recent media data for a group of users
+ * Instagram {@link org.apache.streams.core.StreamsProvider} that provides Instagram data for a group of users
*/
public abstract class InstagramAbstractProvider implements StreamsProvider {
@@ -104,11 +104,8 @@ public abstract class InstagramAbstractProvider implements StreamsProvider {
@Override
public void cleanUp() {
- this.executorService.shutdown();
try {
- this.executorService.awaitTermination(5, TimeUnit.SECONDS);
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
+ ComponentUtils.shutdownExecutor(this.executorService, 5, 5);
} finally {
this.executorService = null;
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d75fac66/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramDataCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramDataCollector.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramDataCollector.java
index 2e3add6..d7a98fc 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramDataCollector.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramDataCollector.java
@@ -37,7 +37,7 @@ import java.util.Queue;
import java.util.concurrent.atomic.AtomicBoolean;
/**
- * Executes on all of the Instagram requests to collect the media feed data.
+ * Executes on all of the Instagram requests to collect the Instagram data.
* <p/>
* If errors/exceptions occur when trying to gather data for a particular user, that user is skipped and the collector
* move on to the next user. If a rate limit exception occurs it employs an exponential back off strategy.
@@ -106,7 +106,7 @@ public abstract class InstagramDataCollector<T> implements Runnable {
}
/**
- * @return true when the collector has queued all of the available media feed data for the provided users.
+ * @return true when the collector has queued all of the available Instagram data for the provided users.
*/
public boolean isCompleted() {
return this.isCompleted.get();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d75fac66/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoCollector.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoCollector.java
index d9be9b0..dcdcb6d 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoCollector.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoCollector.java
@@ -30,7 +30,8 @@ import java.util.List;
import java.util.Queue;
/**
- *
+ * InstagramDataCollector that pulls UserInfoData from Instagram
+ * @see org.apache.streams.instagram.provider.InstagramDataCollector
*/
public class InstagramUserInfoCollector extends InstagramDataCollector<UserInfoData>{
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d75fac66/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoProvider.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoProvider.java
index b873e9c..39c84a9 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoProvider.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoProvider.java
@@ -19,7 +19,8 @@ import org.apache.streams.instagram.provider.InstagramAbstractProvider;
import org.apache.streams.instagram.provider.InstagramDataCollector;
/**
- *
+ * Instagram provider that pulls UserInfoData from Instagram
+ * @see org.apache.streams.instagram.provider.InstagramAbstractProvider
*/
public class InstagramUserInfoProvider extends InstagramAbstractProvider {