migrate spring-boot

thomaswoehlke · thomaswoehlke · commit 4cb521a8b897 · 2020-04-02T19:32:22.000+02:00
diff --git a/etc/serialversions.txt b/etc/serialversions.txt
@@ -23,6 +23,6 @@ org.woehlke.simpleworklist.model.beans.UserAccountForm:    private static final
 org.woehlke.simpleworklist.model.beans.UserChangeDefaultContextForm:    private static final long serialVersionUID = -8592295563275083292L;
 org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm:    private static final long serialVersionUID = 2201123162578113187L;
 org.woehlke.simpleworklist.model.beans.UserChangeNameForm:    private static final long serialVersionUID = 5120488382888268418L;
-org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm:    private static final long serialVersionUID = 9149342594823222054L;
+org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm:    private static final long serialVersionUID = 9149342594823222054L;
 org.woehlke.simpleworklist.user.register.UserRegistrationForm:    private static final long serialVersionUID = 6864871862706880939L;
 org.woehlke.simpleworklist.model.beans.UserSessionBean:    private static final long serialVersionUID = -6649686058228455825L;
diff --git a/getserialversionid.cmd b/getserialversionid.cmd
@@ -40,7 +40,7 @@ serialver org.woehlke.simpleworklist.model.beans.UserAccountForm  >> ..\..\etc\s
 serialver org.woehlke.simpleworklist.model.beans.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.model.beans.UserChangeNameForm >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> ..\..\etc\serialversions.txt
 @rem serialver org.woehlke.simpleworklist.model.beans.UserDetailsBean >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.model.beans.UserSessionBean >> ..\..\etc\serialversions.txt
diff --git a/getserialversionid.sh b/getserialversionid.sh
@@ -52,7 +52,7 @@ serialver org.woehlke.simpleworklist.model.beans.UserAccountForm  >> $SERIALVERS
 serialver org.woehlke.simpleworklist.model.beans.UserChangeDefaultContextForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.model.beans.UserChangeNameForm >> $SERIALVERSIONS_FILE
-serialver org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm >> $SERIALVERSIONS_FILE
+serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> $SERIALVERSIONS_FILE
 #serialver org.woehlke.simpleworklist.model.beans.UserDetailsBean >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.model.beans.UserSessionBean >> $SERIALVERSIONS_FILE
diff --git a/src/main/java/org/woehlke/simpleworklist/user/UserAccountAccessService.java b/src/main/java/org/woehlke/simpleworklist/user/UserAccountAccessService.java
@@ -1,6 +1,6 @@
 package org.woehlke.simpleworklist.user;
 
-import org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm;
+import org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm;
 import org.woehlke.simpleworklist.oodm.entities.UserAccount;
 import org.woehlke.simpleworklist.user.login.LoginForm;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/user/UserAccountAccessServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/UserAccountAccessServiceImpl.java
@@ -13,7 +13,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.oodm.entities.UserAccount;
 import org.woehlke.simpleworklist.user.login.LoginForm;
-import org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm;
+import org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm;
 import org.woehlke.simpleworklist.oodm.repository.UserAccountRepository;
 
 @Service
diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserChangePasswordForm.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.resetpassword;
+package org.woehlke.simpleworklist.user.selfservice;
 
 import javax.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.SafeHtml;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
@@ -23,7 +23,6 @@
 import org.woehlke.simpleworklist.oodm.enumerations.Language;
 import org.woehlke.simpleworklist.model.beans.*;
 import org.woehlke.simpleworklist.user.UserAccountAccessService;
-import org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm;
 
 import javax.validation.Valid;
 import java.util.List;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.woehlke.simpleworklist.user.resetpassword;`
	`1`	`+package org.woehlke.simpleworklist.user.selfservice;`
`2`	`2`
`3`	`3`	`import javax.validation.constraints.NotBlank;`
`4`	`4`	`import org.hibernate.validator.constraints.SafeHtml;`