refactoring of java classes

thomaswoehlke · thomaswoehlke · commit b5a57671e156 · 2022-07-29T20:24:19.000+02:00
diff --git a/src/main/java/org/woehlke/simpleworklist/application/framework/AbstractController.java b/src/main/java/org/woehlke/simpleworklist/application/framework/AbstractController.java
@@ -20,7 +20,7 @@
 import org.woehlke.simpleworklist.application.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService;
 import org.woehlke.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
 
 import javax.validation.constraints.NotNull;
@@ -49,7 +49,7 @@ public abstract class AbstractController {
     protected UserAccountService userAccountService;
 
     @Autowired
-    protected UserAccountAccessService userAccountAccessService;
+    protected UserAuthorizationService userAuthorizationService;
 
     @Autowired
     protected ChatMessageService chatMessageService;
diff --git a/src/main/java/org/woehlke/simpleworklist/config/WebSecurityConfig.java b/src/main/java/org/woehlke/simpleworklist/config/WebSecurityConfig.java
@@ -20,7 +20,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.woehlke.simpleworklist.domain.user.access.SimpleworklistUserAccountSecurityService;
+import org.woehlke.simpleworklist.domain.user.access.ApplicationUserDetailsService;
 
 
 @Configuration
@@ -39,18 +39,18 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter implements W
 
     private final AuthenticationManagerBuilder authenticationManagerBuilder;
     //private final AuthenticationSuccessHandler loginSuccessHandler;
-    private final SimpleworklistUserAccountSecurityService simpleworklistUserAccountSecurityService;
+    private final ApplicationUserDetailsService applicationUserDetailsService;
     private final SimpleworklistProperties simpleworklistProperties;
 
     @Autowired
     public WebSecurityConfig(
         AuthenticationManagerBuilder auth,
         //LoginSuccessHandler loginSuccessHandler,
-        SimpleworklistUserAccountSecurityService simpleworklistUserAccountSecurityService,
+        ApplicationUserDetailsService applicationUserDetailsService,
         SimpleworklistProperties simpleworklistProperties) {
         this.authenticationManagerBuilder = auth;
         //this.loginSuccessHandler = loginSuccessHandler;
-        this.simpleworklistUserAccountSecurityService = simpleworklistUserAccountSecurityService;
+        this.applicationUserDetailsService = applicationUserDetailsService;
         this.simpleworklistProperties = simpleworklistProperties;
     }
 
@@ -98,7 +98,7 @@ protected void configure(HttpSecurity http) throws Exception {
 
     @Bean
     public UserDetailsService userDetailsService(){
-        return this.simpleworklistUserAccountSecurityService;
+        return this.applicationUserDetailsService;
     }
 
     /**
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsService.java b/src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsService.java
@@ -2,5 +2,5 @@
 
 import org.springframework.security.core.userdetails.UserDetailsService;
 
-public interface SimpleworklistUserAccountSecurityService extends UserDetailsService {
+public interface ApplicationUserDetailsService extends UserDetailsService {
 }
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/domain/user/access/ApplicationUserDetailsServiceImpl.java
@@ -7,20 +7,18 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.domain.user.access.SimpleworklistUserAccountSecurityService;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
-import org.woehlke.simpleworklist.domain.user.account.UserDetailsBean;
 
 @Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
-public class SimpleworklistUserAccountSecurityServiceImpl implements SimpleworklistUserAccountSecurityService {
+public class ApplicationUserDetailsServiceImpl implements ApplicationUserDetailsService {
 
     private final UserAccountRepository userAccountRepository;
 
     @Autowired
-    public SimpleworklistUserAccountSecurityServiceImpl(UserAccountRepository userAccountRepository) {
+    public ApplicationUserDetailsServiceImpl(UserAccountRepository userAccountRepository) {
         this.userAccountRepository = userAccountRepository;
     }
 
@@ -29,6 +27,6 @@ public UserDetails loadUserByUsername(String username)
             throws UsernameNotFoundException {
         UserAccount account = userAccountRepository.findByUserEmail(username);
         if (account == null) throw new UsernameNotFoundException(username);
-        return new UserDetailsBean(account);
+        return new UserDetailsDto(account);
     }
 }
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationService.java b/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationService.java
@@ -4,7 +4,7 @@
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.user.login.LoginForm;
 
-public interface UserAccountAccessService {
+public interface UserAuthorizationService {
 
     void changeUsersPassword(UserChangePasswordForm userAccountFormBean, UserAccount user);
 
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java
@@ -18,14 +18,14 @@
 @Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
-public class UserAccountAccessServiceImpl implements UserAccountAccessService {
+public class UserAuthorizationServiceImpl implements UserAuthorizationService {
 
     private final UserAccountRepository userAccountRepository;
     private final AuthenticationManager authenticationManager;
     private final PasswordEncoder encoder;
 
     @Autowired
-    public UserAccountAccessServiceImpl(
+    public UserAuthorizationServiceImpl(
         UserAccountRepository userAccountRepository,
         AuthenticationManager authenticationManager
     ) {
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserDetailsDto.java b/src/main/java/org/woehlke/simpleworklist/domain/user/access/UserDetailsDto.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.account;
+package org.woehlke.simpleworklist.domain.user.access;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -8,12 +8,13 @@
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 
 
 @Getter
 @EqualsAndHashCode
 @ToString(exclude = {"password"})
-public class UserDetailsBean implements UserDetails {
+public class UserDetailsDto implements UserDetails {
 
     private static final long serialVersionUID = 1L;
 
@@ -24,7 +25,7 @@ public class UserDetailsBean implements UserDetails {
     private final boolean credentialsNonExpired;
     private final boolean enabled;
 
-    public UserDetailsBean(UserAccount account) {
+    public UserDetailsDto(UserAccount account) {
         this.username = account.getUserEmail();
         this.password = account.getUserPassword();
         /*
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/domain/user/accountpassword/UserAccountSecurityPasswordServiceImpl.java
@@ -12,9 +12,8 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.simpleworklist.domain.user.account.UserDetailsBean;
+import org.woehlke.simpleworklist.domain.user.access.UserDetailsDto;
 import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
-import org.woehlke.simpleworklist.domain.user.accountpassword.UserAccountSecurityPasswordService;
 
 @Slf4j
 @Service
@@ -42,7 +41,7 @@ public UserDetails updatePassword(UserDetails user, String newPassword) {
             String pwEncoded = encoder.encode(newPassword);
             ua.setUserPassword(pwEncoded);
             userAccountRepository.saveAndFlush(ua);
-            return new UserDetailsBean(ua);
+            return new UserDetailsDto(ua);
         } else {
             return user;
         }
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java
@@ -22,7 +22,7 @@
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.language.Language;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService;
 import org.woehlke.simpleworklist.application.session.UserSessionBean;
 
 import javax.validation.Valid;
@@ -38,11 +38,11 @@
 @RequestMapping(path = "/user/selfservice")
 public class UserSelfserviceController extends AbstractController {
 
-    private final UserAccountAccessService userAccountAccessService;
+    private final UserAuthorizationService userAuthorizationService;
 
     @Autowired
-    public UserSelfserviceController(UserAccountAccessService userAccountAccessService) {
-        this.userAccountAccessService = userAccountAccessService;
+    public UserSelfserviceController(UserAuthorizationService userAuthorizationService) {
+        this.userAuthorizationService = userAuthorizationService;
     }
 
     @RequestMapping(path = "/profile", method = RequestMethod.GET)
@@ -171,7 +171,7 @@ public String userPasswordStore(
                 model.addAttribute("userSession", userSession);
                 return "user/selfservice/password";
             }
-            if(!userAccountAccessService.confirmUserByLoginAndPassword(
+            if(!userAuthorizationService.confirmUserByLoginAndPassword(
                 user.getUserEmail(), userChangePasswordForm.getOldUserPassword())
             ){
                 log.info("old Password is wrong");
@@ -187,7 +187,7 @@ public String userPasswordStore(
                 return "user/selfservice/password";
             }
             log.info("OK");
-            userAccountAccessService.changeUsersPassword(userChangePasswordForm,user);
+            userAuthorizationService.changeUsersPassword(userChangePasswordForm,user);
             model.addAttribute("userSession", userSession);
             return "redirect:/user/selfservice/profile";
         }
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/login/UserLoginController.java b/src/main/java/org/woehlke/simpleworklist/domain/user/login/UserLoginController.java
@@ -16,7 +16,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.support.SessionStatus;
-import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 
 @Slf4j
@@ -25,15 +25,15 @@
 public class UserLoginController {
 
     private final UserAccountLoginSuccessService userAccountLoginSuccessService;
-    private final UserAccountAccessService userAccountAccessService;
+    private final UserAuthorizationService userAuthorizationService;
 
     @Autowired
     public UserLoginController(
         UserAccountLoginSuccessService userAccountLoginSuccessService,
-        UserAccountAccessService userAccountAccessService
+        UserAuthorizationService userAuthorizationService
     ) {
         this.userAccountLoginSuccessService = userAccountLoginSuccessService;
-        this.userAccountAccessService = userAccountAccessService;
+        this.userAuthorizationService = userAuthorizationService;
     }
 
     /**
@@ -66,7 +66,7 @@ public final String loginPost(
         Model model
     ) {
         log.info("loginPerform");
-        boolean authorized = userAccountAccessService.authorize(loginForm);
+        boolean authorized = userAuthorizationService.authorize(loginForm);
         if (!result.hasErrors() && authorized) {
             UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser();
             userAccountLoginSuccessService.updateLastLoginTimestamp(user);
diff --git a/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java b/src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java
@@ -11,8 +11,8 @@
 import org.woehlke.simpleworklist.config.SimpleworklistProperties;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.user.account.UserAccountService;
-import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
-import org.woehlke.simpleworklist.domain.user.access.SimpleworklistUserAccountSecurityService;
+import org.woehlke.simpleworklist.domain.user.access.UserAuthorizationService;
+import org.woehlke.simpleworklist.domain.user.access.ApplicationUserDetailsService;
 import org.woehlke.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
 
 
@@ -80,7 +80,7 @@ public void clearContext() {
     }
 
     protected void makeActiveUser(String username) {
-        UserDetails ud = simpleworklistUserAccountSecurityService.loadUserByUsername(username);
+        UserDetails ud = applicationUserDetailsService.loadUserByUsername(username);
         Authentication authRequest = new UsernamePasswordAuthenticationToken(ud.getUsername(), ud.getPassword());
         SecurityContextHolder.getContext().setAuthentication(authRequest);
     }
@@ -99,10 +99,10 @@ protected void deleteAll(){
     protected UserAccountService userAccountService;
 
     @Autowired
-    protected SimpleworklistUserAccountSecurityService simpleworklistUserAccountSecurityService;
+    protected ApplicationUserDetailsService applicationUserDetailsService;
 
     @Autowired
-    protected UserAccountAccessService userAccountAccessService;
+    protected UserAuthorizationService userAuthorizationService;
 
     @Autowired
     protected UserAccountLoginSuccessService userAccountLoginSuccessService;
diff --git a/src/test/java/org/woehlke/simpleworklist/user/UserDetailsBeanTest.java b/src/test/java/org/woehlke/simpleworklist/user/UserDetailsBeanTest.java
@@ -4,7 +4,7 @@
 
 import org.springframework.security.core.GrantedAuthority;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.simpleworklist.domain.user.account.UserDetailsBean;
+import org.woehlke.simpleworklist.domain.user.access.UserDetailsDto;
 
 import java.util.Collection;
 
@@ -16,7 +16,7 @@ public class UserDetailsBeanTest {
     //@Test
     public void testGetAuthorities(){
         UserAccount account = new UserAccount();
-        UserDetailsBean b = new UserDetailsBean(account);
+        UserDetailsDto b = new UserDetailsDto(account);
         Collection<? extends GrantedAuthority> c = b.getAuthorities();
         assertTrue(c.size()==1);
         for(GrantedAuthority authority:c){
@@ -27,7 +27,7 @@ public void testGetAuthorities(){
     //@Test
     public void testDefaultBooleans(){
         UserAccount account = new UserAccount();
-        UserDetailsBean b = new UserDetailsBean(account);
+        UserDetailsDto b = new UserDetailsDto(account);
         assertTrue(b.isAccountNonExpired());
         assertTrue(b.isAccountNonLocked());
         assertTrue(b.isCredentialsNonExpired());
@@ -73,15 +73,15 @@ public void testHashCodeAndEquals(){
         account9.setUserEmail("test04//@Test.de");
         account9.setUserPassword(null);
 
-        UserDetailsBean b1 = new UserDetailsBean(account1);
-        UserDetailsBean b2 = new UserDetailsBean(account2);
-        UserDetailsBean b3 = new UserDetailsBean(account3);
-        UserDetailsBean b4 = new UserDetailsBean(account4);
-        UserDetailsBean b5 = new UserDetailsBean(account5);
-        UserDetailsBean b6 = new UserDetailsBean(account6);
-        UserDetailsBean b7 = new UserDetailsBean(account7);
-        UserDetailsBean b8 = new UserDetailsBean(account8);
-        UserDetailsBean b9 = new UserDetailsBean(account9);
+        UserDetailsDto b1 = new UserDetailsDto(account1);
+        UserDetailsDto b2 = new UserDetailsDto(account2);
+        UserDetailsDto b3 = new UserDetailsDto(account3);
+        UserDetailsDto b4 = new UserDetailsDto(account4);
+        UserDetailsDto b5 = new UserDetailsDto(account5);
+        UserDetailsDto b6 = new UserDetailsDto(account6);
+        UserDetailsDto b7 = new UserDetailsDto(account7);
+        UserDetailsDto b8 = new UserDetailsDto(account8);
+        UserDetailsDto b9 = new UserDetailsDto(account9);
 
         assertEquals(b1.hashCode(),b2.hashCode());
         assertTrue(b1.hashCode()!=b3.hashCode());
diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountServiceImplTest.java b/src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountServiceImplTest.java
@@ -105,11 +105,11 @@ public void testSaveAndFlush(){
     //@Test
     public void testLoadUserByUsername(){
         for(String email:emails){
-            UserDetails userDetails = simpleworklistUserAccountSecurityService.loadUserByUsername(email);
+            UserDetails userDetails = applicationUserDetailsService.loadUserByUsername(email);
             assertTrue(userDetails.getUsername().compareTo(email) == 0);
         }
         try {
-            UserDetails userDetails = simpleworklistUserAccountSecurityService.loadUserByUsername(username_email);
+            UserDetails userDetails = applicationUserDetailsService.loadUserByUsername(username_email);
         } catch (UsernameNotFoundException e){
             assertNotNull(e.getMessage());
             assertTrue(username_email.compareTo(e.getMessage())==0);
@@ -121,11 +121,11 @@ public void testAuthorize(){
         LoginForm loginForm = new LoginForm();
         loginForm.setUserEmail(emails[0]);
         loginForm.setUserPassword(passwords[0]);
-        assertTrue(userAccountAccessService.authorize(loginForm));
+        assertTrue(userAuthorizationService.authorize(loginForm));
         loginForm = new LoginForm();
         loginForm.setUserEmail(username_email);
         loginForm.setUserPassword(password);
-        assertFalse(userAccountAccessService.authorize(loginForm));
+        assertFalse(userAuthorizationService.authorize(loginForm));
     }
 
     //@Test

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`import org.springframework.security.core.userdetails.UserDetailsService;`
`4`	`4`
`5`		`-public interface SimpleworklistUserAccountSecurityService extends UserDetailsService {`
	`5`	`+public interface ApplicationUserDetailsService extends UserDetailsService {`
`6`	`6`	`}`