Skip to content

Commit 2332162

Browse files
phasenraum2010phasenraum2010
authored
Merge pull request #148 from phasenraum2010/master
release 1.0.15
2 parents 7487b85 + 8fe0a83 commit 2332162

Some content is hidden

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

51 files changed

+1100
-717
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.woehlke.twitterwall</groupId>
66
<artifactId>twitterwall2</artifactId>
7-
<version>1.0.15-SNAPSHOT</version>
7+
<version>1.0.16-SNAPSHOT</version>
88
<name>twitterwall2</name>
99

1010
<description>Twitterwall with spring:boot for heroku</description>

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

Lines changed: 40 additions & 206 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
import org.springframework.transaction.annotation.Propagation;
99
import org.springframework.transaction.annotation.Transactional;
1010
import org.woehlke.twitterwall.conf.TwitterwallSchedulerProperties;
11-
import org.woehlke.twitterwall.scheduled.service.facade.*;
12-
13-
import java.text.SimpleDateFormat;
14-
import java.util.Date;
11+
import org.woehlke.twitterwall.scheduled.mq.endoint.StartTask;
1512

1613
/**
1714
* Created by tw on 10.06.17.
@@ -20,45 +17,50 @@
2017
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
2118
public class ScheduledTasks {
2219

23-
private static final Logger log = LoggerFactory.getLogger(ScheduledTasks.class);
24-
25-
private static final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
26-
27-
private final TwitterwallSchedulerProperties twitterwallSchedulerProperties;
28-
29-
private void logEnv(String msg){
30-
log.info("====================================================================");
31-
log.info(msg);
32-
log.info("====================================================================");
33-
log.info("twitterwall.scheduler.allowUpdateTweets = "+ twitterwallSchedulerProperties.getAllowUpdateTweets());
34-
log.info("twitterwall.scheduler.allowUpdateUserProfiles = "+ twitterwallSchedulerProperties.getAllowUpdateUserProfiles());
35-
log.info("twitterwall.scheduler.allowUpdateUserProfilesFromMention = "+ twitterwallSchedulerProperties.getAllowUpdateUserProfilesFromMention());
36-
log.info("twitterwall.scheduler.allowFetchTweetsFromTwitterSearch = "+ twitterwallSchedulerProperties.getAllowFetchTweetsFromTwitterSearch());
37-
log.info("twitterwall.scheduler.skipFortesting = "+ twitterwallSchedulerProperties.getSkipFortesting());
38-
log.info("twitterwall.scheduler.herokuDbRowsLimit = "+ twitterwallSchedulerProperties.getHerokuDbRowsLimit());
39-
log.info("twitterwall.scheduler.fetchUserList.name = "+ twitterwallSchedulerProperties.getFetchUserList().getName());
40-
log.info("twitterwall.scheduler.fetchUserList.allow = "+ twitterwallSchedulerProperties.getFetchUserList().getAllow());
41-
log.info("====================================================================");
20+
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_TWEETS)
21+
public void fetchTweetsFromTwitterSearch() {
22+
String msg = "fetch Tweets From TwitterSearch ";
23+
if(twitterwallSchedulerProperties.getAllowUpdateTweets() && !twitterwallSchedulerProperties.getSkipFortesting()) {
24+
startTask.fetchTweetsFromTwitterSearch();
25+
}
4226
}
4327

44-
private final FetchTweetsFromTwitterSearch fetchTweetsFromTwitterSearch;
45-
46-
private final FetchUsersFromDefinedUserList fetchUsersFromDefinedUserList;
28+
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_TWEETS)
29+
public void updateTweets() {
30+
String msg = "update Tweets ";
31+
if(twitterwallSchedulerProperties.getAllowUpdateTweets() && !twitterwallSchedulerProperties.getSkipFortesting()){
32+
startTask.updateTweets();
33+
}
34+
}
4735

48-
private final UpdateTweets updateTweets;
36+
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER)
37+
public void updateUserProfiles() {
38+
String msg = "update User Profiles ";
39+
if(twitterwallSchedulerProperties.getAllowUpdateUserProfiles() && !twitterwallSchedulerProperties.getSkipFortesting()) {
40+
startTask.updateUserProfiles();
41+
}
42+
}
4943

50-
private final UpdateUserProfiles updateUserProfiles;
44+
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER_BY_MENTION)
45+
public void updateUserProfilesFromMentions(){
46+
String msg = "update User Profiles From Mentions";
47+
if(twitterwallSchedulerProperties.getAllowUpdateUserProfilesFromMention() && !twitterwallSchedulerProperties.getSkipFortesting()) {
48+
startTask.updateUserProfilesFromMentions();
49+
}
50+
}
5151

52-
private final UpdateUserProfilesFromMentions updateUserProfilesFromMentions;
52+
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_USER_LIST)
53+
public void fetchUsersFromDefinedUserList(){
54+
String msg = "fetch Users from Defined User List ";
55+
if(twitterwallSchedulerProperties.getFetchUserList().getAllow() && !twitterwallSchedulerProperties.getSkipFortesting()) {
56+
startTask.fetchUsersFromDefinedUserList();
57+
}
58+
}
5359

5460
@Autowired
55-
public ScheduledTasks(TwitterwallSchedulerProperties twitterwallSchedulerProperties, FetchTweetsFromTwitterSearch fetchTweetsFromTwitterSearch, FetchUsersFromDefinedUserList fetchUsersFromDefinedUserList, UpdateTweets updateTweets, UpdateUserProfiles updateUserProfiles, UpdateUserProfilesFromMentions updateUserProfilesFromMentions) {
61+
public ScheduledTasks(TwitterwallSchedulerProperties twitterwallSchedulerProperties, StartTask startTask) {
5662
this.twitterwallSchedulerProperties = twitterwallSchedulerProperties;
57-
this.fetchTweetsFromTwitterSearch = fetchTweetsFromTwitterSearch;
58-
this.fetchUsersFromDefinedUserList = fetchUsersFromDefinedUserList;
59-
this.updateTweets = updateTweets;
60-
this.updateUserProfiles = updateUserProfiles;
61-
this.updateUserProfilesFromMentions = updateUserProfilesFromMentions;
63+
this.startTask = startTask;
6264
}
6365

6466
private final static long EINE_MINUTE = 60 * 1000;
@@ -79,177 +81,9 @@ public ScheduledTasks(TwitterwallSchedulerProperties twitterwallSchedulerPropert
7981

8082
private final static long FIXED_RATE_FOR_SCHEDULAR_FETCH_USER_LIST = ZWOELF_STUNDEN;
8183

82-
//@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_TWEETS)
83-
public void fetchTweetsFromTwitterSearch() {
84-
String msg = "fetch Tweets From TwitterSearch ";
85-
logEnv(msg);
86-
if(twitterwallSchedulerProperties.getAllowUpdateTweets() && !twitterwallSchedulerProperties.getSkipFortesting()){
87-
log.info("START "+msg+": The time is now {}", dateFormat.format(new Date()));
88-
try {
89-
this.fetchTweetsFromTwitterSearch.fetchTweetsFromTwitterSearch();
90-
log.info("DONE "+msg+" (OK)"+": The time is now {}", dateFormat.format(new Date()));
91-
} catch (RuntimeException e) {
92-
msg += " (RuntimeException) ";
93-
String eMesg = e.getMessage();
94-
e.printStackTrace();
95-
Throwable t = e.getCause();
96-
while(t != null){
97-
log.warn(msg + t.getMessage());
98-
t = t.getCause();
99-
}
100-
log.error(msg +" : " + eMesg);
101-
log.error("NOT DONE "+msg+" (NOK)");;
102-
} catch (Exception e) {
103-
msg += " (Exception) ";
104-
String eMesg = e.getMessage();
105-
e.printStackTrace();
106-
Throwable t = e.getCause();
107-
while(t != null){
108-
log.warn(msg + t.getMessage());
109-
t = t.getCause();
110-
}
111-
log.error(msg +" : " + eMesg);
112-
log.error("NOT DONE "+msg+" (NOK)");;
113-
}
114-
}
115-
logEnv(msg);
116-
}
117-
118-
//@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_TWEETS)
119-
public void updateTweets() {
120-
String msg = "update Tweets ";
121-
logEnv(msg);
122-
if(twitterwallSchedulerProperties.getAllowUpdateTweets() && !twitterwallSchedulerProperties.getSkipFortesting()){
123-
log.info("START "+msg + ": The time is now {}", dateFormat.format(new Date()));
124-
try {
125-
this.updateTweets.updateTweets();
126-
log.info("DONE "+msg+" (OK)"+": The time is now {}", dateFormat.format(new Date()));
127-
} catch (RuntimeException e) {
128-
msg += " (RuntimeException) ";
129-
String eMsg = e.getMessage();
130-
log.warn(msg + e.getMessage());
131-
Throwable t = e.getCause();
132-
e.printStackTrace();
133-
while(t != null){
134-
log.warn(msg + t.getMessage());
135-
t = t.getCause();
136-
}
137-
log.warn(msg + eMsg);
138-
log.warn("NOT DONE "+msg+" (NOK) {}", dateFormat.format(new Date()));;
139-
} catch (Exception e) {
140-
msg += " (Exception) ";
141-
String eMsg = e.getMessage();
142-
Throwable t = e.getCause();
143-
while(t != null){
144-
log.warn(msg + t.getMessage());
145-
t = t.getCause();
146-
}
147-
log.warn(msg + eMsg);
148-
log.warn("NOT DONE "+msg+" (NOK) {}", dateFormat.format(new Date()));
149-
}
150-
}
151-
logEnv(msg);
152-
}
153-
154-
//@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER)
155-
public void updateUserProfiles() {
156-
String msg = "update User Profiles ";
157-
logEnv(msg);
158-
if(twitterwallSchedulerProperties.getAllowUpdateUserProfiles() && !twitterwallSchedulerProperties.getSkipFortesting()) {
159-
log.info("START " + msg + ": The time is now {}", dateFormat.format(new Date()));
160-
try {
161-
//this.updateUserProfiles.updateUserProfiles();
162-
log.info("DONE " + msg + " (OK)" + ": The time is now {}", dateFormat.format(new Date()));
163-
} catch (RuntimeException e) {
164-
msg += " (RuntimeException) ";
165-
String eMsg = e.getMessage();
166-
Throwable t = e.getCause();
167-
while(t != null){
168-
log.warn(msg + t.getMessage());
169-
t = t.getCause();
170-
}
171-
log.warn(msg + eMsg);
172-
log.warn(msg + " NOT DONE " + msg + " (NOK) {}", dateFormat.format(new Date()));
173-
} catch (Exception e) {
174-
msg += " (Exception) ";
175-
String eMsg = e.getMessage();
176-
Throwable t = e.getCause();
177-
while(t != null){
178-
log.warn(msg + t.getMessage());
179-
t = t.getCause();
180-
}
181-
log.warn(msg + eMsg);
182-
log.error(msg + " NOT DONE " + msg + " (NOK) {}", dateFormat.format(new Date()));
183-
}
184-
}
185-
logEnv(msg);
186-
}
84+
private static final Logger log = LoggerFactory.getLogger(ScheduledTasks.class);
18785

188-
//@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER_BY_MENTION)
189-
public void updateUserProfilesFromMentions(){
190-
String msg = "update User Profiles From Mentions";
191-
logEnv(msg);
192-
if(twitterwallSchedulerProperties.getAllowUpdateUserProfilesFromMention() && !twitterwallSchedulerProperties.getSkipFortesting()) {
193-
log.info("START " + msg + ": The time is now {}", dateFormat.format(new Date()));
194-
try {
195-
//this.updateUserProfilesFromMentions.updateUserProfilesFromMentions();
196-
log.info("DONE " + msg + " (OK)" + ": The time is now {}", dateFormat.format(new Date()));
197-
} catch (RuntimeException e) {
198-
msg += " (RuntimeException) ";
199-
String eMsg = e.getMessage();
200-
Throwable t = e.getCause();
201-
while(t != null){
202-
log.warn(msg + t.getMessage());
203-
t = t.getCause();
204-
}
205-
log.warn(msg + eMsg);
206-
log.warn(msg + " NOT DONE " + msg + " (NOK) {}", dateFormat.format(new Date()));
207-
} catch (Exception e) {
208-
msg += " (Exception) ";
209-
String eMsg = e.getMessage();
210-
Throwable t = e.getCause();
211-
while(t != null){
212-
log.warn(msg + t.getMessage());
213-
t = t.getCause();
214-
}
215-
log.warn(msg + eMsg);
216-
log.error(msg + " NOT DONE " + msg + " (NOK) {}", dateFormat.format(new Date()));
217-
}
218-
}
219-
logEnv(msg);
220-
}
86+
private final TwitterwallSchedulerProperties twitterwallSchedulerProperties;
22187

222-
//@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_USER_LIST)
223-
public void fetchUsersFromDefinedUserList(){
224-
String msg = "fetch Users from Defined User List ";
225-
logEnv(msg);
226-
if(twitterwallSchedulerProperties.getFetchUserList().getAllow() && !twitterwallSchedulerProperties.getSkipFortesting()) {
227-
log.info("START " + msg + ": The time is now {}", dateFormat.format(new Date()));
228-
try {
229-
this.fetchUsersFromDefinedUserList.fetchUsersFromDefinedUserList();
230-
log.info("DONE " + msg + " (OK)" + ": The time is now {}", dateFormat.format(new Date()));
231-
} catch (RuntimeException e) {
232-
msg += " (RuntimeException) ";
233-
String eMsg = e.getMessage();
234-
Throwable t = e.getCause();
235-
while(t != null){
236-
log.warn(msg + t.getMessage());
237-
t = t.getCause();
238-
}
239-
log.warn(msg + eMsg);
240-
log.warn(msg + " NOT DONE " + msg + " (NOK) {}", dateFormat.format(new Date()));
241-
} catch (Exception e) {
242-
msg += " (Exception) ";
243-
String eMsg = e.getMessage();
244-
Throwable t = e.getCause();
245-
while(t != null){
246-
log.warn(msg + t.getMessage());
247-
t = t.getCause();
248-
}
249-
log.error(msg + eMsg);
250-
log.error(msg + " NOT DONE " + msg + " (NOK) {}", dateFormat.format(new Date()));
251-
}
252-
}
253-
logEnv(msg);
254-
}
88+
private final StartTask startTask;
25589
}

‎src/main/java/org/woehlke/twitterwall/conf/TwitterProperties.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ public class TwitterProperties {
2727
@NotNull
2828
private Integer pageSize;
2929

30+
@NotNull
31+
private Integer millisToWaitBetweenTwoApiCalls;
32+
3033
@NotNull
3134
private String searchQuery;
3235

@@ -77,4 +80,12 @@ public String getSearchQuery() {
7780
public void setSearchQuery(String searchQuery) {
7881
this.searchQuery = searchQuery;
7982
}
83+
84+
public Integer getMillisToWaitBetweenTwoApiCalls() {
85+
return millisToWaitBetweenTwoApiCalls;
86+
}
87+
88+
public void setMillisToWaitBetweenTwoApiCalls(Integer millisToWaitBetweenTwoApiCalls) {
89+
this.millisToWaitBetweenTwoApiCalls = millisToWaitBetweenTwoApiCalls;
90+
}
8091
}

‎src/main/java/org/woehlke/twitterwall/frontend/controller/ApplicationController.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public class ApplicationController {
2020
@RequestMapping(path="/domain/count")
2121
public String domainCount(Model model) {
2222
String msg = "/application/domain/count: ";
23-
controllerHelper.logEnv();
2423
String title = "Counted Entities";
2524
String subtitle = twitterProperties.getSearchQuery();
2625
String symbol = Symbols.DATABASE.toString();
@@ -33,27 +32,22 @@ public String domainCount(Model model) {
3332
@RequestMapping(path="/management")
3433
public String dmanagementPage(Model model) {
3534
String msg = "/application/domain/count: ";
36-
controllerHelper.logEnv();
3735
String title = "Application Management";
3836
String subtitle = twitterProperties.getSearchQuery();
3937
String symbol = Symbols.DATABASE.toString();
4038
model = controllerHelper.setupPage(model,title,subtitle,symbol);
41-
//CountedEntities countedEntities =this.countedEntitiesService.countAll();
42-
//model.addAttribute("countedEntities", countedEntities);
43-
4439
return "application/management";
4540
}
46-
47-
48-
private final CountedEntitiesService countedEntitiesService;
49-
41+
5042
@Autowired
5143
public ApplicationController(CountedEntitiesService countedEntitiesService, ControllerHelper controllerHelper, TwitterProperties twitterProperties) {
5244
this.countedEntitiesService = countedEntitiesService;
5345
this.controllerHelper = controllerHelper;
5446
this.twitterProperties = twitterProperties;
5547
}
5648

49+
private final CountedEntitiesService countedEntitiesService;
50+
5751
private final ControllerHelper controllerHelper;
5852

5953
private final TwitterProperties twitterProperties;

‎src/main/java/org/woehlke/twitterwall/frontend/controller/CountedEntitiesController.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public String domainCountUserprofile2Url(Model model) {
8888
}
8989

9090
private void setUpThisPage(String title,Model model){
91-
controllerHelper.logEnv();
9291
String subtitle = "Counted Entities";
9392
String symbol = Symbols.DATABASE.toString();
9493
model = controllerHelper.setupPage(model,title,subtitle,symbol);

0 commit comments

Comments
 (0)