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 2015/08/18 21:28:03 UTC
[1/5] incubator-streams git commit: resolves STREAMS-350
Repository: incubator-streams
Updated Branches:
refs/heads/master 288a68b0e -> 776a22425
resolves STREAMS-350
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/5027a064
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/5027a064
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/5027a064
Branch: refs/heads/master
Commit: 5027a064c40f7f211eb43904cdd5cac461eb37b9
Parents: 6683683
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Mon Jul 27 11:24:03 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Mon Jul 27 11:24:03 2015 -0500
----------------------------------------------------------------------
.../twitter/provider/TwitterTimelineProvider.java | 12 +++++++++++-
.../provider/TwitterUserInformationProvider.java | 11 ++++++++++-
.../jsonschema/com/twitter/TwitterConfiguration.json | 12 ++++++++----
3 files changed, 29 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/5027a064/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 0f0a160..8f5fa24 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
@@ -274,7 +274,17 @@ public class TwitterTimelineProvider implements StreamsProvider, Serializable {
}
public Twitter getTwitterClient() {
- String baseUrl = "https://api.twitter.com:443/1.1/";
+
+ String baseUrl = new StringBuilder()
+ .append(config.getProtocol())
+ .append("://")
+ .append(config.getHost())
+ .append(":")
+ .append(config.getPort())
+ .append("/")
+ .append(config.getVersion())
+ .append("/")
+ .toString();
ConfigurationBuilder builder = new ConfigurationBuilder()
.setOAuthConsumerKey(config.getOauth().getConsumerKey())
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/5027a064/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
index bcbd22a..0a7fe58 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
@@ -288,7 +288,16 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
protected Twitter getTwitterClient()
{
- String baseUrl = "https://api.twitter.com:443/1.1/";
+ String baseUrl = new StringBuilder()
+ .append(twitterUserInformationConfiguration.getProtocol())
+ .append("://")
+ .append(twitterUserInformationConfiguration.getHost())
+ .append(":")
+ .append(twitterUserInformationConfiguration.getPort())
+ .append("/")
+ .append(twitterUserInformationConfiguration.getVersion())
+ .append("/")
+ .toString();
ConfigurationBuilder builder = new ConfigurationBuilder()
.setOAuthConsumerKey(twitterUserInformationConfiguration.getOauth().getConsumerKey())
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/5027a064/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/TwitterConfiguration.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/TwitterConfiguration.json b/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/TwitterConfiguration.json
index 884603a..5d911af 100644
--- a/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/TwitterConfiguration.json
+++ b/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/TwitterConfiguration.json
@@ -10,19 +10,23 @@
"properties": {
"protocol": {
"type": "string",
- "description": "The protocol"
+ "description": "The protocol",
+ "default": "https"
},
"host": {
"type": "string",
- "description": "The host"
+ "description": "The host",
+ "default": "api.twitter.com"
},
"port": {
"type": "integer",
- "description": "The port"
+ "description": "The port",
+ "default": 443
},
"version": {
"type": "string",
- "description": "The version"
+ "description": "The version",
+ "default": "1.1"
},
"endpoint": {
"type": "string",
[5/5] incubator-streams git commit: Merge branch 'STREAMS-350'
Posted by sb...@apache.org.
Merge branch 'STREAMS-350'
* STREAMS-350:
found another unconfigured baseURL
consolidated
consolidated
resolves STREAMS-350
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/776a2242
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/776a2242
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/776a2242
Branch: refs/heads/master
Commit: 776a2242505a01b2f27eeb787db9b5f098029e47
Parents: 288a68b c0a448d
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Aug 18 14:27:48 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Aug 18 14:27:48 2015 -0500
----------------------------------------------------------------------
.../FetchAndReplaceTwitterProcessor.java | 7 ++++--
.../twitter/provider/TwitterProviderUtil.java | 25 ++++++++++++++++++++
.../provider/TwitterTimelineProvider.java | 3 ++-
.../TwitterUserInformationProvider.java | 2 +-
.../com/twitter/TwitterConfiguration.json | 12 ++++++----
5 files changed, 41 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-streams git commit: consolidated
Posted by sb...@apache.org.
consolidated
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/1df86b0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/1df86b0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/1df86b0f
Branch: refs/heads/master
Commit: 1df86b0f1d5709959dc8d171894785a00a760a14
Parents: b79cc7f
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Mon Jul 27 11:33:38 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Mon Jul 27 11:33:38 2015 -0500
----------------------------------------------------------------------
.../apache/streams/twitter/provider/TwitterTimelineProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/1df86b0f/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 c05daf5..fc3f5f2 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
@@ -275,7 +275,7 @@ public class TwitterTimelineProvider implements StreamsProvider, Serializable {
public Twitter getTwitterClient() {
- String baseUrl = TwitterProviderUtil.baseUrl(twitterUserInformationConfiguration);
+ String baseUrl = TwitterProviderUtil.baseUrl(config);
ConfigurationBuilder builder = new ConfigurationBuilder()
.setOAuthConsumerKey(config.getOauth().getConsumerKey())
[4/5] incubator-streams git commit: found another unconfigured baseURL
Posted by sb...@apache.org.
found another unconfigured baseURL
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/c0a448d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c0a448d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/c0a448d6
Branch: refs/heads/master
Commit: c0a448d697b232dc3cc3d569fb11fe1f59f4b0b8
Parents: 1df86b0
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Fri Jul 31 15:42:44 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Fri Jul 31 15:42:44 2015 -0500
----------------------------------------------------------------------
.../twitter/processor/FetchAndReplaceTwitterProcessor.java | 7 +++++--
.../apache/streams/twitter/provider/TwitterProviderUtil.java | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c0a448d6/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 cd6f6e5..26d22f3 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
@@ -26,6 +26,7 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProcessor;
import org.apache.streams.exceptions.ActivityConversionException;
import org.apache.streams.pojo.json.Activity;
+import org.apache.streams.twitter.TwitterConfiguration;
import org.apache.streams.twitter.TwitterStreamConfiguration;
import org.apache.streams.twitter.pojo.Delete;
import org.apache.streams.twitter.pojo.Retweet;
@@ -33,6 +34,7 @@ import org.apache.streams.twitter.pojo.Tweet;
import org.apache.streams.twitter.provider.TwitterConfigurator;
import org.apache.streams.twitter.provider.TwitterEventClassifier;
import org.apache.streams.twitter.converter.StreamsTwitterMapper;
+import org.apache.streams.twitter.provider.TwitterProviderUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import twitter4j.*;
@@ -56,7 +58,7 @@ public class FetchAndReplaceTwitterProcessor implements StreamsProcessor {
//Start the backoff at 4 minutes. This results in a wait period of 4, 8, 12, 16 & 20 min with an attempt of 5
public static final int BACKOFF = 1000 * 60 * 4;
- private final TwitterStreamConfiguration config;
+ private final TwitterConfiguration config;
private Twitter client;
private ObjectMapper mapper;
private int retryCount;
@@ -135,7 +137,8 @@ public class FetchAndReplaceTwitterProcessor implements StreamsProcessor {
protected Twitter getTwitterClient()
{
if(this.client == null) {
- String baseUrl = "https://api.twitter.com:443/1.1/";
+
+ String baseUrl = TwitterProviderUtil.baseUrl(config);
ConfigurationBuilder builder = new ConfigurationBuilder()
.setOAuthConsumerKey(config.getOauth().getConsumerKey())
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c0a448d6/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterProviderUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterProviderUtil.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterProviderUtil.java
index ec5f256..0f1b661 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterProviderUtil.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterProviderUtil.java
@@ -1,13 +1,13 @@
package org.apache.streams.twitter.provider;
-import org.apache.streams.twitter.TwitterUserInformationConfiguration;
+import org.apache.streams.twitter.TwitterConfiguration;
/**
* Created by sblackmon on 7/26/15.
*/
public class TwitterProviderUtil {
- public static String baseUrl(TwitterUserInformationConfiguration config) {
+ public static String baseUrl(TwitterConfiguration config) {
String baseUrl = new StringBuilder()
.append(config.getProtocol())
[2/5] incubator-streams git commit: consolidated
Posted by sb...@apache.org.
consolidated
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b79cc7fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b79cc7fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b79cc7fb
Branch: refs/heads/master
Commit: b79cc7fbe73be397ebe68833ba19332aefe71215
Parents: 5027a06
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Mon Jul 27 11:27:38 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Mon Jul 27 11:27:38 2015 -0500
----------------------------------------------------------------------
.../twitter/provider/TwitterProviderUtil.java | 25 ++++++++++++++++++++
.../provider/TwitterTimelineProvider.java | 11 +--------
.../TwitterUserInformationProvider.java | 11 +--------
3 files changed, 27 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b79cc7fb/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterProviderUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterProviderUtil.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterProviderUtil.java
new file mode 100644
index 0000000..ec5f256
--- /dev/null
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterProviderUtil.java
@@ -0,0 +1,25 @@
+package org.apache.streams.twitter.provider;
+
+import org.apache.streams.twitter.TwitterUserInformationConfiguration;
+
+/**
+ * Created by sblackmon on 7/26/15.
+ */
+public class TwitterProviderUtil {
+
+ public static String baseUrl(TwitterUserInformationConfiguration config) {
+
+ String baseUrl = new StringBuilder()
+ .append(config.getProtocol())
+ .append("://")
+ .append(config.getHost())
+ .append(":")
+ .append(config.getPort())
+ .append("/")
+ .append(config.getVersion())
+ .append("/")
+ .toString();
+
+ return baseUrl;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b79cc7fb/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 8f5fa24..c05daf5 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
@@ -275,16 +275,7 @@ public class TwitterTimelineProvider implements StreamsProvider, Serializable {
public Twitter getTwitterClient() {
- String baseUrl = new StringBuilder()
- .append(config.getProtocol())
- .append("://")
- .append(config.getHost())
- .append(":")
- .append(config.getPort())
- .append("/")
- .append(config.getVersion())
- .append("/")
- .toString();
+ String baseUrl = TwitterProviderUtil.baseUrl(twitterUserInformationConfiguration);
ConfigurationBuilder builder = new ConfigurationBuilder()
.setOAuthConsumerKey(config.getOauth().getConsumerKey())
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b79cc7fb/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
index 0a7fe58..9def663 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
@@ -288,16 +288,7 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
protected Twitter getTwitterClient()
{
- String baseUrl = new StringBuilder()
- .append(twitterUserInformationConfiguration.getProtocol())
- .append("://")
- .append(twitterUserInformationConfiguration.getHost())
- .append(":")
- .append(twitterUserInformationConfiguration.getPort())
- .append("/")
- .append(twitterUserInformationConfiguration.getVersion())
- .append("/")
- .toString();
+ String baseUrl = TwitterProviderUtil.baseUrl(twitterUserInformationConfiguration);
ConfigurationBuilder builder = new ConfigurationBuilder()
.setOAuthConsumerKey(twitterUserInformationConfiguration.getOauth().getConsumerKey())