refactoring of java classes

Author: thomaswoehlke

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

@@ -20,8 +20,8 @@
 import org.woehlke.simpleworklist.application.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.application.security.access.UserAccountAccessService;
-import org.woehlke.simpleworklist.application.security.login.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
 
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;

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.application.security.account.SimpleworklistUserAccountSecurityService;
+import org.woehlke.simpleworklist.domain.user.access.SimpleworklistUserAccountSecurityService;
 
 
 @Configuration

src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataController.java

@@ -7,7 +7,7 @@
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.application.security.login.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
 
 @Slf4j
 @Controller

src/main/java/org/woehlke/simpleworklist/application/security/account/SimpleworklistUserAccountSecurityService.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/access/SimpleworklistUserAccountSecurityService.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.security.account;
+package org.woehlke.simpleworklist.domain.user.access;
 
 import org.springframework.security.core.userdetails.UserDetailsService;
 

src/main/java/org/woehlke/simpleworklist/application/security/account/SimpleworklistUserAccountSecurityServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/access/SimpleworklistUserAccountSecurityServiceImpl.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.security.account;
+package org.woehlke.simpleworklist.domain.user.access;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,6 +7,7 @@
 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;

src/main/java/org/woehlke/simpleworklist/application/security/access/UserAccountAccessService.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAccountAccessService.java

@@ -1,8 +1,8 @@
-package org.woehlke.simpleworklist.application.security.access;
+package org.woehlke.simpleworklist.domain.user.access;
 
 import org.woehlke.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.simpleworklist.application.security.login.LoginForm;
+import org.woehlke.simpleworklist.domain.user.login.LoginForm;
 
 public interface UserAccountAccessService {
 

src/main/java/org/woehlke/simpleworklist/application/security/access/UserAccountAccessServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/access/UserAccountAccessServiceImpl.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.security.access;
+package org.woehlke.simpleworklist.domain.user.access;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +10,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.application.security.login.LoginForm;
+import org.woehlke.simpleworklist.domain.user.login.LoginForm;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
 import org.woehlke.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;

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.application.security.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
 import org.woehlke.simpleworklist.application.session.UserSessionBean;
 
 import javax.validation.Valid;

src/main/java/org/woehlke/simpleworklist/application/security/login/LoginForm.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/login/LoginForm.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.security.login;
+package org.woehlke.simpleworklist.domain.user.login;
 
 import javax.validation.constraints.NotNull;
 

src/main/java/org/woehlke/simpleworklist/application/security/login/LoginSuccessHandler.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/login/LoginSuccessHandler.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.security.login;
+package org.woehlke.simpleworklist.domain.user.login;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;

src/main/java/org/woehlke/simpleworklist/application/security/login/UserAccountLoginSuccessService.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/login/UserAccountLoginSuccessService.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.security.login;
+package org.woehlke.simpleworklist.domain.user.login;
 
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;

src/main/java/org/woehlke/simpleworklist/application/security/login/UserAccountLoginSuccessServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/login/UserAccountLoginSuccessServiceImpl.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.security.login;
+package org.woehlke.simpleworklist.domain.user.login;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/org/woehlke/simpleworklist/application/security/login/UserLoginController.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/login/UserLoginController.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.security.login;
+package org.woehlke.simpleworklist.domain.user.login;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -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.application.security.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 
 @Slf4j

src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryServiceImpl.java

@@ -10,7 +10,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.config.SimpleworklistProperties;
-import org.woehlke.simpleworklist.application.security.token.TokenGeneratorService;
+import org.woehlke.simpleworklist.domain.user.token.TokenGeneratorService;
 
 import java.util.Date;
 import java.util.UUID;

src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationServiceImpl.java

@@ -14,7 +14,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.config.SimpleworklistProperties;
-import org.woehlke.simpleworklist.application.security.token.TokenGeneratorService;
+import org.woehlke.simpleworklist.domain.user.token.TokenGeneratorService;
 
 @Slf4j
 @Service

src/main/java/org/woehlke/simpleworklist/application/security/token/TokenGeneratorService.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/token/TokenGeneratorService.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.security.token;
+package org.woehlke.simpleworklist.domain.user.token;
 
 public interface TokenGeneratorService {
 

src/main/java/org/woehlke/simpleworklist/application/security/token/TokenGeneratorServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/domain/user/token/TokenGeneratorServiceImpl.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.security.token;
+package org.woehlke.simpleworklist.domain.user.token;
 
 import org.springframework.stereotype.Service;
 

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

@@ -11,9 +11,9 @@
 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.application.security.access.UserAccountAccessService;
-import org.woehlke.simpleworklist.application.security.account.SimpleworklistUserAccountSecurityService;
-import org.woehlke.simpleworklist.application.security.login.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.domain.user.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.domain.user.access.SimpleworklistUserAccountSecurityService;
+import org.woehlke.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
 
 
 import java.net.URL;

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

@@ -13,7 +13,7 @@
 import org.woehlke.simpleworklist.domain.user.account.UserAccountForm;
 import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
 import org.woehlke.simpleworklist.domain.user.signup.UserRegistrationService;
-import org.woehlke.simpleworklist.application.security.login.LoginForm;
+import org.woehlke.simpleworklist.domain.user.login.LoginForm;
 
 import static org.junit.jupiter.api.Assertions.*;