Repository: incubator-streams Updated Branches: refs/heads/master 1797a7073 -> 8de626e94
STREAMS-448: TwitterTimelineProvider bug fix resolves #354 Squashed commit of the following: commit 9b79df77e019219b04476c2b9157b03435d21465 Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Date: Fri Jan 27 17:09:22 2017 -0600 PR feedback commit 5649ff6ff0fe7253f9a3e7ffb076b6b3be51c1c1 Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Date: Fri Jan 27 16:58:48 2017 -0600 STREAMS-448: TwitterTimelineProvider bug fix resolves STREAMS-448 Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/8de626e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/8de626e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/8de626e9 Branch: refs/heads/master Commit: 8de626e94ce786d8d2d70733375b9e3c62255c7a Parents: 1797a70 Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Fri Jan 27 17:10:23 2017 -0600 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Fri Jan 27 17:10:23 2017 -0600 ---------------------------------------------------------------------- .../twitter/provider/TwitterTimelineProvider.java | 14 +++++++------- .../src/test/resources/TwitterTimelineProviderIT.conf | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/8de626e9/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java index 9778de0..9f76fed 100644 --- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java +++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java @@ -312,21 +312,21 @@ public class TwitterTimelineProvider implements StreamsProvider, Serializable { List<String> screenNames = new ArrayList<>(); ids = new ArrayList<>(); - for (String account : config.getInfo()) { + for ( String account : config.getInfo() ) { try { - if (new Long(account) != null) { + if ( new Long(account) != null ) { ids.add(Long.parseLong(Objects.toString(account, null))); - } else { - screenNames.add(account); } - } catch (Exception ex) { + } catch ( NumberFormatException ex ) { + screenNames.add(account); + } catch ( Exception ex ) { LOGGER.error("Exception while trying to add ID: {{}}, {}", account, ex); } } // Twitter allows for batches up to 100 per request, but you cannot mix types screenNameBatches = new ArrayList<>(); - while (screenNames.size() >= 100) { + while ( screenNames.size() >= 100 ) { screenNameBatches.add(screenNames.subList(0, 100).toArray(new String[0])); screenNames = screenNames.subList(100, screenNames.size()); } @@ -335,7 +335,7 @@ public class TwitterTimelineProvider implements StreamsProvider, Serializable { screenNameBatches.add(screenNames.toArray(new String[ids.size()])); } - for (String[] screenNameBatche : screenNameBatches) { + for ( String[] screenNameBatche : screenNameBatches ) { Collection<Long> batchIds = retrieveIds(screenNameBatche); ids.addAll(batchIds); } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/8de626e9/streams-contrib/streams-provider-twitter/src/test/resources/TwitterTimelineProviderIT.conf ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-twitter/src/test/resources/TwitterTimelineProviderIT.conf b/streams-contrib/streams-provider-twitter/src/test/resources/TwitterTimelineProviderIT.conf index 1fad66d..779a1bf 100644 --- a/streams-contrib/streams-provider-twitter/src/test/resources/TwitterTimelineProviderIT.conf +++ b/streams-contrib/streams-provider-twitter/src/test/resources/TwitterTimelineProviderIT.conf @@ -16,6 +16,6 @@ # under the License. twitter.info = [ - 18055613 + "TheASF" ] -twitter.max_items = 1000 \ No newline at end of file +twitter.max_items = 1000