fixed #240

Author: phasenraum2010

src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/FetchFollowerSplitterImpl.java

@@ -1,7 +1,6 @@
 package org.woehlke.twitterwall.scheduled.mq.endpoint.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
 import org.springframework.social.twitter.api.CursoredList;
 import org.springframework.stereotype.Component;
@@ -45,7 +44,7 @@ public List<Message<UserMessage>> splitUserMessage(Message<TaskMessage> incoming
         long id = msgIn.getTaskId();
         Task task = taskService.findById(id);
         task =  taskService.start(task,countedEntities);
-        CursoredList<Long> foundTwitterProfiles = twitterApiService.findFollower();
+        CursoredList<Long> foundTwitterProfiles = twitterApiService.getFollowerIds();
         int loopId = 0;
         int loopAll = foundTwitterProfiles.size();
         for (Long twitterProfileId : foundTwitterProfiles) {

src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/FetchFriendsSplitterImpl.java

@@ -1,7 +1,6 @@
 package org.woehlke.twitterwall.scheduled.mq.endpoint.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
 import org.springframework.social.twitter.api.CursoredList;
 import org.springframework.stereotype.Component;
@@ -45,7 +44,7 @@ public List<Message<UserMessage>> splitUserMessage(Message<TaskMessage> incoming
         long id = msgIn.getTaskId();
         Task task = taskService.findById(id);
         task =  taskService.start(task,countedEntities);
-        CursoredList<Long> foundUserProfiles = twitterApiService.findFriends();
+        CursoredList<Long> foundUserProfiles = twitterApiService.getFriendIds();
         int loopId = 0;
         int loopAll = foundUserProfiles.size();
         for (Long twitterUserId : foundUserProfiles) {

src/main/java/org/woehlke/twitterwall/scheduled/service/remote/TwitterApiService.java

@@ -21,7 +21,7 @@ public interface TwitterApiService {
 
     List<TwitterProfile> findUsersFromDefinedList(String screenName,String fetchUserListName);
 
-    CursoredList<Long> findFollower();
+    CursoredList<Long> getFollowerIds();
 
-    CursoredList<Long> findFriends();
+    CursoredList<Long> getFriendIds();
 }

src/main/java/org/woehlke/twitterwall/scheduled/service/remote/impl/TwitterApiServiceImpl.java

@@ -4,6 +4,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.social.RateLimitExceededException;
 import org.springframework.social.ResourceNotFoundException;
 import org.springframework.social.twitter.api.CursoredList;
 import org.springframework.social.twitter.api.Tweet;
@@ -21,11 +22,9 @@
 /**
  * Created by tw on 19.06.17.
  */
-
 @Component
 public class TwitterApiServiceImpl implements TwitterApiService {
 
-
     @Override
     public List<Tweet> findTweetsForSearchQuery() {
         String msg = MSG+"findTweetsForSearchQuery: ";
@@ -41,6 +40,9 @@ public List<Tweet> findTweetsForSearchQuery() {
                 log.debug(msg+" result.size: "+fetchedTweets.size());
                 return fetchedTweets;
             }
+        } catch (RateLimitExceededException e){
+            log.warn(msg+"  Rate Limit Exceeded : ");
+            return null;
         } catch (Exception e) {
             log.error(msg + e.getMessage());
             return new ArrayList<>();
@@ -59,6 +61,9 @@ public Tweet findOneTweetById(long tweetTwitterId) {
             msg += " result: ";
             log.debug(msg + result);
             return result;
+        } catch (RateLimitExceededException e) {
+            log.warn(msg + "  Rate Limit Exceeded ");
+            return null;
         } catch(Exception e){
             log.error(msg + e.getMessage());
             e.printStackTrace();
@@ -78,6 +83,12 @@ public TwitterProfile getUserProfileForTwitterId(long userProfileTwitterId) {
             log.debug(msg + " ScreenName: " + result.getScreenName());
             log.debug(msg + " Name:       " + result.getName());
             return result;
+        } catch (RateLimitExceededException e) {
+            log.warn(msg + "  Rate Limit Exceeded : ");
+            return null;
+        } catch (ResourceNotFoundException e) {
+            log.warn(msg+"  User not found : "+userProfileTwitterId);
+            return null;
         } catch (Exception e) {
             log.error(msg + e.getMessage());
             return null;
@@ -90,16 +101,19 @@ public TwitterProfile getUserProfileForScreenName(String screenName) {
         log.debug(msg);
         TwitterProfile result;
         try {
-            result= getTwitterProxy().userOperations().getUserProfile(screenName);
+            result = getTwitterProxy().userOperations().getUserProfile(screenName);
             msg += " result: ";
-            log.debug(msg+" ScreenName: "+result.getScreenName());
-            log.debug(msg+" Name:       "+result.getName());
+            log.debug(msg + " ScreenName: " + result.getScreenName());
+            log.debug(msg + " Name:       " + result.getName());
             return result;
+        } catch (RateLimitExceededException e){
+            log.warn(msg+"  Rate Limit Exceeded : ");
+            return null;
         } catch (ResourceNotFoundException e) {
-            log.debug(msg+"  User not found : "+screenName);
+            log.warn(msg+"  User not found : "+screenName);
             return null;
         } catch (Exception e) {
-            log.debug(msg + e.getMessage());
+            log.error(msg + e.getMessage());
             return null;
         }
     }
@@ -114,28 +128,28 @@ public List<TwitterProfile> findUsersFromDefinedList(String screenName,String fe
             log.debug(msg + " result.size: " + result.size());
             return result;
         } catch (Exception e) {
-            log.debug(msg + e.getMessage());
+            log.error(msg + e.getMessage());
             return new ArrayList<>();
         }
     }
 
     @Override
-    public CursoredList<Long> findFollower() {
-        String msg = MSG+"findFollower: ";
+    public CursoredList<Long> getFollowerIds() {
+        String msg = MSG+"getFollowerIds: ";
         log.debug(msg);
         CursoredList<Long> result;
         try {
             result = getTwitterProxy().friendOperations().getFollowerIds();
             log.debug(msg + " result.size: " + result.size());
             return result;
         } catch (Exception e) {
-            log.debug(msg + e.getMessage());
+            log.error(msg + e.getMessage());
             return new CursoredList<>(new ArrayList<>(),0L,0L);
         }
     }
 
     @Override
-    public CursoredList<Long> findFriends() {
+    public CursoredList<Long> getFriendIds() {
         String msg = MSG+"findFriendss: ";
         log.debug(msg);
         CursoredList<Long> result;
@@ -144,12 +158,11 @@ public CursoredList<Long> findFriends() {
             log.debug(msg + " result.size: " + result.size());
             return result;
         } catch (Exception e) {
-            log.debug(msg + e.getMessage());
+            log.error(msg + e.getMessage());
             return new CursoredList<>(new ArrayList<>(),0L,0L);
         }
     }
 
-
     @Inject
     private Environment environment;
 
@@ -158,12 +171,10 @@ public CursoredList<Long> findFriends() {
     private final TwitterProperties twitterProperties;
 
     private Twitter getTwitterProxy() {
-
         String consumerKey =  environment.getProperty("TWITTER_CONSUMER_KEY");
         String consumerSecret =   environment.getProperty("TWITTER_CONSUMER_SECRET");
         String accessToken =  environment.getProperty("TWITTER_ACCESS_TOKEN");
         String accessTokenSecret =  environment.getProperty("TWITTER_ACCESS_TOKEN_SECRET");
-
         Twitter twitterTemplate = new TwitterTemplate(consumerKey, consumerSecret, accessToken, accessTokenSecret);
         return twitterTemplate;
     }

src/main/java/org/woehlke/twitterwall/scheduled/service/remote/impl/TwitterUrlServiceImpl.java

@@ -31,7 +31,6 @@
 @Component
 public class TwitterUrlServiceImpl implements TwitterUrlService {
 
-
     @Override
     public Url fetchTransientUrl(final String urlSource,Task task) {
         String msg = "fetchTransientUrl " + urlSource + " ";

src/main/resources/integration.xml

@@ -583,7 +583,7 @@
         <int:service-activator
                 id="fetchFollowerFireAndForgetFinisher"
                 ref="mqUserFinisher"
-                method="finish" />
+                method="finishAsnyc" />
     </int:chain>
 
     <int:chain id="fetchFriendsFireAndForgetChain" input-channel="fetchFriendsFireAndForgetChannel">
@@ -610,7 +610,7 @@
         <int:service-activator
                 id="fetchFriendsFireAndForgetFinisher"
                 ref="mqUserFinisher"
-                method="finish" />
+                method="finishAsnyc" />
     </int:chain>
 
     <int:chain id="createTestDataUsersFireAndForgetChain" input-channel="createTestDataUsersFireAndForgetChannel">