fixed #240

phasenraum2010 · phasenraum2010 · commit cae571a225d3 · 2017-08-08T16:14:46.000+02:00
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/common/TwitterwallMessageBuilder.java b/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/common/TwitterwallMessageBuilder.java
@@ -31,4 +31,5 @@ public interface TwitterwallMessageBuilder {
 
     Message<UserMessage> buildUserMessage(Message<TaskMessage> mqMessageIn, User imprintUser);
 
+    void waitForApi();
 }
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/common/impl/TwitterwallMessageBuilderImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/common/impl/TwitterwallMessageBuilderImpl.java
@@ -1,10 +1,14 @@
 package org.woehlke.twitterwall.scheduled.mq.endpoint.common.impl;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
 import org.springframework.social.twitter.api.Tweet;
 import org.springframework.social.twitter.api.TwitterProfile;
 import org.springframework.stereotype.Component;
+import org.woehlke.twitterwall.conf.properties.TwitterProperties;
 import org.woehlke.twitterwall.oodm.entities.Task;
 import org.woehlke.twitterwall.oodm.entities.User;
 import org.woehlke.twitterwall.scheduled.mq.endpoint.common.TwitterwallMessageBuilder;
@@ -15,6 +19,7 @@
 @Component
 public class TwitterwallMessageBuilderImpl implements TwitterwallMessageBuilder {
 
+
     @Override
     public Message<TweetMessage> buildTweetMessage(Message<TaskMessage> incomingTaskMessage, org.woehlke.twitterwall.oodm.entities.Tweet tweet, int loopId, int loopAll){
         TweetMessage outputPayload = new TweetMessage(incomingTaskMessage.getPayload(),tweet);
@@ -133,5 +138,22 @@ public Message<UserMessage> buildUserMessage(Message<TaskMessage> incomingMessag
         return mqMessageOut;
     }
 
+    @Override
+    public void waitForApi() {
+        int millisToWaitBetweenTwoApiCalls = twitterProperties.getMillisToWaitBetweenTwoApiCalls();
+        log.debug("### waiting now for (ms): "+millisToWaitBetweenTwoApiCalls);
+        try {
+            Thread.sleep(millisToWaitBetweenTwoApiCalls);
+        } catch (InterruptedException e) {
+        }
+    }
+
+    @Autowired
+    public TwitterwallMessageBuilderImpl(TwitterProperties twitterProperties) {
+        this.twitterProperties = twitterProperties;
+    }
+
+    private final TwitterProperties twitterProperties;
 
+    private static final Logger log = LoggerFactory.getLogger(TwitterwallMessageBuilderImpl.class);
 }
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/CreateImprintUserImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/CreateImprintUserImpl.java
@@ -57,6 +57,7 @@ private Message<UserMessage> getMessageOut(Message<TaskMessage> mqMessageIn){
         String screenName = frontendProperties.getImprintScreenName();
         TwitterProfile twitterProfile = twitterApiService.getUserProfileForScreenName(screenName);
         Message<UserMessage> mqMessageOut = twitterwallMessageBuilder.buildUserMessage(mqMessageIn,twitterProfile);
+        twitterwallMessageBuilder.waitForApi();
         return mqMessageOut;
     }
 }
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/CreateTestDataTweetsSplitterImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/CreateTestDataTweetsSplitterImpl.java
@@ -70,7 +70,7 @@ public List<Message<TweetMessage>> splitTweetMessage(Message<TaskMessage> incomi
             if(fetchTweetFromApi) {
                 Tweet tweet = twitterApiService.findOneTweetById(idTwitter);
                 outgoingMessage = twitterwallMessageBuilder.buildTweetMessage(incomingTaskMessage, tweet, loopId, loopAll);
-
+                twitterwallMessageBuilder.waitForApi();
             } else {
                 outgoingMessage = twitterwallMessageBuilder.buildTweetMessage(incomingTaskMessage,tweetPers,loopId,loopAll);
             }
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/CreateTestDataUsersSplitterImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/CreateTestDataUsersSplitterImpl.java
@@ -69,6 +69,7 @@ public List<Message<UserMessage>> splitUserMessage(Message<TaskMessage> incoming
             if(fetchFromTwitterApi){
                 TwitterProfile userProfile = twitterApiService.getUserProfileForScreenName(screenName);
                 outgoingMessage = twitterwallMessageBuilder.buildUserMessage(incomingTaskMessage,userProfile,loopId,loopAll);
+                twitterwallMessageBuilder.waitForApi();
             } else {
                 outgoingMessage = twitterwallMessageBuilder.buildUserMessage(incomingTaskMessage,userPers,loopId,loopAll);
             }
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/FetchFollowerSplitterImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/FetchFollowerSplitterImpl.java
@@ -1,5 +1,7 @@
 package org.woehlke.twitterwall.scheduled.mq.endpoint.impl;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.Message;
 import org.springframework.social.twitter.api.CursoredList;
@@ -52,6 +54,7 @@ public List<Message<UserMessage>> splitUserMessage(Message<TaskMessage> incoming
             Message<UserMessage> mqMessageOut = twitterwallMessageBuilder.buildUserMessage(incomingTaskMessage,twitterProfileId,loopId,loopAll);
             userProfileList.add(mqMessageOut);
         }
+        twitterwallMessageBuilder.waitForApi();
         return userProfileList;
     }
 }
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/FetchFriendsSplitterImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/FetchFriendsSplitterImpl.java
@@ -4,6 +4,7 @@
 import org.springframework.messaging.Message;
 import org.springframework.social.twitter.api.CursoredList;
 import org.springframework.stereotype.Component;
+import org.woehlke.twitterwall.conf.properties.TwitterProperties;
 import org.woehlke.twitterwall.oodm.entities.Task;
 import org.woehlke.twitterwall.oodm.entities.parts.CountedEntities;
 import org.woehlke.twitterwall.oodm.service.CountedEntitiesService;
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/UpdateTweetsSplitterImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/UpdateTweetsSplitterImpl.java
@@ -86,11 +86,7 @@ public List<Message<TweetMessage>> splitTweetMessage(Message<TaskMessage> incomi
             TweetMessage result = new TweetMessage(msgIn,foundTweetFromTwitter);
             Message<TweetMessage> mqMessageOut = twitterwallMessageBuilder.buildTweetMessage(incomingTaskMessage,foundTweetFromTwitter,lfdNr,all);
             tweets.add(mqMessageOut);
-            log.debug("### waiting now for (ms): "+millisToWaitBetweenTwoApiCalls);
-            try {
-                Thread.sleep(millisToWaitBetweenTwoApiCalls);
-            } catch (InterruptedException e) {
-            }
+            twitterwallMessageBuilder.waitForApi();
         }
         return tweets;
     }
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/UpdateUsersFromMentionsSplitterImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/UpdateUsersFromMentionsSplitterImpl.java
@@ -104,11 +104,7 @@ public List<Message<UserMessage>> splitUserMessage(Message<TaskMessage> incoming
                 Message<UserMessage> mqMessageOut = twitterwallMessageBuilder.buildUserMessage(incomingTaskMessage,userProfile,lfdNr,all);
                 userProfileList.add(mqMessageOut);
             }
-            log.debug(msg+"### waiting now for (ms): "+millisToWaitBetweenTwoApiCalls);
-            try {
-                Thread.sleep(millisToWaitBetweenTwoApiCalls);
-            } catch (InterruptedException e) {
-            }
+            twitterwallMessageBuilder.waitForApi();
         }
         return userProfileList;
     }
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/UpdateUsersSplitterImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/mq/endpoint/impl/UpdateUsersSplitterImpl.java
@@ -88,7 +88,6 @@ public List<Message<UserMessage>> splitUserMessage(Message<TaskMessage> incoming
         }
         long number = worklistProfileTwitterIds.size();
         loopId = 0;
-        int millisToWaitBetweenTwoApiCalls = twitterProperties.getMillisToWaitBetweenTwoApiCalls();
         List<Message<UserMessage>> userProfileList = new ArrayList<>();
         for(Long userProfileTwitterId:worklistProfileTwitterIds){
             String counter = " ( " + loopId + " from " + number + " ) ";
@@ -105,11 +104,7 @@ public List<Message<UserMessage>> splitUserMessage(Message<TaskMessage> incoming
                 Message<UserMessage> mqMessageOut = twitterwallMessageBuilder.buildUserMessage(incomingTaskMessage,userProfile,loopId,loopAll);
                 userProfileList.add(mqMessageOut);
             }
-            log.debug(msg + "### waiting now for (ms): "+millisToWaitBetweenTwoApiCalls);
-            try {
-                Thread.sleep(millisToWaitBetweenTwoApiCalls);
-            } catch (InterruptedException e) {
-            }
+            twitterwallMessageBuilder.waitForApi();
         }
         log.debug(msg+ " DONE");
         return userProfileList;
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/service/remote/impl/TwitterApiServiceImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/service/remote/impl/TwitterApiServiceImpl.java
@@ -42,12 +42,12 @@ public List<Tweet> findTweetsForSearchQuery() {
             }
         } catch (RateLimitExceededException e){
             log.warn(msg+"  Rate Limit Exceeded : ");
+            waitForApi();
             return null;
         } catch (Exception e) {
             log.error(msg + e.getMessage());
             return new ArrayList<>();
         }
-
     }
 
     @Override
@@ -63,6 +63,7 @@ public Tweet findOneTweetById(long tweetTwitterId) {
             return result;
         } catch (RateLimitExceededException e) {
             log.warn(msg + "  Rate Limit Exceeded ");
+            waitForApi();
             return null;
         } catch(Exception e){
             log.error(msg + e.getMessage());
@@ -85,6 +86,7 @@ public TwitterProfile getUserProfileForTwitterId(long userProfileTwitterId) {
             return result;
         } catch (RateLimitExceededException e) {
             log.warn(msg + "  Rate Limit Exceeded : ");
+            waitForApi();
             return null;
         } catch (ResourceNotFoundException e) {
             log.warn(msg+"  User not found : "+userProfileTwitterId);
@@ -108,6 +110,7 @@ public TwitterProfile getUserProfileForScreenName(String screenName) {
             return result;
         } catch (RateLimitExceededException e){
             log.warn(msg+"  Rate Limit Exceeded : ");
+            waitForApi();
             return null;
         } catch (ResourceNotFoundException e) {
             log.warn(msg+"  User not found : "+screenName);
@@ -163,6 +166,15 @@ public CursoredList<Long> getFriendIds() {
         }
     }
 
+    private void waitForApi(){
+        int millisToWaitBetweenTwoApiCalls = twitterProperties.getMillisToWaitBetweenTwoApiCalls() * 10;
+        log.debug("### waiting now for (ms): "+millisToWaitBetweenTwoApiCalls);
+        try {
+            Thread.sleep(millisToWaitBetweenTwoApiCalls);
+        } catch (InterruptedException e) {
+        }
+    }
+
     @Inject
     private Environment environment;
 

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,5 @@ public interface TwitterwallMessageBuilder {`
`31`	`31`
`32`	`32`	`Message<UserMessage> buildUserMessage(Message<TaskMessage> mqMessageIn, User imprintUser);`
`33`	`33`
	`34`	`+ void waitForApi();`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ private Message<UserMessage> getMessageOut(Message<TaskMessage> mqMessageIn){`
`57`	`57`	`String screenName = frontendProperties.getImprintScreenName();`
`58`	`58`	`TwitterProfile twitterProfile = twitterApiService.getUserProfileForScreenName(screenName);`
`59`	`59`	`Message<UserMessage> mqMessageOut = twitterwallMessageBuilder.buildUserMessage(mqMessageIn,twitterProfile);`
	`60`	`+ twitterwallMessageBuilder.waitForApi();`
`60`	`61`	`return mqMessageOut;`
`61`	`62`	`}`
`62`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public List<Message<TweetMessage>> splitTweetMessage(Message<TaskMessage> incomi`
`70`	`70`	`if(fetchTweetFromApi) {`
`71`	`71`	`Tweet tweet = twitterApiService.findOneTweetById(idTwitter);`
`72`	`72`	`outgoingMessage = twitterwallMessageBuilder.buildTweetMessage(incomingTaskMessage, tweet, loopId, loopAll);`
`73`		`-`
	`73`	`+ twitterwallMessageBuilder.waitForApi();`
`74`	`74`	`} else {`
`75`	`75`	`outgoingMessage = twitterwallMessageBuilder.buildTweetMessage(incomingTaskMessage,tweetPers,loopId,loopAll);`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public List<Message<UserMessage>> splitUserMessage(Message<TaskMessage> incoming`
`69`	`69`	`if(fetchFromTwitterApi){`
`70`	`70`	`TwitterProfile userProfile = twitterApiService.getUserProfileForScreenName(screenName);`
`71`	`71`	`outgoingMessage = twitterwallMessageBuilder.buildUserMessage(incomingTaskMessage,userProfile,loopId,loopAll);`
	`72`	`+ twitterwallMessageBuilder.waitForApi();`
`72`	`73`	`} else {`
`73`	`74`	`outgoingMessage = twitterwallMessageBuilder.buildUserMessage(incomingTaskMessage,userPers,loopId,loopAll);`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package org.woehlke.twitterwall.scheduled.mq.endpoint.impl;`
`2`	`2`
	`3`	`+import org.slf4j.Logger;`
	`4`	`+import org.slf4j.LoggerFactory;`
`3`	`5`	`import org.springframework.beans.factory.annotation.Autowired;`
`4`	`6`	`import org.springframework.messaging.Message;`
`5`	`7`	`import org.springframework.social.twitter.api.CursoredList;`
`@@ -52,6 +54,7 @@ public List<Message<UserMessage>> splitUserMessage(Message<TaskMessage> incoming`
`52`	`54`	`Message<UserMessage> mqMessageOut = twitterwallMessageBuilder.buildUserMessage(incomingTaskMessage,twitterProfileId,loopId,loopAll);`
`53`	`55`	`userProfileList.add(mqMessageOut);`
`54`	`56`	`}`
	`57`	`+ twitterwallMessageBuilder.waitForApi();`
`55`	`58`	`return userProfileList;`
`56`	`59`	`}`
`57`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,7 @@ public List<Message<TweetMessage>> splitTweetMessage(Message<TaskMessage> incomi`
`86`	`86`	`TweetMessage result = new TweetMessage(msgIn,foundTweetFromTwitter);`
`87`	`87`	`Message<TweetMessage> mqMessageOut = twitterwallMessageBuilder.buildTweetMessage(incomingTaskMessage,foundTweetFromTwitter,lfdNr,all);`
`88`	`88`	`tweets.add(mqMessageOut);`
`89`		`- log.debug("### waiting now for (ms): "+millisToWaitBetweenTwoApiCalls);`
`90`		`- try {`
`91`		`- Thread.sleep(millisToWaitBetweenTwoApiCalls);`
`92`		`- } catch (InterruptedException e) {`
`93`		`- }`
	`89`	`+ twitterwallMessageBuilder.waitForApi();`
`94`	`90`	`}`
`95`	`91`	`return tweets;`
`96`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,7 @@ public List<Message<UserMessage>> splitUserMessage(Message<TaskMessage> incoming`
`104`	`104`	`Message<UserMessage> mqMessageOut = twitterwallMessageBuilder.buildUserMessage(incomingTaskMessage,userProfile,lfdNr,all);`
`105`	`105`	`userProfileList.add(mqMessageOut);`
`106`	`106`	`}`
`107`		`- log.debug(msg+"### waiting now for (ms): "+millisToWaitBetweenTwoApiCalls);`
`108`		`- try {`
`109`		`- Thread.sleep(millisToWaitBetweenTwoApiCalls);`
`110`		`- } catch (InterruptedException e) {`
`111`		`- }`
	`107`	`+ twitterwallMessageBuilder.waitForApi();`
`112`	`108`	`}`
`113`	`109`	`return userProfileList;`
`114`	`110`	`}`