migrate spring-boot

thomaswoehlke · thomaswoehlke · commit a70d56862c8f · 2020-04-02T19:42:40.000+02:00
diff --git a/etc/serialversions.txt b/etc/serialversions.txt
@@ -19,7 +19,7 @@ org.woehlke.simpleworklist.user.login.LoginForm:    private static final long se
 org.woehlke.simpleworklist.context.NewContextForm:    private static final long serialVersionUID = -937143305653156981L;
 org.woehlke.simpleworklist.user.messages.NewUser2UserMessage:    private static final long serialVersionUID = 1576610181966480168L;
 org.woehlke.simpleworklist.search.SearchResult:    private static final long serialVersionUID = 1682809351146047764L;
-org.woehlke.simpleworklist.user.UserAccountForm:    private static final long serialVersionUID = 9180383385243540190L;
+org.woehlke.simpleworklist.user.account.UserAccountForm:    private static final long serialVersionUID = 9180383385243540190L;
 org.woehlke.simpleworklist.context.UserChangeDefaultContextForm:    private static final long serialVersionUID = -8592295563275083292L;
 org.woehlke.simpleworklist.language.UserChangeLanguageForm:    private static final long serialVersionUID = 2201123162578113187L;
 org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm:    private static final long serialVersionUID = 5120488382888268418L;
diff --git a/getserialversionid.cmd b/getserialversionid.cmd
@@ -36,7 +36,7 @@ serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialver
 serialver org.woehlke.simpleworklist.context.NewContextForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.messages.NewUser2UserMessage >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.search.SearchResult >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.user.UserAccountForm  >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.user.account.UserAccountForm  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> ..\..\etc\serialversions.txt
diff --git a/getserialversionid.sh b/getserialversionid.sh
@@ -48,7 +48,7 @@ serialver org.woehlke.simpleworklist.user.login.LoginForm >> $SERIALVERSIONS_FIL
 serialver org.woehlke.simpleworklist.context.NewContextForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.messages.NewUser2UserMessage >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.search.SearchResult >> $SERIALVERSIONS_FILE
-serialver org.woehlke.simpleworklist.user.UserAccountForm  >> $SERIALVERSIONS_FILE
+serialver org.woehlke.simpleworklist.user.account.UserAccountForm  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> $SERIALVERSIONS_FILE
diff --git a/src/main/java/org/woehlke/simpleworklist/common/AbstractController.java b/src/main/java/org/woehlke/simpleworklist/common/AbstractController.java
@@ -14,11 +14,11 @@
 import org.woehlke.simpleworklist.context.ContextService;
 import org.woehlke.simpleworklist.project.ProjectService;
 import org.woehlke.simpleworklist.user.messages.User2UserMessageService;
-import org.woehlke.simpleworklist.user.UserAccountService;
+import org.woehlke.simpleworklist.user.account.UserAccountService;
 import org.woehlke.simpleworklist.user.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.user.UserAccountAccessService;
+import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
 import org.woehlke.simpleworklist.user.login.UserAccountLoginSuccessService;
 
 import java.util.List;
diff --git a/src/main/java/org/woehlke/simpleworklist/config/di/WebSecurityConfig.java b/src/main/java/org/woehlke/simpleworklist/config/di/WebSecurityConfig.java
@@ -15,7 +15,7 @@
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.woehlke.simpleworklist.user.login.LoginSuccessHandler;
-import org.woehlke.simpleworklist.user.UserAccountSecurityService;
+import org.woehlke.simpleworklist.user.account.UserAccountSecurityService;
 
 @Configuration
 @EnableWebSecurity
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessService.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user;
+package org.woehlke.simpleworklist.user.account;
 
 import org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm;
 import org.woehlke.simpleworklist.user.account.UserAccount;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountAccessServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user;
+package org.woehlke.simpleworklist.user.account;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,10 +11,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.user.login.LoginForm;
 import org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm;
-import org.woehlke.simpleworklist.user.account.UserAccountRepository;
 
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountForm.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountForm.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user;
+package org.woehlke.simpleworklist.user.account;
 
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityService.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user;
+package org.woehlke.simpleworklist.user.account;
 
 import org.springframework.security.core.userdetails.UserDetailsService;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user;
+package org.woehlke.simpleworklist.user.account;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,8 +8,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.user.account.UserAccountRepository;
+import org.woehlke.simpleworklist.user.UserDetailsBean;
 
 @Service
 @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountService.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountService.java
@@ -1,10 +1,11 @@
-package org.woehlke.simpleworklist.user;
+package org.woehlke.simpleworklist.user.account;
 
 import java.util.Map;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.account.UserAccountForm;
 
 public interface UserAccountService {
 
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user;
+package org.woehlke.simpleworklist.user.account;
 
 
 import java.util.Date;
@@ -18,11 +18,9 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.oodm.entities.User2UserMessage;
 import org.woehlke.simpleworklist.language.Language;
 import org.woehlke.simpleworklist.oodm.repository.ContextRepository;
-import org.woehlke.simpleworklist.user.account.UserAccountRepository;
 import org.woehlke.simpleworklist.oodm.repository.User2UserMessageRepository;
 
 @Service("userAccountService")
diff --git a/src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java b/src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java
@@ -18,7 +18,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.support.SessionStatus;
 import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.user.UserAccountAccessService;
+import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
 
 
 @Controller
diff --git a/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java b/src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java
@@ -10,9 +10,9 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.woehlke.simpleworklist.user.UserAccountForm;
+import org.woehlke.simpleworklist.user.account.UserAccountForm;
 import org.woehlke.simpleworklist.oodm.entities.UserRegistration;
-import org.woehlke.simpleworklist.user.UserAccountService;
+import org.woehlke.simpleworklist.user.account.UserAccountService;
 
 import javax.validation.Valid;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryController.java b/src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryController.java
@@ -9,11 +9,11 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.woehlke.simpleworklist.user.UserAccountForm;
+import org.woehlke.simpleworklist.user.account.UserAccountForm;
 import org.woehlke.simpleworklist.oodm.entities.UserPasswordRecovery;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.user.register.UserRegistrationForm;
-import org.woehlke.simpleworklist.user.UserAccountService;
+import org.woehlke.simpleworklist.user.account.UserAccountService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import javax.validation.Valid;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
@@ -24,7 +24,7 @@
 import org.woehlke.simpleworklist.oodm.entities.Context;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.language.Language;
-import org.woehlke.simpleworklist.user.UserAccountAccessService;
+import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
 import org.woehlke.simpleworklist.user.UserSessionBean;
 
 import javax.validation.Valid;
diff --git a/src/test/java/org/woehlke/simpleworklist/AbstractTest.java b/src/test/java/org/woehlke/simpleworklist/AbstractTest.java
@@ -15,10 +15,10 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.woehlke.simpleworklist.config.ApplicationProperties;
 import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.user.UserAccountService;
+import org.woehlke.simpleworklist.user.account.UserAccountService;
 import org.woehlke.simpleworklist.model.services.*;
-import org.woehlke.simpleworklist.user.UserAccountAccessService;
-import org.woehlke.simpleworklist.user.UserAccountSecurityService;
+import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
+import org.woehlke.simpleworklist.user.account.UserAccountSecurityService;
 import org.woehlke.simpleworklist.user.login.UserAccountLoginSuccessService;
 
 
diff --git a/src/test/java/org/woehlke/simpleworklist/model/UserAccountFormTest.java b/src/test/java/org/woehlke/simpleworklist/model/UserAccountFormTest.java
@@ -5,7 +5,7 @@
 import org.woehlke.simpleworklist.AbstractTest;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.user.UserAccountForm;
+import org.woehlke.simpleworklist.user.account.UserAccountForm;
 
 
 public class UserAccountFormTest extends AbstractTest {
diff --git a/src/test/java/org/woehlke/simpleworklist/model/services/impl/UserAccountServiceImplTest.java b/src/test/java/org/woehlke/simpleworklist/model/services/impl/UserAccountServiceImplTest.java
@@ -14,7 +14,7 @@
 import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryService;
 import org.woehlke.simpleworklist.user.register.UserRegistrationService;
 import org.woehlke.simpleworklist.user.login.LoginForm;
-import org.woehlke.simpleworklist.user.UserAccountForm;
+import org.woehlke.simpleworklist.user.account.UserAccountForm;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.woehlke.simpleworklist.user;`
	`1`	`+package org.woehlke.simpleworklist.user.account;`
`2`	`2`
`3`	`3`	`import org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm;`
`4`	`4`	`import org.woehlke.simpleworklist.user.account.UserAccount;`