refactoring of java classes

thomaswoehlke · thomaswoehlke · commit c5f44758463c · 2022-07-29T20:05:21.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
@@ -15,13 +15,13 @@
 import org.woehlke.simpleworklist.domain.task.TaskTime;
 import org.woehlke.simpleworklist.domain.context.ContextService;
 import org.woehlke.simpleworklist.domain.project.ProjectService;
-import org.woehlke.simpleworklist.domain.user.chat.ChatMessageService;
+import org.woehlke.simpleworklist.domain.chat.ChatMessageService;
 import org.woehlke.simpleworklist.domain.user.account.UserAccountService;
 import org.woehlke.simpleworklist.application.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.application.login.access.UserAccountAccessService;
-import org.woehlke.simpleworklist.application.login.login.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.application.security.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.application.security.login.UserAccountLoginSuccessService;
 
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/access/UserAccountAccessService.java b/src/main/java/org/woehlke/simpleworklist/application/security/access/UserAccountAccessService.java
@@ -1,8 +1,8 @@
-package org.woehlke.simpleworklist.application.login.access;
+package org.woehlke.simpleworklist.application.security.access;
 
 import org.woehlke.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.simpleworklist.application.login.login.LoginForm;
+import org.woehlke.simpleworklist.application.security.login.LoginForm;
 
 public interface UserAccountAccessService {
 
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/access/UserAccountAccessServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/security/access/UserAccountAccessServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login.access;
+package org.woehlke.simpleworklist.application.security.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.login.login.LoginForm;
+import org.woehlke.simpleworklist.application.security.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;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/account/SimpleworklistUserAccountSecurityService.java b/src/main/java/org/woehlke/simpleworklist/application/security/account/SimpleworklistUserAccountSecurityService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login.account;
+package org.woehlke.simpleworklist.application.security.account;
 
 import org.springframework.security.core.userdetails.UserDetailsService;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/account/SimpleworklistUserAccountSecurityServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/security/account/SimpleworklistUserAccountSecurityServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login.account;
+package org.woehlke.simpleworklist.application.security.account;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,7 +7,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.application.login.account.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;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/login/LoginForm.java b/src/main/java/org/woehlke/simpleworklist/application/security/login/LoginForm.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login.login;
+package org.woehlke.simpleworklist.application.security.login;
 
 import javax.validation.constraints.NotNull;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/login/LoginSuccessHandler.java b/src/main/java/org/woehlke/simpleworklist/application/security/login/LoginSuccessHandler.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login.login;
+package org.woehlke.simpleworklist.application.security.login;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/login/UserAccountLoginSuccessService.java b/src/main/java/org/woehlke/simpleworklist/application/security/login/UserAccountLoginSuccessService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login.login;
+package org.woehlke.simpleworklist.application.security.login;
 
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/login/UserAccountLoginSuccessServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/security/login/UserAccountLoginSuccessServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login.login;
+package org.woehlke.simpleworklist.application.security.login;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,7 +9,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.application.login.login.UserAccountLoginSuccessService;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/login/UserLoginController.java b/src/main/java/org/woehlke/simpleworklist/application/security/login/UserLoginController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login.login;
+package org.woehlke.simpleworklist.application.security.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.login.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.application.security.access.UserAccountAccessService;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 
 @Slf4j
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/token/TokenGeneratorService.java b/src/main/java/org/woehlke/simpleworklist/application/security/token/TokenGeneratorService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login.token;
+package org.woehlke.simpleworklist.application.security.token;
 
 public interface TokenGeneratorService {
 
diff --git a/src/main/java/org/woehlke/simpleworklist/application/security/token/TokenGeneratorServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/security/token/TokenGeneratorServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login.token;
+package org.woehlke.simpleworklist.application.security.token;
 
 import org.springframework.stereotype.Service;
 
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.application.login.account.SimpleworklistUserAccountSecurityService;
+import org.woehlke.simpleworklist.application.security.account.SimpleworklistUserAccountSecurityService;
 
 
 @Configuration
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessage.java b/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessage.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.chat;
+package org.woehlke.simpleworklist.domain.chat;
 
 import lombok.*;
 import org.hibernate.validator.constraints.Length;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageController.java b/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.chat;
+package org.woehlke.simpleworklist.domain.chat;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageForm.java b/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageForm.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.chat;
+package org.woehlke.simpleworklist.domain.chat;
 
 
 import lombok.*;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageRepository.java b/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageRepository.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.chat;
+package org.woehlke.simpleworklist.domain.chat;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageService.java b/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageService.java
@@ -1,10 +1,8 @@
-package org.woehlke.simpleworklist.domain.user.chat;
+package org.woehlke.simpleworklist.domain.chat;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.simpleworklist.domain.user.chat.ChatMessage;
-import org.woehlke.simpleworklist.domain.user.chat.ChatMessageForm;
 
 /**
  * Created by tw on 16.02.2016.
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.chat;
+package org.woehlke.simpleworklist.domain.chat;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -9,10 +9,6 @@
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.domain.user.chat.ChatMessage;
-import org.woehlke.simpleworklist.domain.user.chat.ChatMessageForm;
-import org.woehlke.simpleworklist.domain.user.chat.ChatMessageRepository;
-import org.woehlke.simpleworklist.domain.user.chat.ChatMessageService;
 
 import java.util.List;
 import java.util.UUID;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataController.java b/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.login.login.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.application.security.login.UserAccountLoginSuccessService;
 
 @Slf4j
 @Controller
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/domain/user/account/UserAccountServiceImpl.java
@@ -14,13 +14,9 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.domain.context.Context;
-import org.woehlke.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.simpleworklist.domain.user.account.UserAccountForm;
-import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
-import org.woehlke.simpleworklist.domain.user.account.UserAccountService;
-import org.woehlke.simpleworklist.domain.user.chat.ChatMessage;
+import org.woehlke.simpleworklist.domain.chat.ChatMessage;
 import org.woehlke.simpleworklist.domain.context.ContextRepository;
-import org.woehlke.simpleworklist.domain.user.chat.ChatMessageRepository;
+import org.woehlke.simpleworklist.domain.chat.ChatMessageRepository;
 
 @Slf4j
 @Service("userAccountService")
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.application.login.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.application.security.access.UserAccountAccessService;
 import org.woehlke.simpleworklist.application.session.UserSessionBean;
 
 import javax.validation.Valid;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryServiceImpl.java b/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.login.token.TokenGeneratorService;
+import org.woehlke.simpleworklist.application.security.token.TokenGeneratorService;
 
 import java.util.Date;
 import java.util.UUID;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationServiceImpl.java b/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.login.token.TokenGeneratorService;
+import org.woehlke.simpleworklist.application.security.token.TokenGeneratorService;
 
 @Slf4j
 @Service
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,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.login.access.UserAccountAccessService;
-import org.woehlke.simpleworklist.application.login.account.SimpleworklistUserAccountSecurityService;
-import org.woehlke.simpleworklist.application.login.login.UserAccountLoginSuccessService;
+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 java.net.URL;
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
@@ -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.login.login.LoginForm;
+import org.woehlke.simpleworklist.application.security.login.LoginForm;
 
 import static org.junit.jupiter.api.Assertions.*;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.woehlke.simpleworklist.application.login.account;`
	`1`	`+package org.woehlke.simpleworklist.application.security.account;`
`2`	`2`
`3`	`3`	`import org.springframework.security.core.userdetails.UserDetailsService;`
`4`	`4`