migrate spring-boot

Author: thomaswoehlke

etc/serialversions.txt

@@ -12,7 +12,7 @@ org.woehlke.simpleworklist.task.Task:    private static final long serialVersion
 org.woehlke.simpleworklist.user.messages.User2UserMessage:    private static final long serialVersionUID = 4263078228257938175L;
 org.woehlke.simpleworklist.user.account.UserAccount:    private static final long serialVersionUID = 7860692526488291439L;
 org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery:    private static final long serialVersionUID = 6860716425733119940L;
-org.woehlke.simpleworklist.oodm.entities.UserRegistration:    private static final long serialVersionUID = -1955967514018161878L;
+org.woehlke.simpleworklist.user.register.UserRegistration:    private static final long serialVersionUID = -1955967514018161878L;
 org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem:    private static final long serialVersionUID = 8276819198016077167L;
 org.woehlke.simpleworklist.breadcrumb.Breadcrumb:    private static final long serialVersionUID = 7932703111140692689L;
 org.woehlke.simpleworklist.user.login.LoginForm:    private static final long serialVersionUID = 5936886560348238355L;

getserialversionid.cmd

@@ -29,7 +29,7 @@ serialver org.woehlke.simpleworklist.task.Task  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.messages.User2UserMessage  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.account.UserAccount  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery  >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.oodm.entities.UserRegistration  >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.user.register.UserRegistration  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialversions.txt

getserialversionid.sh

@@ -41,7 +41,7 @@ serialver org.woehlke.simpleworklist.task.Task  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.messages.User2UserMessage  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.account.UserAccount  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery  >> $SERIALVERSIONS_FILE
-serialver org.woehlke.simpleworklist.oodm.entities.UserRegistration  >> $SERIALVERSIONS_FILE
+serialver org.woehlke.simpleworklist.user.register.UserRegistration  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.login.LoginForm >> $SERIALVERSIONS_FILE

src/main/java/org/woehlke/simpleworklist/oodm/repository/UserRegistrationRepository.java

@@ -1,13 +1,13 @@
-package org.woehlke.simpleworklist.oodm.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-import org.woehlke.simpleworklist.oodm.entities.UserRegistration;
-
-@Repository
-public interface UserRegistrationRepository extends JpaRepository<UserRegistration, Long> {
-
-    UserRegistration findByToken(String token);
-
-    UserRegistration findByEmail(String email);
-}
+package org.woehlke.simpleworklist.oodm.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import org.woehlke.simpleworklist.user.register.UserRegistration;
+
+@Repository
+public interface UserRegistrationRepository extends JpaRepository<UserRegistration, Long> {
+
+    UserRegistration findByToken(String token);
+
+    UserRegistration findByEmail(String email);
+}

src/main/java/org/woehlke/simpleworklist/oodm/entities/UserRegistration.java renamed to src/main/java/org/woehlke/simpleworklist/user/register/UserRegistration.java

@@ -1,9 +1,8 @@
-package org.woehlke.simpleworklist.oodm.entities;
+package org.woehlke.simpleworklist.user.register;
 
 import javax.validation.constraints.Email;
 
 import org.woehlke.simpleworklist.oodm.entities.impl.AuditModel;
-import org.woehlke.simpleworklist.user.register.UserRegistrationStatus;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java

@@ -11,7 +11,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.user.account.UserAccountForm;
-import org.woehlke.simpleworklist.oodm.entities.UserRegistration;
 import org.woehlke.simpleworklist.user.account.UserAccountService;
 
 import javax.validation.Valid;

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationService.java

@@ -1,7 +1,5 @@
 package org.woehlke.simpleworklist.user.register;
 
-import org.woehlke.simpleworklist.oodm.entities.UserRegistration;
-
 public interface UserRegistrationService {
 
     UserRegistration findByToken(String confirmId);

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java

@@ -14,7 +14,6 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.config.ApplicationProperties;
-import org.woehlke.simpleworklist.oodm.entities.UserRegistration;
 import org.woehlke.simpleworklist.oodm.repository.UserRegistrationRepository;
 import org.woehlke.simpleworklist.user.token.TokenGeneratorService;
 

src/test/java/org/woehlke/simpleworklist/control/UserRegistrationControllerTest.java

@@ -3,7 +3,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.woehlke.simpleworklist.AbstractTest;
-import org.woehlke.simpleworklist.oodm.entities.UserRegistration;
+import org.woehlke.simpleworklist.user.register.UserRegistration;
 import org.woehlke.simpleworklist.user.register.UserRegistrationStatus;
 import org.woehlke.simpleworklist.user.register.UserRegistrationService;
 

src/test/java/org/woehlke/simpleworklist/model/services/TestHelperService.java

@@ -1,7 +1,7 @@
 package org.woehlke.simpleworklist.model.services;
 
 import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
-import org.woehlke.simpleworklist.oodm.entities.UserRegistration;
+import org.woehlke.simpleworklist.user.register.UserRegistration;
 
 public interface TestHelperService {