Skip to content

Commit dd6d2d4

Browse files
phasenraum2010phasenraum2010
committed
working on #228, working on #225 
1 parent e6f482a commit dd6d2d4

File tree

8 files changed

+90
-54
lines changed

8 files changed

+90
-54
lines changed

‎pom.xml‎

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@
185185
<build>
186186
<plugins>
187187

188+
<plugin>
189+
<groupId>org.springframework.boot</groupId>
190+
<artifactId>spring-boot-maven-plugin</artifactId>
191+
</plugin>
192+
188193
<plugin>
189194
<groupId>org.apache.maven.plugins</groupId>
190195
<artifactId>maven-compiler-plugin</artifactId>
@@ -200,10 +205,29 @@
200205
<artifactId>maven-source-plugin</artifactId>
201206
</plugin>
202207

208+
<plugin>
209+
<groupId>org.apache.maven.plugins</groupId>
210+
<artifactId>maven-dependency-plugin</artifactId>
211+
<executions>
212+
<execution>
213+
<id>src-dependencies</id>
214+
<phase>package</phase>
215+
<goals>
216+
<!-- use copy-dependencies instead if you don't want to explode the sources -->
217+
<goal>unpack-dependencies</goal>
218+
</goals>
219+
<configuration>
220+
<classifier>sources</classifier>
221+
<failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
222+
<outputDirectory>${project.build.directory}/sources</outputDirectory>
223+
</configuration>
224+
</execution>
225+
</executions>
226+
</plugin>
227+
203228
<plugin>
204229
<groupId>org.apache.maven.plugins</groupId>
205230
<artifactId>maven-javadoc-plugin</artifactId>
206-
<version>2.10.4</version>
207231
<configuration>
208232
<!--
209233
<linksource>true</linksource>
@@ -213,17 +237,26 @@
213237
<encoding>${project.build.sourceEncoding}</encoding>
214238
<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
215239
</configuration>
240+
<executions>
241+
<execution>
242+
<id>javadoc-javadoc-package</id>
243+
<phase>package</phase>
244+
<goals>
245+
<goal>javadoc</goal>
246+
</goals>
247+
<configuration>
248+
<!--
249+
<linksource>true</linksource>
250+
-->
251+
<maxmemory>2048m</maxmemory>
252+
<source>1.8</source>
253+
<encoding>${project.build.sourceEncoding}</encoding>
254+
<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
255+
</configuration>
256+
</execution>
257+
</executions>
216258
</plugin>
217259

218-
<plugin>
219-
<groupId>org.apache.maven.plugins</groupId>
220-
<artifactId>maven-dependency-plugin</artifactId>
221-
</plugin>
222-
223-
<plugin>
224-
<groupId>org.springframework.boot</groupId>
225-
<artifactId>spring-boot-maven-plugin</artifactId>
226-
</plugin>
227260
<!-- Fuer Continous-Integration et al.: Auschecken von Subversion mittels
228261
Maven. http://maven.apache.org/scm/ -->
229262
<plugin>
@@ -383,6 +416,7 @@
383416
</build>
384417

385418
<profiles>
419+
386420
<profile>
387421
<id>default</id>
388422
<activation>
@@ -402,6 +436,7 @@
402436
</plugins>
403437
</build>
404438
</profile>
439+
405440
<profile>
406441
<id>testing</id>
407442
<build>

‎src/main/java/org/woehlke/twitterwall/ScheduledTasks.java‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@Component
1616
public class ScheduledTasks {
1717

18-
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_TWEETS)
18+
@Scheduled(initialDelay= TEN_SECONDS, fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_TWEETS)
1919
public void fetchTweetsFromTwitterSearch() {
2020
String msg = "fetch Tweets From TwitterSearch ";
2121
if(schedulerProperties.getAllowUpdateTweets() && !schedulerProperties.getSkipFortesting()) {
@@ -24,25 +24,25 @@ public void fetchTweetsFromTwitterSearch() {
2424
}
2525
}
2626

27-
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_TWEETS)
28-
public void updateTweets() {
29-
String msg = "update Tweets ";
30-
if(schedulerProperties.getAllowUpdateTweets() && !schedulerProperties.getSkipFortesting()){
31-
Task task = asyncStartTask.updateTweets();
27+
@Scheduled(initialDelay= TEN_SECONDS *2, fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_USER_LIST)
28+
public void fetchUsersFromDefinedUserList(){
29+
String msg = "fetch Users from Defined User List ";
30+
if(schedulerProperties.getFetchUserListAllow() && !schedulerProperties.getSkipFortesting()) {
31+
Task task = asyncStartTask.fetchUsersFromList();
3232
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
3333
}
3434
}
3535

36-
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER)
37-
public void updateUserProfiles() {
38-
String msg = "update User Profiles ";
39-
if(schedulerProperties.getAllowUpdateUserProfiles() && !schedulerProperties.getSkipFortesting()) {
40-
Task task = asyncStartTask.updateUsers();
36+
@Scheduled(initialDelay= TEN_SECONDS *3, fixedRate = FIXED_RATE_FOR_SCHEDULAR_REMOVE_OLD_DATA_FROM_STORAGE)
37+
public void removeOldDataFromStorage(){
38+
String msg = "remove Old Data From Storage: ";
39+
if(schedulerProperties.getRemoveOldDataFromStorageAllow() && !schedulerProperties.getSkipFortesting()) {
40+
Task task = asyncStartTask.removeOldDataFromStorage();
4141
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
4242
}
4343
}
4444

45-
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER_BY_MENTION)
45+
@Scheduled(initialDelay= TEN_SECONDS *4, fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER_BY_MENTION)
4646
public void updateUserProfilesFromMentions(){
4747
String msg = "update User Profiles From Mentions";
4848
if(schedulerProperties.getAllowUpdateUserProfilesFromMention() && !schedulerProperties.getSkipFortesting()) {
@@ -51,21 +51,20 @@ public void updateUserProfilesFromMentions(){
5151
}
5252
}
5353

54-
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_USER_LIST)
55-
public void fetchUsersFromDefinedUserList(){
56-
String msg = "fetch Users from Defined User List ";
57-
if(schedulerProperties.getFetchUserListAllow() && !schedulerProperties.getSkipFortesting()) {
58-
Task task = asyncStartTask.fetchUsersFromList();
54+
@Scheduled(initialDelay= TEN_SECONDS *5, fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_TWEETS)
55+
public void updateTweets() {
56+
String msg = "update Tweets ";
57+
if(schedulerProperties.getAllowUpdateTweets() && !schedulerProperties.getSkipFortesting()){
58+
Task task = asyncStartTask.updateTweets();
5959
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
6060
}
6161
}
6262

63-
64-
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_REMOVE_OLD_DATA_FROM_STORAGE)
65-
public void removeOldDataFromStorage(){
66-
String msg = "remove Old Data From Storage: ";
67-
if(schedulerProperties.getRemoveOldDataFromStorageAllow() && !schedulerProperties.getSkipFortesting()) {
68-
Task task = asyncStartTask.removeOldDataFromStorage();
63+
@Scheduled(initialDelay= TEN_SECONDS *6, fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER)
64+
public void updateUserProfiles() {
65+
String msg = "update User Profiles ";
66+
if(schedulerProperties.getAllowUpdateUserProfiles() && !schedulerProperties.getSkipFortesting()) {
67+
Task task = asyncStartTask.updateUsers();
6968
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
7069
}
7170
}
@@ -76,23 +75,25 @@ public ScheduledTasks(SchedulerProperties schedulerProperties, AsyncStartTask mq
7675
this.asyncStartTask = mqAsyncStartTask;
7776
}
7877

79-
public final static long EINE_MINUTE = 60 * 1000;
78+
public final static long TEN_SECONDS = 10 * 1000;
79+
80+
public final static long ONE_MINUTE = 60 * 1000;
8081

81-
public final static long EINE_STUNDE = 60 * EINE_MINUTE;
82+
public final static long ONE_HOUR = 60 * ONE_MINUTE;
8283

83-
public final static long ZWOELF_STUNDEN = 12 * EINE_STUNDE;
84+
public final static long TWELVE_HOURS = 12 * ONE_HOUR;
8485

85-
private final static long FIXED_RATE_FOR_SCHEDULAR_FETCH_TWEETS = EINE_STUNDE;
86+
private final static long FIXED_RATE_FOR_SCHEDULAR_FETCH_TWEETS = ONE_HOUR;
8687

87-
private final static long FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER = ZWOELF_STUNDEN;
88+
private final static long FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER = TWELVE_HOURS;
8889

89-
private final static long FIXED_RATE_FOR_SCHEDULAR_UPDATE_TWEETS = ZWOELF_STUNDEN;
90+
private final static long FIXED_RATE_FOR_SCHEDULAR_UPDATE_TWEETS = TWELVE_HOURS;
9091

91-
private final static long FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER_BY_MENTION = EINE_STUNDE;
92+
private final static long FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER_BY_MENTION = ONE_HOUR;
9293

93-
private final static long FIXED_RATE_FOR_SCHEDULAR_FETCH_USER_LIST = ZWOELF_STUNDEN;
94+
private final static long FIXED_RATE_FOR_SCHEDULAR_FETCH_USER_LIST = TWELVE_HOURS;
9495

95-
private final static long FIXED_RATE_FOR_SCHEDULAR_REMOVE_OLD_DATA_FROM_STORAGE = EINE_STUNDE;
96+
private final static long FIXED_RATE_FOR_SCHEDULAR_REMOVE_OLD_DATA_FROM_STORAGE = ONE_HOUR;
9697

9798
private static final Logger log = LoggerFactory.getLogger(ScheduledTasks.class);
9899

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.woehlke.twitterwall.scheduled.mq.msg.UserMessage;
1414
import org.woehlke.twitterwall.scheduled.service.remote.TwitterApiService;
1515

16-
import static org.woehlke.twitterwall.ScheduledTasks.ZWOELF_STUNDEN;
16+
import static org.woehlke.twitterwall.ScheduledTasks.TWELVE_HOURS;
1717

1818
@Component("mqCreateImprintUser")
1919
public class CreateImprintUserImpl implements CreateImprintUser {
@@ -39,7 +39,7 @@ public Message<UserMessage> createImprintUser(Message<TaskMessage> mqMessageIn)
3939
User imprintUser = userService.findByScreenName(screenName);
4040
if(imprintUser==null){
4141
return this.getMessageOut(mqMessageIn);
42-
} else if(imprintUser.getTwitterApiCaching().isCached(receivedMessage.getTaskType(),ZWOELF_STUNDEN)){
42+
} else if(imprintUser.getTwitterApiCaching().isCached(receivedMessage.getTaskType(), TWELVE_HOURS)){
4343
UserMessage outMsg = new UserMessage(receivedMessage,screenName,imprintUser);
4444
Message<UserMessage> mqMessageOut = MessageBuilder.withPayload(outMsg).copyHeaders(mqMessageIn.getHeaders())
4545
.setHeader("twitter_profile_id", imprintUser.getIdTwitter())

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22-
import static org.woehlke.twitterwall.ScheduledTasks.ZWOELF_STUNDEN;
22+
import static org.woehlke.twitterwall.ScheduledTasks.TWELVE_HOURS;
2323

2424
@Component("mqCreateTestDataForTweetsSplitter")
2525
public class CreateTestDataTweetsSplitterImpl implements CreateTestDataTweetsSplitter {
@@ -60,7 +60,7 @@ public List<Message<TweetMessage>> splitMessage(Message<TaskMessage> incomingTas
6060
if(tweetPers == null){
6161
tweets.add(fetchTweetFromTwitter(idTwitter,task,incomingTaskMessage,loopId,loopAll));
6262
} else {
63-
if(tweetPers.getTwitterApiCaching().isCached(task.getTaskType(),ZWOELF_STUNDEN)) {
63+
if(tweetPers.getTwitterApiCaching().isCached(task.getTaskType(), TWELVE_HOURS)) {
6464
TweetMessage msg = new TweetMessage(msgIn,tweetPers);
6565
Message<TweetMessage> mqMessageOut =
6666
MessageBuilder.withPayload(msg)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22-
import static org.woehlke.twitterwall.ScheduledTasks.ZWOELF_STUNDEN;
22+
import static org.woehlke.twitterwall.ScheduledTasks.TWELVE_HOURS;
2323

2424
@Component("mqCreateTestDataForUsersSplitter")
2525
public class CreateTestDataUsersSplitterImpl implements CreateTestDataUsersSplitter {
@@ -59,7 +59,7 @@ public List<Message<UserMessage>> splitMessage(Message<TaskMessage> incomingTask
5959
if(userPers==null){
6060
userProfileList.add(getUserProfileFromTwitterApi(incomingTaskMessage,screenName,loopId,loopAll));
6161
} else {
62-
if(!userPers.getTwitterApiCaching().isCached(task.getTaskType(),ZWOELF_STUNDEN)) {
62+
if(!userPers.getTwitterApiCaching().isCached(task.getTaskType(), TWELVE_HOURS)) {
6363
userProfileList.add(getUserProfileFromTwitterApi(incomingTaskMessage,screenName,loopId,loopAll));
6464
} else {
6565
UserMessage msg = new UserMessage(msgIn,screenName,userPers);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.ArrayList;
2424
import java.util.List;
2525

26-
import static org.woehlke.twitterwall.ScheduledTasks.ZWOELF_STUNDEN;
26+
import static org.woehlke.twitterwall.ScheduledTasks.TWELVE_HOURS;
2727
import static org.woehlke.twitterwall.frontend.controller.common.ControllerHelper.FIRST_PAGE_NUMBER;
2828

2929
@Component("mqUpdateTweetsSplitter")
@@ -62,7 +62,7 @@ public List<Message<TweetMessage>> splitMessage(Message<TaskMessage> incomingTas
6262
while(hasNext) {
6363
Page<org.woehlke.twitterwall.oodm.entities.Tweet> tweetTwitterIds = tweetService.getAll(pageRequest);
6464
for(org.woehlke.twitterwall.oodm.entities.Tweet tweetTwitterId:tweetTwitterIds.getContent()){
65-
if(!tweetTwitterId.getTwitterApiCaching().isCached(task.getTaskType(),ZWOELF_STUNDEN)) {
65+
if(!tweetTwitterId.getTwitterApiCaching().isCached(task.getTaskType(), TWELVE_HOURS)) {
6666
lfdNr++;
6767
all++;
6868
log.debug("### tweetService.findAllTwitterIds from DB (" + lfdNr + "): " + tweetTwitterId.getIdTwitter());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.ArrayList;
2828
import java.util.List;
2929

30-
import static org.woehlke.twitterwall.ScheduledTasks.ZWOELF_STUNDEN;
30+
import static org.woehlke.twitterwall.ScheduledTasks.TWELVE_HOURS;
3131
import static org.woehlke.twitterwall.frontend.controller.common.ControllerHelper.FIRST_PAGE_NUMBER;
3232

3333
@Component("mqUpdateUserSplitter")
@@ -72,7 +72,7 @@ public List<Message<UserMessage>> splitMessage(Message<TaskMessage> incomingTask
7272
while (hasNext) {
7373
Page<User> userProfileTwitterIds = userService.getAll(pageRequest);
7474
for(User user:userProfileTwitterIds.getContent()){
75-
if(!user.getTwitterApiCaching().isCached(taskType,ZWOELF_STUNDEN)){
75+
if(!user.getTwitterApiCaching().isCached(taskType, TWELVE_HOURS)){
7676
loopId++;
7777
loopAll++;
7878
log.debug(msg+ "### userService.getAllTwitterIds: ("+loopId+") "+user.getIdTwitter());

‎src/main/java/org/woehlke/twitterwall/scheduled/service/persist/impl/CreatePersistentUrlImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.net.MalformedURLException;
1414
import java.net.URL;
1515

16-
import static org.woehlke.twitterwall.ScheduledTasks.ZWOELF_STUNDEN;
16+
import static org.woehlke.twitterwall.ScheduledTasks.TWELVE_HOURS;
1717

1818
/**
1919
* Created by tw on 09.07.17.
@@ -36,7 +36,7 @@ public Url createPersistentUrlFor(String url, Task task) {
3636
log.debug(msg + " found: " + urlPers);
3737
if (urlPers.isUrlAndExpandedTheSame() || urlPers.isRawUrlsFromDescription()) {
3838
log.debug(msg + " urlPers.isUrlAndExpandedTheSame " + urlPers.getUniqueId());
39-
if (urlPers.getTwitterApiCaching().isCached(task.getTaskType(), ZWOELF_STUNDEN)) {
39+
if (urlPers.getTwitterApiCaching().isCached(task.getTaskType(), TWELVE_HOURS)) {
4040
return urlPers;
4141
} else {
4242
Url myTransientUrl = twitterUrlService.fetchTransientUrl(url, task);

0 commit comments

Comments
 (0)