Skip to content

Commit ed8f369

Browse files
phasenraum2010phasenraum2010
committed
fixed #271 
1 parent 4a4ce22 commit ed8f369

File tree

111 files changed

+1334
-772
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1334
-772
lines changed

‎src/main/java/org/woehlke/twitterwall/ScheduledTasks.java‎ renamed to ‎src/main/java/org/woehlke/twitterwall/CronJobs.java‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55
import org.springframework.beans.factory.annotation.Autowired;
6+
import org.springframework.beans.factory.annotation.Qualifier;
67
import org.springframework.scheduling.annotation.Scheduled;
78
import org.springframework.stereotype.Component;
89
import org.woehlke.twitterwall.configuration.properties.SchedulerProperties;
910
import org.woehlke.twitterwall.oodm.model.Task;
10-
import org.woehlke.twitterwall.backend.mq.endpoint.tasks.AsyncStartTask;
11+
import org.woehlke.twitterwall.backend.mq.endpoint.tasks.TaskStartFireAndForget;
1112

1213
/**
1314
* Created by tw on 10.06.17.
1415
*/
1516
@Component
16-
public class ScheduledTasks {
17+
public class CronJobs {
1718

1819
@Scheduled(initialDelay= TEN_SECONDS, fixedRate = ONE_DAY)
1920
public void createImprintUserAsync(){
2021
String msg = "create Imprint User (Async) ";
2122
if(!schedulerProperties.getSkipFortesting()) {
22-
Task task = asyncStartTask.createImprintUserAsync();
23+
Task task = mqTaskStartFireAndForget.createImprintUserAsync();
2324
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
2425
}
2526
}
@@ -28,7 +29,7 @@ public void createImprintUserAsync(){
2829
public void fetchTweetsFromTwitterSearch() {
2930
String msg = "fetch Tweets From TwitterSearch ";
3031
if((schedulerProperties.getAllowFetchTweetsFromTwitterSearch()) && (!schedulerProperties.getSkipFortesting())) {
31-
Task task = asyncStartTask.fetchTweetsFromSearch();
32+
Task task = mqTaskStartFireAndForget.fetchTweetsFromSearch();
3233
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
3334
}
3435
}
@@ -37,7 +38,7 @@ public void fetchTweetsFromTwitterSearch() {
3738
public void fetchUsersFromDefinedUserList(){
3839
String msg = "fetch Users from Defined User List ";
3940
if((schedulerProperties.getFetchUsersFromDefinedUserListAllow()) && (!schedulerProperties.getSkipFortesting())) {
40-
Task task = asyncStartTask.fetchUsersFromList();
41+
Task task = mqTaskStartFireAndForget.fetchUsersFromList();
4142
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
4243
}
4344
}
@@ -46,7 +47,7 @@ public void fetchUsersFromDefinedUserList(){
4647
public void getHomeTimeline() {
4748
String msg = "get Home Timeline Tweets ";
4849
if((schedulerProperties.getAllowGetHomeTimeline()) && (!schedulerProperties.getSkipFortesting())) {
49-
Task task = asyncStartTask.getHomeTimeline();
50+
Task task = mqTaskStartFireAndForget.getHomeTimeline();
5051
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
5152
}
5253
}
@@ -55,7 +56,7 @@ public void getHomeTimeline() {
5556
public void getUserTimeline() {
5657
String msg = " get User Timeline Tweets ";
5758
if((schedulerProperties.getAllowGetUserTimeline()) && (!schedulerProperties.getSkipFortesting())) {
58-
Task task = asyncStartTask.getUserTimeline();
59+
Task task = mqTaskStartFireAndForget.getUserTimeline();
5960
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
6061
}
6162
}
@@ -64,7 +65,7 @@ public void getUserTimeline() {
6465
public void getMentions() {
6566
String msg = " get Mentions ";
6667
if((schedulerProperties.getAllowGetMentions()) && (!schedulerProperties.getSkipFortesting())) {
67-
Task task = asyncStartTask.getMentions();
68+
Task task = mqTaskStartFireAndForget.getMentions();
6869
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
6970
}
7071
}
@@ -73,7 +74,7 @@ public void getMentions() {
7374
public void getFavorites() {
7475
String msg = " get Favorites ";
7576
if((schedulerProperties.getAllowGetFavorites()) && (!schedulerProperties.getSkipFortesting())) {
76-
Task task = asyncStartTask.getFavorites();
77+
Task task = mqTaskStartFireAndForget.getFavorites();
7778
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
7879
}
7980
}
@@ -82,7 +83,7 @@ public void getFavorites() {
8283
public void getRetweetsOfMe() {
8384
String msg = " get Retweets Of Me ";
8485
if((schedulerProperties.getAllowGetRetweetsOfMe()) && (!schedulerProperties.getSkipFortesting())) {
85-
Task task = asyncStartTask.getRetweetsOfMe();
86+
Task task = mqTaskStartFireAndForget.getRetweetsOfMe();
8687
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
8788
}
8889
}
@@ -91,9 +92,9 @@ public void getRetweetsOfMe() {
9192
public void getLists() {
9293
String msg = " get Lists ";
9394
if((schedulerProperties.getAllowGetLists()) && (!schedulerProperties.getSkipFortesting())) {
94-
Task task = asyncStartTask.getLists();
95+
Task task = mqTaskStartFireAndForget.getLists();
9596
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
96-
task = asyncStartTask.fetchUserlistOwners();
97+
task = mqTaskStartFireAndForget.fetchUserlistOwners();
9798
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
9899
}
99100
}
@@ -102,7 +103,7 @@ public void getLists() {
102103
public void fetchFollower(){
103104
String msg = "fetch Follower ";
104105
if((schedulerProperties.getFetchFollowerAllow()) && (!schedulerProperties.getSkipFortesting())) {
105-
Task task = asyncStartTask.fetchFollower();
106+
Task task = mqTaskStartFireAndForget.fetchFollower();
106107
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
107108
}
108109
}
@@ -111,7 +112,7 @@ public void fetchFollower(){
111112
public void fetchFriends(){
112113
String msg = "fetch Friends ";
113114
if((schedulerProperties.getFetchFriendsAllow()) && (!schedulerProperties.getSkipFortesting())) {
114-
Task task = asyncStartTask.fetchFriends();
115+
Task task = mqTaskStartFireAndForget.fetchFriends();
115116
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
116117
}
117118
}
@@ -120,7 +121,7 @@ public void fetchFriends(){
120121
public void removeOldDataFromStorage(){
121122
String msg = "remove Old Data From Storage: ";
122123
if((schedulerProperties.getRemoveOldDataFromStorageAllow()) && (!schedulerProperties.getSkipFortesting())) {
123-
Task task = asyncStartTask.removeOldDataFromStorage();
124+
Task task = mqTaskStartFireAndForget.removeOldDataFromStorage();
124125
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
125126
}
126127
}
@@ -129,7 +130,7 @@ public void removeOldDataFromStorage(){
129130
public void updateUserProfilesFromMentions(){
130131
String msg = "update User Profiles From Mentions";
131132
if((schedulerProperties.getAllowUpdateUserProfilesFromMention()) && (!schedulerProperties.getSkipFortesting())) {
132-
Task task = asyncStartTask.updateUsersFromMentions();
133+
Task task = mqTaskStartFireAndForget.updateUsersFromMentions();
133134
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
134135
}
135136
}
@@ -138,7 +139,7 @@ public void updateUserProfilesFromMentions(){
138139
public void updateTweets() {
139140
String msg = "update Tweets ";
140141
if((schedulerProperties.getAllowUpdateTweets()) && (!schedulerProperties.getSkipFortesting())){
141-
Task task = asyncStartTask.updateTweets();
142+
Task task = mqTaskStartFireAndForget.updateTweets();
142143
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
143144
}
144145
}
@@ -147,15 +148,18 @@ public void updateTweets() {
147148
public void updateUserProfiles() {
148149
String msg = "update User Profiles ";
149150
if((schedulerProperties.getAllowUpdateUserProfiles()) && (!schedulerProperties.getSkipFortesting())) {
150-
Task task = asyncStartTask.updateUsers();
151+
Task task = mqTaskStartFireAndForget.updateUsers();
151152
log.info(msg+ "SCHEDULED: task "+task.getUniqueId());
152153
}
153154
}
154155

155156
@Autowired
156-
public ScheduledTasks(SchedulerProperties schedulerProperties, AsyncStartTask mqAsyncStartTask) {
157+
public CronJobs(
158+
SchedulerProperties schedulerProperties,
159+
@Qualifier("mqTaskStartFireAndForget") TaskStartFireAndForget mqTaskStartFireAndForget
160+
) {
157161
this.schedulerProperties = schedulerProperties;
158-
this.asyncStartTask = mqAsyncStartTask;
162+
this.mqTaskStartFireAndForget = mqTaskStartFireAndForget;
159163
}
160164

161165
public final static long TEN_SECONDS = 10 * 1000;
@@ -170,9 +174,9 @@ public ScheduledTasks(SchedulerProperties schedulerProperties, AsyncStartTask mq
170174

171175
public final static long ONE_DAY = 24 * ONE_HOUR;
172176

173-
private static final Logger log = LoggerFactory.getLogger(ScheduledTasks.class);
177+
private static final Logger log = LoggerFactory.getLogger(CronJobs.class);
174178

175179
private final SchedulerProperties schedulerProperties;
176180

177-
private final AsyncStartTask asyncStartTask;
181+
private final TaskStartFireAndForget mqTaskStartFireAndForget;
178182
}

‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/common/MentionSplitter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.woehlke.twitterwall.backend.mq.endpoint.common;
22

33
import org.springframework.messaging.Message;
4-
import org.woehlke.twitterwall.backend.mq.msg.MentionMessage;
5-
import org.woehlke.twitterwall.backend.mq.msg.TaskMessage;
4+
import org.woehlke.twitterwall.backend.mq.endpoint.mentions.msg.MentionMessage;
5+
import org.woehlke.twitterwall.backend.mq.endpoint.tasks.TaskMessage;
66

77
import java.util.List;
88

‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/common/TweetsSplitter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.woehlke.twitterwall.backend.mq.endpoint.common;
22

33
import org.springframework.messaging.Message;
4-
import org.woehlke.twitterwall.backend.mq.msg.TaskMessage;
5-
import org.woehlke.twitterwall.backend.mq.msg.TweetMessage;
4+
import org.woehlke.twitterwall.backend.mq.endpoint.tasks.TaskMessage;
5+
import org.woehlke.twitterwall.backend.mq.endpoint.tweets.msg.TweetMessage;
66

77
import java.util.List;
88

‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/common/UrlSplitter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.woehlke.twitterwall.backend.mq.endpoint.common;
22

33
import org.springframework.messaging.Message;
4-
import org.woehlke.twitterwall.backend.mq.msg.UrlMessage;
4+
import org.woehlke.twitterwall.backend.mq.endpoint.urls.msg.UrlMessage;
55

66
import java.util.List;
77

‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/common/UserListsSplitter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.woehlke.twitterwall.backend.mq.endpoint.common;
22

33
import org.springframework.messaging.Message;
4-
import org.woehlke.twitterwall.backend.mq.msg.TaskMessage;
5-
import org.woehlke.twitterwall.backend.mq.msg.UserListMessage;
4+
import org.woehlke.twitterwall.backend.mq.endpoint.tasks.TaskMessage;
5+
import org.woehlke.twitterwall.backend.mq.endpoint.userlist.msg.UserListMessage;
66

77
import java.util.List;
88

‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/common/UserSplitter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.woehlke.twitterwall.backend.mq.endpoint.common;
22

33
import org.springframework.messaging.Message;
4-
import org.woehlke.twitterwall.backend.mq.msg.TaskMessage;
5-
import org.woehlke.twitterwall.backend.mq.msg.UserMessage;
4+
import org.woehlke.twitterwall.backend.mq.endpoint.tasks.TaskMessage;
5+
import org.woehlke.twitterwall.backend.mq.endpoint.users.msg.UserMessage;
66

77
import java.util.List;
88

‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/mentions/services/MentionFinisher.java‎ renamed to ‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/mentions/endpoint/serviceactivator/MentionFinisher.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.woehlke.twitterwall.backend.mq.endpoint.mentions.services;
1+
package org.woehlke.twitterwall.backend.mq.endpoint.mentions.endpoint.serviceactivator;
22

33
import org.springframework.messaging.Message;
4-
import org.woehlke.twitterwall.backend.mq.msg.MentionMessage;
5-
import org.woehlke.twitterwall.backend.mq.msg.results.MentionResultList;
4+
import org.woehlke.twitterwall.backend.mq.endpoint.mentions.msg.MentionMessage;
5+
import org.woehlke.twitterwall.backend.mq.endpoint.mentions.msg.MentionResultList;
66

77
import java.util.List;
88

‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/mentions/services/UpdateMentionWithUser.java‎ renamed to ‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/mentions/endpoint/serviceactivator/UpdateMentionWithUser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.woehlke.twitterwall.backend.mq.endpoint.mentions.services;
1+
package org.woehlke.twitterwall.backend.mq.endpoint.mentions.endpoint.serviceactivator;
22

33
import org.springframework.messaging.Message;
4-
import org.woehlke.twitterwall.backend.mq.msg.MentionMessage;
4+
import org.woehlke.twitterwall.backend.mq.endpoint.mentions.msg.MentionMessage;
55

66
public interface UpdateMentionWithUser {
77

‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/mentions/services/UserforMentionLoader.java‎ renamed to ‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/mentions/endpoint/serviceactivator/UserforMentionLoader.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.woehlke.twitterwall.backend.mq.endpoint.mentions.services;
1+
package org.woehlke.twitterwall.backend.mq.endpoint.mentions.endpoint.serviceactivator;
22

33
import org.springframework.messaging.Message;
4-
import org.woehlke.twitterwall.backend.mq.msg.MentionMessage;
4+
import org.woehlke.twitterwall.backend.mq.endpoint.mentions.msg.MentionMessage;
55

66
public interface UserforMentionLoader {
77

‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/mentions/services/UserforMentionPersistor.java‎ renamed to ‎src/main/java/org/woehlke/twitterwall/backend/mq/endpoint/mentions/endpoint/serviceactivator/UserforMentionPersistor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.woehlke.twitterwall.backend.mq.endpoint.mentions.services;
1+
package org.woehlke.twitterwall.backend.mq.endpoint.mentions.endpoint.serviceactivator;
22

33
import org.springframework.messaging.Message;
4-
import org.woehlke.twitterwall.backend.mq.msg.MentionMessage;
4+
import org.woehlke.twitterwall.backend.mq.endpoint.mentions.msg.MentionMessage;
55

66
public interface UserforMentionPersistor {
77

0 commit comments

Comments
 (0)