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 2016/10/22 20:42:49 UTC
[5/5] incubator-streams git commit: remove twitterconfigurator
remove twitterconfigurator
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/03397cd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/03397cd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/03397cd3
Branch: refs/heads/master
Commit: 03397cd3d6009aa0f558feeaff9f69bc336e3085
Parents: 5e8b9b4
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Sat Oct 22 15:38:17 2016 -0500
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Sat Oct 22 15:40:42 2016 -0500
----------------------------------------------------------------------
.../twitter/processor/FetchAndReplaceTwitterProcessor.java | 7 +++----
.../streams/twitter/provider/TwitterStreamProvider.java | 9 ++++-----
2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/03397cd3/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/FetchAndReplaceTwitterProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/FetchAndReplaceTwitterProcessor.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/FetchAndReplaceTwitterProcessor.java
index 217d5dc..d191449 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/FetchAndReplaceTwitterProcessor.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/FetchAndReplaceTwitterProcessor.java
@@ -20,6 +20,7 @@
package org.apache.streams.twitter.processor;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
import org.apache.streams.config.ComponentConfigurator;
import org.apache.streams.config.StreamsConfigurator;
import org.apache.streams.core.StreamsDatum;
@@ -43,7 +44,6 @@ import twitter4j.TwitterFactory;
import twitter4j.TwitterObjectFactory;
import twitter4j.conf.ConfigurationBuilder;
-import java.util.ArrayList;
import java.util.List;
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.getProvider;
@@ -69,8 +69,7 @@ public class FetchAndReplaceTwitterProcessor implements StreamsProcessor {
private int retryCount;
public FetchAndReplaceTwitterProcessor() {
- this(new ComponentConfigurator<>(TwitterStreamConfiguration.class)
- .detectConfiguration(StreamsConfigurator.getConfig().getConfig("twitter")));
+ this(new ComponentConfigurator<>(TwitterStreamConfiguration.class).detectConfiguration(StreamsConfigurator.config, "twitter"));
}
public FetchAndReplaceTwitterProcessor(TwitterStreamConfiguration config) {
@@ -93,7 +92,7 @@ public class FetchAndReplaceTwitterProcessor implements StreamsProcessor {
} else {
throw new IllegalStateException("Requires an activity document");
}
- return new ArrayList<>();
+ return Lists.newArrayList(entry);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/03397cd3/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
index 3765229..b426966 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
@@ -107,7 +107,7 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
ObjectMapper mapper = new StreamsJacksonMapper(Lists.newArrayList(TwitterDateTimeFormat.TWITTER_FORMAT));
- PrintStream outStream;
+ PrintStream outStream = null;
try {
outStream = new PrintStream(new BufferedOutputStream(new FileOutputStream(outfile)));
} catch (FileNotFoundException e) {
@@ -164,8 +164,7 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
}
public TwitterStreamProvider() {
- this.config = new ComponentConfigurator<>(TwitterStreamConfiguration.class)
- .detectConfiguration(StreamsConfigurator.getConfig().getConfig("twitter"));
+ this.config = new ComponentConfigurator<>(TwitterStreamConfiguration.class).detectConfiguration(StreamsConfigurator.config, "twitter");
}
public TwitterStreamProvider(TwitterStreamConfiguration config) {
@@ -287,9 +286,9 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
return;
}
- LOGGER.debug("host={}\tendpoint={}\taut={}", hosebirdHosts, endpoint, auth);
+ LOGGER.debug("host={}\tendpoint={}\taut={}", new Object[] {hosebirdHosts,endpoint,auth});
- providerQueue = new LinkedBlockingQueue<>(MAX_BATCH);
+ providerQueue = new LinkedBlockingQueue<Future<List<StreamsDatum>>>(MAX_BATCH);
client = new ClientBuilder()
.name("apache/streams/streams-contrib/streams-provider-twitter")