refactoring of java classes

thomaswoehlke · thomaswoehlke · commit 0d429060eb4e · 2022-07-29T19:57:20.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
@@ -21,7 +21,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.application.login.access.UserAccountAccessService;
-import org.woehlke.simpleworklist.application.login.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.application.login.login.UserAccountLoginSuccessService;
 
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/login/access/UserAccountAccessService.java b/src/main/java/org/woehlke/simpleworklist/application/login/access/UserAccountAccessService.java
@@ -2,7 +2,7 @@
 
 import org.woehlke.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.simpleworklist.application.login.LoginForm;
+import org.woehlke.simpleworklist.application.login.login.LoginForm;
 
 public interface UserAccountAccessService {
 
diff --git a/src/main/java/org/woehlke/simpleworklist/application/login/access/UserAccountAccessServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/login/access/UserAccountAccessServiceImpl.java
@@ -10,8 +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.LoginForm;
-import org.woehlke.simpleworklist.application.login.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.application.login.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/login/login/LoginForm.java b/src/main/java/org/woehlke/simpleworklist/application/login/login/LoginForm.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login;
+package org.woehlke.simpleworklist.application.login.login;
 
 import javax.validation.constraints.NotNull;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/application/login/login/LoginSuccessHandler.java b/src/main/java/org/woehlke/simpleworklist/application/login/login/LoginSuccessHandler.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login;
+package org.woehlke.simpleworklist.application.login.login;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/login/login/UserAccountLoginSuccessService.java b/src/main/java/org/woehlke/simpleworklist/application/login/login/UserAccountLoginSuccessService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login;
+package org.woehlke.simpleworklist.application.login.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/login/login/UserAccountLoginSuccessServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/login/login/UserAccountLoginSuccessServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login;
+package org.woehlke.simpleworklist.application.login.login;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,7 +9,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.application.login.UserAccountLoginSuccessService;
+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/login/login/UserLoginController.java b/src/main/java/org/woehlke/simpleworklist/application/login/login/UserLoginController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.login;
+package org.woehlke.simpleworklist.application.login.login;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/login/token/TokenGeneratorService.java b/src/main/java/org/woehlke/simpleworklist/application/login/token/TokenGeneratorService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.token;
+package org.woehlke.simpleworklist.application.login.token;
 
 public interface TokenGeneratorService {
 
diff --git a/src/main/java/org/woehlke/simpleworklist/application/login/token/TokenGeneratorServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/login/token/TokenGeneratorServiceImpl.java
@@ -1,7 +1,6 @@
-package org.woehlke.simpleworklist.application.token;
+package org.woehlke.simpleworklist.application.login.token;
 
 import org.springframework.stereotype.Service;
-import org.woehlke.simpleworklist.application.token.TokenGeneratorService;
 
 import java.math.BigInteger;
 import java.security.SecureRandom;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java b/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java
@@ -17,7 +17,7 @@
 import org.woehlke.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.simpleworklist.domain.taskworkflow.TaskState;
 import org.woehlke.simpleworklist.domain.task.TaskTime;
-import org.woehlke.simpleworklist.domain.task.TransformTaskIntoProjektService;
+import org.woehlke.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService;
 import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java b/src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java
@@ -19,7 +19,7 @@
 import org.woehlke.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.simpleworklist.domain.taskworkflow.TaskState;
 import org.woehlke.simpleworklist.domain.task.TaskTime;
-import org.woehlke.simpleworklist.domain.task.TransformTaskIntoProjektService;
+import org.woehlke.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService;
 import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.application.session.UserSessionBean;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskStateTaskController.java b/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskStateTaskController.java
@@ -15,7 +15,6 @@
 import org.woehlke.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.domain.task.TaskTime;
-import org.woehlke.simpleworklist.domain.task.TransformTaskIntoProjektService;
 import org.woehlke.simpleworklist.application.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektService.java b/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.task;
+package org.woehlke.simpleworklist.domain.taskworkflow;
 
 import org.springframework.ui.Model;
 import org.woehlke.simpleworklist.domain.task.Task;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TransformTaskIntoProjektServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.task;
+package org.woehlke.simpleworklist.domain.taskworkflow;
 
 
 import lombok.extern.slf4j.Slf4j;
@@ -7,10 +7,10 @@
 import org.springframework.ui.Model;
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.domain.project.ProjectService;
+import org.woehlke.simpleworklist.application.session.UserSessionBean;
 import org.woehlke.simpleworklist.domain.task.Task;
 import org.woehlke.simpleworklist.domain.task.TaskService;
-import org.woehlke.simpleworklist.application.session.UserSessionBean;
-import org.woehlke.simpleworklist.domain.task.TransformTaskIntoProjektService;
+import org.woehlke.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService;
 
 import javax.validation.constraints.NotNull;
 
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.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.application.login.login.UserAccountLoginSuccessService;
 
 @Slf4j
 @Controller
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecovery.java b/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecovery.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.resetpassword;
+package org.woehlke.simpleworklist.domain.user.passwordrecovery;
 
 import javax.validation.constraints.Email;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java b/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.resetpassword;
+package org.woehlke.simpleworklist.domain.user.passwordrecovery;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryRepository.java b/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryRepository.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.resetpassword;
+package org.woehlke.simpleworklist.domain.user.passwordrecovery;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryService.java b/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryService.java
@@ -1,6 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.resetpassword;
-
-import org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecovery;
+package org.woehlke.simpleworklist.domain.user.passwordrecovery;
 
 public interface UserPasswordRecoveryService {
 
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
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.resetpassword;
+package org.woehlke.simpleworklist.domain.user.passwordrecovery;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -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.token.TokenGeneratorService;
+import org.woehlke.simpleworklist.application.login.token.TokenGeneratorService;
 
 import java.util.Date;
 import java.util.UUID;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryStatus.java b/src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryStatus.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.domain.user.resetpassword;
+package org.woehlke.simpleworklist.domain.user.passwordrecovery;
 
 import javax.persistence.Enumerated;
 import java.io.Serializable;
diff --git a/src/main/java/org/woehlke/simpleworklist/domain/user/register/UserRegistrationServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/domain/user/register/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.token.TokenGeneratorService;
+import org.woehlke.simpleworklist.application.login.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
@@ -13,7 +13,7 @@
 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.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.application.login.login.UserAccountLoginSuccessService;
 
 
 import java.net.URL;
diff --git a/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java b/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java
@@ -1,6 +1,6 @@
 package org.woehlke.simpleworklist.application.helper;
 
-import org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecovery;
+import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
 import org.woehlke.simpleworklist.domain.user.register.UserRegistration;
 
 public interface TestHelperService {
diff --git a/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java b/src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java
@@ -6,13 +6,13 @@
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.domain.project.ProjectRepository;
 import org.woehlke.simpleworklist.domain.user.register.UserRegistrationRepository;
-import org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecovery;
+import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
 import org.woehlke.simpleworklist.domain.user.register.UserRegistration;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.domain.task.TaskRepository;
 import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
-import org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecoveryRepository;
+import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryRepository;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
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
@@ -11,9 +11,9 @@
 import org.woehlke.simpleworklist.application.config.AbstractTest;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.user.account.UserAccountForm;
-import org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecoveryService;
+import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
 import org.woehlke.simpleworklist.domain.user.register.UserRegistrationService;
-import org.woehlke.simpleworklist.application.login.LoginForm;
+import org.woehlke.simpleworklist.application.login.login.LoginForm;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationServiceImplTest.java b/src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationServiceImplTest.java
@@ -3,8 +3,8 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.woehlke.simpleworklist.application.config.AbstractTest;
 import org.woehlke.simpleworklist.domain.user.register.UserRegistration;
-import org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecovery;
-import org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecoveryService;
+import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
+import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.domain.user.register.UserRegistrationService;
diff --git a/src/test/java/org/woehlke/simpleworklist/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java
@@ -3,9 +3,9 @@
 import org.woehlke.simpleworklist.application.config.AbstractTest;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecovery;
-import org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecoveryStatus;
-import org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecoveryService;
+import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
+import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryStatus;
+import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.woehlke.simpleworklist.application.login;`
	`1`	`+package org.woehlke.simpleworklist.application.login.login;`
`2`	`2`
`3`	`3`	`import javax.validation.constraints.NotNull;`
`4`	`4`