Skip to content

Commit b5a5767

Browse files
thomaswoehlkethomaswoehlke
committed
refactoring of java classes
1 parent 0f026c5 commit b5a5767

File tree

13 files changed

+52
-54
lines changed

13 files changed

+52
-54
lines changed

‎src/main/java/org/woehlke/simpleworklist/application/framework/AbstractController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.woehlke.simpleworklist.application.session.UserSessionBean;
2121

2222
import org.springframework.beans.factory.annotation.Autowired;
23-
import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
23+
import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService;
2424
import org.woehlke.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
2525

2626
import javax.validation.constraints.NotNull;
@@ -49,7 +49,7 @@ public abstract class AbstractController {
4949
protected UserAccountService userAccountService;
5050

5151
@Autowired
52-
protected UserAccountAccessService userAccountAccessService;
52+
protected UserAuthorizationService userAuthorizationService;
5353

5454
@Autowired
5555
protected ChatMessageService chatMessageService;

‎src/main/java/org/woehlke/simpleworklist/config/WebSecurityConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.springframework.security.crypto.password.PasswordEncoder;
2121
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
2222
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
23-
import org.woehlke.simpleworklist.domain.user.access.SimpleworklistUserAccountSecurityService;
23+
import org.woehlke.simpleworklist.domain.user.access.ApplicationUserDetailsService;
2424

2525

2626
@Configuration
@@ -39,18 +39,18 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter implements W
3939

4040
private final AuthenticationManagerBuilder authenticationManagerBuilder;
4141
//private final AuthenticationSuccessHandler loginSuccessHandler;
42-
private final SimpleworklistUserAccountSecurityService simpleworklistUserAccountSecurityService;
42+
private final ApplicationUserDetailsService applicationUserDetailsService;
4343
private final SimpleworklistProperties simpleworklistProperties;
4444

4545
@Autowired
4646
public WebSecurityConfig(
4747
AuthenticationManagerBuilder auth,
4848
//LoginSuccessHandler loginSuccessHandler,
49-
SimpleworklistUserAccountSecurityService simpleworklistUserAccountSecurityService,
49+
ApplicationUserDetailsService applicationUserDetailsService,
5050
SimpleworklistProperties simpleworklistProperties) {
5151
this.authenticationManagerBuilder = auth;
5252
//this.loginSuccessHandler = loginSuccessHandler;
53-
this.simpleworklistUserAccountSecurityService = simpleworklistUserAccountSecurityService;
53+
this.applicationUserDetailsService = applicationUserDetailsService;
5454
this.simpleworklistProperties = simpleworklistProperties;
5555
}
5656

@@ -98,7 +98,7 @@ protected void configure(HttpSecurity http) throws Exception {
9898

9999
@Bean
100100
public UserDetailsService userDetailsService(){
101-
return this.simpleworklistUserAccountSecurityService;
101+
return this.applicationUserDetailsService;
102102
}
103103

104104
/**

‎src/main/java/org/woehlke/simpleworklist/domain/user/access/SimpleworklistUserAccountSecurityService.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
import org.springframework.security.core.userdetails.UserDetailsService;
44

5-
public interface SimpleworklistUserAccountSecurityService extends UserDetailsService {
5+
public interface ApplicationUserDetailsService extends UserDetailsService {
66
}

‎src/main/java/org/woehlke/simpleworklist/domain/user/access/SimpleworklistUserAccountSecurityServiceImpl.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsServiceImpl.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@
77
import org.springframework.stereotype.Service;
88
import org.springframework.transaction.annotation.Propagation;
99
import org.springframework.transaction.annotation.Transactional;
10-
import org.woehlke.simpleworklist.domain.user.access.SimpleworklistUserAccountSecurityService;
1110
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
1211
import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
13-
import org.woehlke.simpleworklist.domain.user.account.UserDetailsBean;
1412

1513
@Slf4j
1614
@Service
1715
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
18-
public class SimpleworklistUserAccountSecurityServiceImpl implements SimpleworklistUserAccountSecurityService {
16+
public class ApplicationUserDetailsServiceImpl implements ApplicationUserDetailsService {
1917

2018
private final UserAccountRepository userAccountRepository;
2119

2220
@Autowired
23-
public SimpleworklistUserAccountSecurityServiceImpl(UserAccountRepository userAccountRepository) {
21+
public ApplicationUserDetailsServiceImpl(UserAccountRepository userAccountRepository) {
2422
this.userAccountRepository = userAccountRepository;
2523
}
2624

@@ -29,6 +27,6 @@ public UserDetails loadUserByUsername(String username)
2927
throws UsernameNotFoundException {
3028
UserAccount account = userAccountRepository.findByUserEmail(username);
3129
if (account == null) throw new UsernameNotFoundException(username);
32-
return new UserDetailsBean(account);
30+
return new UserDetailsDto(account);
3331
}
3432
}

‎src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAccountAccessService.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
55
import org.woehlke.simpleworklist.domain.user.login.LoginForm;
66

7-
public interface UserAccountAccessService {
7+
public interface UserAuthorizationService {
88

99
void changeUsersPassword(UserChangePasswordForm userAccountFormBean, UserAccount user);
1010

‎src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAccountAccessServiceImpl.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
@Slf4j
1919
@Service
2020
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
21-
public class UserAccountAccessServiceImpl implements UserAccountAccessService {
21+
public class UserAuthorizationServiceImpl implements UserAuthorizationService {
2222

2323
private final UserAccountRepository userAccountRepository;
2424
private final AuthenticationManager authenticationManager;
2525
private final PasswordEncoder encoder;
2626

2727
@Autowired
28-
public UserAccountAccessServiceImpl(
28+
public UserAuthorizationServiceImpl(
2929
UserAccountRepository userAccountRepository,
3030
AuthenticationManager authenticationManager
3131
) {

‎src/main/java/org/woehlke/simpleworklist/domain/user/account/UserDetailsBean.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/user/access/UserDetailsDto.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.domain.user.account;
1+
package org.woehlke.simpleworklist.domain.user.access;
22

33
import java.util.ArrayList;
44
import java.util.Collection;
@@ -8,12 +8,13 @@
88
import org.springframework.security.core.GrantedAuthority;
99
import org.springframework.security.core.authority.SimpleGrantedAuthority;
1010
import org.springframework.security.core.userdetails.UserDetails;
11+
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
1112

1213

1314
@Getter
1415
@EqualsAndHashCode
1516
@ToString(exclude = {"password"})
16-
public class UserDetailsBean implements UserDetails {
17+
public class UserDetailsDto implements UserDetails {
1718

1819
private static final long serialVersionUID = 1L;
1920

@@ -24,7 +25,7 @@ public class UserDetailsBean implements UserDetails {
2425
private final boolean credentialsNonExpired;
2526
private final boolean enabled;
2627

27-
public UserDetailsBean(UserAccount account) {
28+
public UserDetailsDto(UserAccount account) {
2829
this.username = account.getUserEmail();
2930
this.password = account.getUserPassword();
3031
/*

‎src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordServiceImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
import org.springframework.transaction.annotation.Propagation;
1313
import org.springframework.transaction.annotation.Transactional;
1414
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
15-
import org.woehlke.simpleworklist.domain.user.account.UserDetailsBean;
15+
import org.woehlke.simpleworklist.domain.user.access.UserDetailsDto;
1616
import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
17-
import org.woehlke.simpleworklist.domain.user.accountpassword.UserAccountSecurityPasswordService;
1817

1918
@Slf4j
2019
@Service
@@ -42,7 +41,7 @@ public UserDetails updatePassword(UserDetails user, String newPassword) {
4241
String pwEncoded = encoder.encode(newPassword);
4342
ua.setUserPassword(pwEncoded);
4443
userAccountRepository.saveAndFlush(ua);
45-
return new UserDetailsBean(ua);
44+
return new UserDetailsDto(ua);
4645
} else {
4746
return user;
4847
}

‎src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.woehlke.simpleworklist.domain.context.Context;
2323
import org.woehlke.simpleworklist.domain.language.Language;
2424
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
25-
import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
25+
import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService;
2626
import org.woehlke.simpleworklist.application.session.UserSessionBean;
2727

2828
import javax.validation.Valid;
@@ -38,11 +38,11 @@
3838
@RequestMapping(path = "/user/selfservice")
3939
public class UserSelfserviceController extends AbstractController {
4040

41-
private final UserAccountAccessService userAccountAccessService;
41+
private final UserAuthorizationService userAuthorizationService;
4242

4343
@Autowired
44-
public UserSelfserviceController(UserAccountAccessService userAccountAccessService) {
45-
this.userAccountAccessService = userAccountAccessService;
44+
public UserSelfserviceController(UserAuthorizationService userAuthorizationService) {
45+
this.userAuthorizationService = userAuthorizationService;
4646
}
4747

4848
@RequestMapping(path = "/profile", method = RequestMethod.GET)
@@ -171,7 +171,7 @@ public String userPasswordStore(
171171
model.addAttribute("userSession", userSession);
172172
return "user/selfservice/password";
173173
}
174-
if(!userAccountAccessService.confirmUserByLoginAndPassword(
174+
if(!userAuthorizationService.confirmUserByLoginAndPassword(
175175
user.getUserEmail(), userChangePasswordForm.getOldUserPassword())
176176
){
177177
log.info("old Password is wrong");
@@ -187,7 +187,7 @@ public String userPasswordStore(
187187
return "user/selfservice/password";
188188
}
189189
log.info("OK");
190-
userAccountAccessService.changeUsersPassword(userChangePasswordForm,user);
190+
userAuthorizationService.changeUsersPassword(userChangePasswordForm,user);
191191
model.addAttribute("userSession", userSession);
192192
return "redirect:/user/selfservice/profile";
193193
}

‎src/main/java/org/woehlke/simpleworklist/domain/user/login/UserLoginController.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.springframework.web.bind.annotation.RequestMapping;
1717
import org.springframework.web.bind.annotation.RequestMethod;
1818
import org.springframework.web.bind.support.SessionStatus;
19-
import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
19+
import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService;
2020
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
2121

2222
@Slf4j
@@ -25,15 +25,15 @@
2525
public class UserLoginController {
2626

2727
private final UserAccountLoginSuccessService userAccountLoginSuccessService;
28-
private final UserAccountAccessService userAccountAccessService;
28+
private final UserAuthorizationService userAuthorizationService;
2929

3030
@Autowired
3131
public UserLoginController(
3232
UserAccountLoginSuccessService userAccountLoginSuccessService,
33-
UserAccountAccessService userAccountAccessService
33+
UserAuthorizationService userAuthorizationService
3434
) {
3535
this.userAccountLoginSuccessService = userAccountLoginSuccessService;
36-
this.userAccountAccessService = userAccountAccessService;
36+
this.userAuthorizationService = userAuthorizationService;
3737
}
3838

3939
/**
@@ -66,7 +66,7 @@ public final String loginPost(
6666
Model model
6767
) {
6868
log.info("loginPerform");
69-
boolean authorized = userAccountAccessService.authorize(loginForm);
69+
boolean authorized = userAuthorizationService.authorize(loginForm);
7070
if (!result.hasErrors() && authorized) {
7171
UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser();
7272
userAccountLoginSuccessService.updateLastLoginTimestamp(user);

‎src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import org.woehlke.simpleworklist.config.SimpleworklistProperties;
1212
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
1313
import org.woehlke.simpleworklist.domain.user.account.UserAccountService;
14-
import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
15-
import org.woehlke.simpleworklist.domain.user.access.SimpleworklistUserAccountSecurityService;
14+
import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService;
15+
import org.woehlke.simpleworklist.domain.user.access.ApplicationUserDetailsService;
1616
import org.woehlke.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
1717

1818

@@ -80,7 +80,7 @@ public void clearContext() {
8080
}
8181

8282
protected void makeActiveUser(String username) {
83-
UserDetails ud = simpleworklistUserAccountSecurityService.loadUserByUsername(username);
83+
UserDetails ud = applicationUserDetailsService.loadUserByUsername(username);
8484
Authentication authRequest = new UsernamePasswordAuthenticationToken(ud.getUsername(), ud.getPassword());
8585
SecurityContextHolder.getContext().setAuthentication(authRequest);
8686
}
@@ -99,10 +99,10 @@ protected void deleteAll(){
9999
protected UserAccountService userAccountService;
100100

101101
@Autowired
102-
protected SimpleworklistUserAccountSecurityService simpleworklistUserAccountSecurityService;
102+
protected ApplicationUserDetailsService applicationUserDetailsService;
103103

104104
@Autowired
105-
protected UserAccountAccessService userAccountAccessService;
105+
protected UserAuthorizationService userAuthorizationService;
106106

107107
@Autowired
108108
protected UserAccountLoginSuccessService userAccountLoginSuccessService;

‎src/test/java/org/woehlke/simpleworklist/user/UserDetailsBeanTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import org.springframework.security.core.GrantedAuthority;
66
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
7-
import org.woehlke.simpleworklist.domain.user.account.UserDetailsBean;
7+
import org.woehlke.simpleworklist.domain.user.access.UserDetailsDto;
88

99
import java.util.Collection;
1010

@@ -16,7 +16,7 @@ public class UserDetailsBeanTest {
1616
//@Test
1717
public void testGetAuthorities(){
1818
UserAccount account = new UserAccount();
19-
UserDetailsBean b = new UserDetailsBean(account);
19+
UserDetailsDto b = new UserDetailsDto(account);
2020
Collection<? extends GrantedAuthority> c = b.getAuthorities();
2121
assertTrue(c.size()==1);
2222
for(GrantedAuthority authority:c){
@@ -27,7 +27,7 @@ public void testGetAuthorities(){
2727
//@Test
2828
public void testDefaultBooleans(){
2929
UserAccount account = new UserAccount();
30-
UserDetailsBean b = new UserDetailsBean(account);
30+
UserDetailsDto b = new UserDetailsDto(account);
3131
assertTrue(b.isAccountNonExpired());
3232
assertTrue(b.isAccountNonLocked());
3333
assertTrue(b.isCredentialsNonExpired());
@@ -73,15 +73,15 @@ public void testHashCodeAndEquals(){
7373
account9.setUserEmail("test04//@Test.de");
7474
account9.setUserPassword(null);
7575

76-
UserDetailsBean b1 = new UserDetailsBean(account1);
77-
UserDetailsBean b2 = new UserDetailsBean(account2);
78-
UserDetailsBean b3 = new UserDetailsBean(account3);
79-
UserDetailsBean b4 = new UserDetailsBean(account4);
80-
UserDetailsBean b5 = new UserDetailsBean(account5);
81-
UserDetailsBean b6 = new UserDetailsBean(account6);
82-
UserDetailsBean b7 = new UserDetailsBean(account7);
83-
UserDetailsBean b8 = new UserDetailsBean(account8);
84-
UserDetailsBean b9 = new UserDetailsBean(account9);
76+
UserDetailsDto b1 = new UserDetailsDto(account1);
77+
UserDetailsDto b2 = new UserDetailsDto(account2);
78+
UserDetailsDto b3 = new UserDetailsDto(account3);
79+
UserDetailsDto b4 = new UserDetailsDto(account4);
80+
UserDetailsDto b5 = new UserDetailsDto(account5);
81+
UserDetailsDto b6 = new UserDetailsDto(account6);
82+
UserDetailsDto b7 = new UserDetailsDto(account7);
83+
UserDetailsDto b8 = new UserDetailsDto(account8);
84+
UserDetailsDto b9 = new UserDetailsDto(account9);
8585

8686
assertEquals(b1.hashCode(),b2.hashCode());
8787
assertTrue(b1.hashCode()!=b3.hashCode());

‎src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountServiceImplTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ public void testSaveAndFlush(){
105105
//@Test
106106
public void testLoadUserByUsername(){
107107
for(String email:emails){
108-
UserDetails userDetails = simpleworklistUserAccountSecurityService.loadUserByUsername(email);
108+
UserDetails userDetails = applicationUserDetailsService.loadUserByUsername(email);
109109
assertTrue(userDetails.getUsername().compareTo(email) == 0);
110110
}
111111
try {
112-
UserDetails userDetails = simpleworklistUserAccountSecurityService.loadUserByUsername(username_email);
112+
UserDetails userDetails = applicationUserDetailsService.loadUserByUsername(username_email);
113113
} catch (UsernameNotFoundException e){
114114
assertNotNull(e.getMessage());
115115
assertTrue(username_email.compareTo(e.getMessage())==0);
@@ -121,11 +121,11 @@ public void testAuthorize(){
121121
LoginForm loginForm = new LoginForm();
122122
loginForm.setUserEmail(emails[0]);
123123
loginForm.setUserPassword(passwords[0]);
124-
assertTrue(userAccountAccessService.authorize(loginForm));
124+
assertTrue(userAuthorizationService.authorize(loginForm));
125125
loginForm = new LoginForm();
126126
loginForm.setUserEmail(username_email);
127127
loginForm.setUserPassword(password);
128-
assertFalse(userAccountAccessService.authorize(loginForm));
128+
assertFalse(userAuthorizationService.authorize(loginForm));
129129
}
130130

131131
//@Test

0 commit comments

Comments
 (0)