[4/5] incubator-streams git commit: found another unconfigured baseURL

[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())