Skip to content

Commit 444d5ee

Browse files
phasenraum2010phasenraum2010
committed
working on #155 
1 parent 26d0132 commit 444d5ee

Some content is hidden

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

44 files changed

+274
-238
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import org.springframework.data.web.config.EnableSpringDataWebSupport;
99
import org.springframework.scheduling.annotation.EnableScheduling;
1010
import org.woehlke.twitterwall.conf.properties.TwitterProperties;
11-
import org.woehlke.twitterwall.conf.properties.TwitterwallBackendProperties;
12-
import org.woehlke.twitterwall.conf.properties.TwitterwallFrontendProperties;
13-
import org.woehlke.twitterwall.conf.properties.TwitterwallSchedulerProperties;
11+
import org.woehlke.twitterwall.conf.properties.BackendProperties;
12+
import org.woehlke.twitterwall.conf.properties.FrontendProperties;
13+
import org.woehlke.twitterwall.conf.properties.SchedulerProperties;
1414

1515

1616
/**
@@ -19,9 +19,9 @@
1919
@EnableScheduling
2020
@SpringBootApplication
2121
@EnableConfigurationProperties({
22-
TwitterwallBackendProperties.class,
23-
TwitterwallFrontendProperties.class,
24-
TwitterwallSchedulerProperties.class,
22+
BackendProperties.class,
23+
FrontendProperties.class,
24+
SchedulerProperties.class,
2525
TwitterProperties.class
2626
})
2727
@EnableSpringDataWebSupport

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.springframework.stereotype.Service;
88
import org.springframework.transaction.annotation.Propagation;
99
import org.springframework.transaction.annotation.Transactional;
10-
import org.woehlke.twitterwall.conf.properties.TwitterwallSchedulerProperties;
10+
import org.woehlke.twitterwall.conf.properties.SchedulerProperties;
1111
import org.woehlke.twitterwall.scheduled.mq.endoint.StartTask;
1212

1313
/**
@@ -20,46 +20,46 @@ public class ScheduledTasks {
2020
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_TWEETS)
2121
public void fetchTweetsFromTwitterSearch() {
2222
String msg = "fetch Tweets From TwitterSearch ";
23-
if(twitterwallSchedulerProperties.getAllowUpdateTweets() && !twitterwallSchedulerProperties.getSkipFortesting()) {
23+
if(schedulerProperties.getAllowUpdateTweets() && !schedulerProperties.getSkipFortesting()) {
2424
startTask.fetchTweetsFromTwitterSearch();
2525
}
2626
}
2727

2828
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_TWEETS)
2929
public void updateTweets() {
3030
String msg = "update Tweets ";
31-
if(twitterwallSchedulerProperties.getAllowUpdateTweets() && !twitterwallSchedulerProperties.getSkipFortesting()){
31+
if(schedulerProperties.getAllowUpdateTweets() && !schedulerProperties.getSkipFortesting()){
3232
startTask.updateTweets();
3333
}
3434
}
3535

3636
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER)
3737
public void updateUserProfiles() {
3838
String msg = "update User Profiles ";
39-
if(twitterwallSchedulerProperties.getAllowUpdateUserProfiles() && !twitterwallSchedulerProperties.getSkipFortesting()) {
39+
if(schedulerProperties.getAllowUpdateUserProfiles() && !schedulerProperties.getSkipFortesting()) {
4040
startTask.updateUserProfiles();
4141
}
4242
}
4343

4444
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_UPDATE_USER_BY_MENTION)
4545
public void updateUserProfilesFromMentions(){
4646
String msg = "update User Profiles From Mentions";
47-
if(twitterwallSchedulerProperties.getAllowUpdateUserProfilesFromMention() && !twitterwallSchedulerProperties.getSkipFortesting()) {
47+
if(schedulerProperties.getAllowUpdateUserProfilesFromMention() && !schedulerProperties.getSkipFortesting()) {
4848
startTask.updateUserProfilesFromMentions();
4949
}
5050
}
5151

5252
@Scheduled(fixedRate = FIXED_RATE_FOR_SCHEDULAR_FETCH_USER_LIST)
5353
public void fetchUsersFromDefinedUserList(){
5454
String msg = "fetch Users from Defined User List ";
55-
if(twitterwallSchedulerProperties.getFetchUserList().getAllow() && !twitterwallSchedulerProperties.getSkipFortesting()) {
55+
if(schedulerProperties.getFetchUserList().getAllow() && !schedulerProperties.getSkipFortesting()) {
5656
startTask.fetchUsersFromDefinedUserList();
5757
}
5858
}
5959

6060
@Autowired
61-
public ScheduledTasks(TwitterwallSchedulerProperties twitterwallSchedulerProperties, StartTask startTask) {
62-
this.twitterwallSchedulerProperties = twitterwallSchedulerProperties;
61+
public ScheduledTasks(SchedulerProperties schedulerProperties, StartTask startTask) {
62+
this.schedulerProperties = schedulerProperties;
6363
this.startTask = startTask;
6464
}
6565

@@ -83,7 +83,7 @@ public ScheduledTasks(TwitterwallSchedulerProperties twitterwallSchedulerPropert
8383

8484
private static final Logger log = LoggerFactory.getLogger(ScheduledTasks.class);
8585

86-
private final TwitterwallSchedulerProperties twitterwallSchedulerProperties;
86+
private final SchedulerProperties schedulerProperties;
8787

8888
private final StartTask startTask;
8989
}

src/main/java/org/woehlke/twitterwall/conf/DataSourceConf.java renamed to src/main/java/org/woehlke/twitterwall/conf/DataSourceConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
@Configuration
1616
@EnableJpaRepositories("org.woehlke.twitterwall.oodm.repositories")
17-
public class DataSourceConf {
17+
public class DataSourceConfig {
1818

1919
@Bean
2020
@Primary

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
88
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
99
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
10+
import org.woehlke.twitterwall.conf.properties.FrontendProperties;
1011

1112
@Configuration
1213
@EnableWebSecurity
1314
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
1415

16+
1517
@Override
1618
protected void configure(HttpSecurity http) throws Exception {
1719
http
@@ -29,8 +31,18 @@ protected void configure(HttpSecurity http) throws Exception {
2931

3032
@Autowired
3133
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
34+
String user = frontendProperties.getLoginUsername();
35+
String pwd = frontendProperties.getLoginPassword();
36+
String role = "USER";
3237
auth
3338
.inMemoryAuthentication()
34-
.withUser("user").password("password").roles("USER");
39+
.withUser(user).password(pwd).roles(role);
3540
}
41+
42+
@Autowired
43+
public WebSecurityConfig(FrontendProperties frontendProperties) {
44+
this.frontendProperties = frontendProperties;
45+
}
46+
47+
private final FrontendProperties frontendProperties;
3648
}

src/main/java/org/woehlke/twitterwall/conf/properties/TwitterwallBackendProperties.java renamed to src/main/java/org/woehlke/twitterwall/conf/properties/BackendProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@Component
1313
@Validated
1414
@ConfigurationProperties(prefix="twitterwall.backend")
15-
public class TwitterwallBackendProperties {
15+
public class BackendProperties {
1616

1717
@Valid
1818
public Twitter twitter = new Twitter();

src/main/java/org/woehlke/twitterwall/conf/properties/TwitterwallFrontendProperties.java renamed to src/main/java/org/woehlke/twitterwall/conf/properties/FrontendProperties.java

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@Component
1212
@Validated
1313
@ConfigurationProperties(prefix="twitterwall.frontend")
14-
public class TwitterwallFrontendProperties {
14+
public class FrontendProperties {
1515

1616
@NotNull
1717
private String idGoogleAnalytics;
@@ -37,6 +37,12 @@ public class TwitterwallFrontendProperties {
3737
@NotNull
3838
private Integer pageSize;
3939

40+
@NotNull
41+
private String loginUsername;
42+
43+
@NotNull
44+
private String loginPassword;
45+
4046
@Valid
4147
private Controller controller = new Controller();
4248

@@ -125,4 +131,20 @@ public Integer getPageSize() {
125131
public void setPageSize(Integer pageSize) {
126132
this.pageSize = pageSize;
127133
}
134+
135+
public String getLoginUsername() {
136+
return loginUsername;
137+
}
138+
139+
public void setLoginUsername(String loginUsername) {
140+
this.loginUsername = loginUsername;
141+
}
142+
143+
public String getLoginPassword() {
144+
return loginPassword;
145+
}
146+
147+
public void setLoginPassword(String loginPassword) {
148+
this.loginPassword = loginPassword;
149+
}
128150
}

src/main/java/org/woehlke/twitterwall/conf/properties/TwitterwallSchedulerProperties.java renamed to src/main/java/org/woehlke/twitterwall/conf/properties/SchedulerProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@Component
1414
@Validated
1515
@ConfigurationProperties(prefix="twitterwall.scheduler")
16-
public class TwitterwallSchedulerProperties {
16+
public class SchedulerProperties {
1717

1818
@NotNull
1919
private Boolean allowFetchTweetsFromTwitterSearch;

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.springframework.ui.Model;
99
import org.springframework.web.bind.annotation.RequestMapping;
1010
import org.springframework.web.bind.annotation.RequestParam;
11-
import org.woehlke.twitterwall.conf.properties.TwitterwallFrontendProperties;
11+
import org.woehlke.twitterwall.conf.properties.FrontendProperties;
1212
import org.woehlke.twitterwall.frontend.controller.common.Symbols;
1313
import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
1414
import org.woehlke.twitterwall.oodm.entities.*;
@@ -36,7 +36,7 @@ public String domainCountTweet2hashtag(
3636
) {
3737
String title = "Tweet -> HashTag";
3838
setUpThisPage(title,model);
39-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize());
39+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize());
4040
Page<Object2Entity> listObject2Entity = tweetService.findAllTweet2HashTag(pageRequest);
4141
List<Object2Entity> listObject2EntityContent = new ArrayList();
4242
for(Object2Entity object2Entity:listObject2Entity.getContent()){
@@ -62,7 +62,7 @@ public String domainCountTweet2media(
6262
) {
6363
String title = "Tweet -&gt; Media";
6464
setUpThisPage(title,model);
65-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize());
65+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize());
6666
Page<Object2Entity> listObject2Entity = tweetService.findAllTweet2Media(pageRequest);
6767
List<Object2Entity> listObject2EntityContent = new ArrayList();
6868
for(Object2Entity object2Entity:listObject2Entity.getContent()){
@@ -83,7 +83,7 @@ public String domainCountTweet2media(
8383
public String domainCountTweet2mention(@RequestParam(name= "page" ,defaultValue=""+ ControllerHelper.FIRST_PAGE_NUMBER) int page, Model model) {
8484
String title = "Tweet -&gt; Mention";
8585
setUpThisPage(title,model);
86-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize());
86+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize());
8787
Page<Object2Entity> listObject2Entity = tweetService.findAllTweet2Mention(pageRequest);
8888
List<Object2Entity> listObject2EntityContent = new ArrayList();
8989
for(Object2Entity object2Entity:listObject2Entity.getContent()){
@@ -109,7 +109,7 @@ public String domainCountTweet2tickersymbol(
109109
) {
110110
String title = "Tweet -&gt; TickerSymbol";
111111
setUpThisPage(title,model);
112-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize());
112+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize());
113113
Page<Object2Entity> listObject2Entity = tweetService.findAllTweet2TickerSymbol(pageRequest);
114114
List<Object2Entity> listObject2EntityContent = new ArrayList();
115115
for(Object2Entity object2Entity:listObject2Entity.getContent()){
@@ -135,7 +135,7 @@ public String domainCountTweet2url(
135135
) {
136136
String title = "Tweet -&gt; Url";
137137
setUpThisPage(title,model);
138-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize());
138+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize());
139139
Page<Object2Entity> listObject2Entity = tweetService.findAllTweet2Url(pageRequest);
140140
List<Object2Entity> listObject2EntityContent = new ArrayList();
141141
for(Object2Entity object2Entity:listObject2Entity.getContent()){
@@ -161,7 +161,7 @@ public String domainCountUserprofile2hashtag(
161161
) {
162162
String title = "UserProfile -&gt; HashTag";
163163
setUpThisPage(title,model);
164-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize());
164+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize());
165165
Page<Object2Entity> listObject2Entity = userService.findAllUser2HashTag(pageRequest);
166166
List<Object2Entity> listObject2EntityContent = new ArrayList();
167167
for(Object2Entity object2Entity:listObject2Entity.getContent()){
@@ -187,7 +187,7 @@ public String domainCountUserprofile2media(
187187
) {
188188
String title = "UserProfile -&gt; Media";
189189
setUpThisPage(title,model);
190-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize());
190+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize());
191191
Page<Object2Entity> listObject2Entity = userService.findAllUser2Media(pageRequest);
192192
List<Object2Entity> listObject2EntityContent = new ArrayList();
193193
for(Object2Entity object2Entity:listObject2Entity.getContent()){
@@ -213,7 +213,7 @@ public String domainCountUserprofile2mention(
213213
) {
214214
String title = "UserProfile -&gt; Mention";
215215
setUpThisPage(title,model);
216-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize());
216+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize());
217217
Page<Object2Entity> listObject2Entity = userService.findAllUser2Mentiong(pageRequest);
218218
List<Object2Entity> listObject2EntityContent = new ArrayList();
219219
for(Object2Entity object2Entity:listObject2Entity.getContent()){
@@ -239,7 +239,7 @@ public String domainCountUserprofile2Tickersymbol(
239239
) {
240240
String title = "UserProfile -&gt; TickerSymbol";
241241
setUpThisPage(title,model);
242-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize());
242+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize());
243243
Page<Object2Entity> listObject2Entity = userService.findAllUser2TickerSymbol(pageRequest);
244244
List<Object2Entity> listObject2EntityContent = new ArrayList();
245245
for(Object2Entity object2Entity:listObject2Entity.getContent()){
@@ -265,7 +265,7 @@ public String domainCountUserprofile2Url(
265265
) {
266266
String title = "UserProfile -&gt; Url";
267267
setUpThisPage(title,model);
268-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize());
268+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize());
269269
Page<Object2Entity> listObject2Entity = userService.findAllUser2Url(pageRequest);
270270
List<Object2Entity> listObject2EntityContent = new ArrayList();
271271
for(Object2Entity object2Entity:listObject2Entity.getContent()){
@@ -290,8 +290,8 @@ private void setUpThisPage(String title,Model model){
290290

291291

292292
@Autowired
293-
public CountedEntitiesController(TwitterwallFrontendProperties twitterwallFrontendProperties, ControllerHelper controllerHelper, TweetService tweetService, UserService userService, HashTagService hashTagService, MediaService mediaService, MentionService mentionService, TickerSymbolService tickerSymbolService, UrlService urlService) {
294-
this.twitterwallFrontendProperties = twitterwallFrontendProperties;
293+
public CountedEntitiesController(FrontendProperties frontendProperties, ControllerHelper controllerHelper, TweetService tweetService, UserService userService, HashTagService hashTagService, MediaService mediaService, MentionService mentionService, TickerSymbolService tickerSymbolService, UrlService urlService) {
294+
this.frontendProperties = frontendProperties;
295295
this.controllerHelper = controllerHelper;
296296
this.tweetService = tweetService;
297297
this.userService = userService;
@@ -304,7 +304,7 @@ public CountedEntitiesController(TwitterwallFrontendProperties twitterwallFronte
304304

305305

306306

307-
private final TwitterwallFrontendProperties twitterwallFrontendProperties;
307+
private final FrontendProperties frontendProperties;
308308

309309
private final ControllerHelper controllerHelper;
310310

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.springframework.web.bind.annotation.RequestMapping;
1414
import org.springframework.web.bind.annotation.RequestParam;
1515
import org.woehlke.twitterwall.conf.properties.TwitterProperties;
16-
import org.woehlke.twitterwall.conf.properties.TwitterwallFrontendProperties;
16+
import org.woehlke.twitterwall.conf.properties.FrontendProperties;
1717
import org.woehlke.twitterwall.frontend.controller.common.HashTagsOverviewHelper;
1818
import org.woehlke.twitterwall.frontend.controller.common.Symbols;
1919
import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
@@ -44,7 +44,7 @@ public String getAll(@RequestParam(name= "page" ,defaultValue=""+ FIRST_PAGE_NUM
4444
String title = "HashTag";
4545
String symbol = Symbols.HASHTAG.toString();
4646
model = controllerHelper.setupPage(model,title,subtitle,symbol);
47-
Pageable pageRequest = new PageRequest(page, twitterwallFrontendProperties.getPageSize(), Sort.Direction.ASC,"text");
47+
Pageable pageRequest = new PageRequest(page, frontendProperties.getPageSize(), Sort.Direction.ASC,"text");
4848
Page<HashTag> myPageContent = hashTagService.getAll(pageRequest);
4949
model.addAttribute("myPageContent",myPageContent);
5050
return "hashtag/all";
@@ -63,8 +63,8 @@ public String hashTagFromTweetsAndUsers(
6363
if (m.matches()) {
6464
String msg2 = msg + " parameter IS valid - START ";
6565
log.debug(msg2);
66-
Pageable pageRequestTweet = new PageRequest(pageTweet, twitterwallFrontendProperties.getPageSize());
67-
Pageable pageRequestUser = new PageRequest(pageUser, twitterwallFrontendProperties.getPageSize());
66+
Pageable pageRequestTweet = new PageRequest(pageTweet, frontendProperties.getPageSize());
67+
Pageable pageRequestUser = new PageRequest(pageUser, frontendProperties.getPageSize());
6868
String subtitle = "Tweets und User für HashTag";
6969
String title = text;
7070
String symbol = Symbols.HASHTAG.toString();
@@ -106,7 +106,7 @@ public String hashTagsOverview(Model model) {
106106

107107
private static final Logger log = LoggerFactory.getLogger(HashTagController.class);
108108

109-
private final TwitterwallFrontendProperties twitterwallFrontendProperties;
109+
private final FrontendProperties frontendProperties;
110110

111111
private final TwitterProperties twitterProperties;
112112

@@ -121,8 +121,8 @@ public String hashTagsOverview(Model model) {
121121
private final HashTagsOverviewHelper hashTagsOverviewHelper;
122122

123123
@Autowired
124-
public HashTagController(TwitterwallFrontendProperties twitterwallFrontendProperties, TwitterProperties twitterProperties, HashTagService hashTagService, TweetService tweetService, UserService userService, ControllerHelper controllerHelper, HashTagsOverviewHelper hashTagsOverviewHelper) {
125-
this.twitterwallFrontendProperties = twitterwallFrontendProperties;
124+
public HashTagController(FrontendProperties frontendProperties, TwitterProperties twitterProperties, HashTagService hashTagService, TweetService tweetService, UserService userService, ControllerHelper controllerHelper, HashTagsOverviewHelper hashTagsOverviewHelper) {
125+
this.frontendProperties = frontendProperties;
126126
this.twitterProperties = twitterProperties;
127127
this.hashTagService = hashTagService;
128128
this.tweetService = tweetService;

0 commit comments

Comments
 (0)