work

Author: thomaswoehlke

etc/serialversions/serialversions.txt

@@ -3,7 +3,7 @@ org.woehlke.simpleworklist.domain.task.TaskEnergy:    private static final long
 org.woehlke.simpleworklist.domain.task.TaskState:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.domain.task.TaskTime:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus:    private static final long serialVersionUID = 0L;
-org.woehlke.simpleworklist.user.register.UserRegistrationStatus:    private static final long serialVersionUID = 0L;
+org.woehlke.simpleworklist.user.domain.register.UserRegistrationStatus:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.user.domain.account.UserRole:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.common.domain.AuditModel:    private static final long serialVersionUID = 4399373914714726911L;
 org.woehlke.simpleworklist.domain.context.Context:    private static final long serialVersionUID = -5035732370606951871L;
@@ -12,7 +12,7 @@ org.woehlke.simpleworklist.domain.task.Task:    private static final long serial
 org.woehlke.simpleworklist.user.chat.User2UserMessage:    private static final long serialVersionUID = 4263078228257938175L;
 org.woehlke.simpleworklist.user.domain.account.UserAccount:    private static final long serialVersionUID = 7860692526488291439L;
 org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery:    private static final long serialVersionUID = 6860716425733119940L;
-org.woehlke.simpleworklist.user.register.UserRegistration:    private static final long serialVersionUID = -1955967514018161878L;
+org.woehlke.simpleworklist.user.domain.register.UserRegistration:    private static final long serialVersionUID = -1955967514018161878L;
 org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbItem:    private static final long serialVersionUID = 8276819198016077167L;
 org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb:    private static final long serialVersionUID = 7932703111140692689L;
 org.woehlke.simpleworklist.user.login.LoginForm:    private static final long serialVersionUID = 5936886560348238355L;
@@ -24,5 +24,5 @@ org.woehlke.simpleworklist.user.domain.account.UserChangeDefaultContextForm:
 org.woehlke.simpleworklist.common.language.UserChangeLanguageForm:    private static final long serialVersionUID = 2201123162578113187L;
 org.woehlke.simpleworklist.user.domain.account.UserChangeNameForm:    private static final long serialVersionUID = 5120488382888268418L;
 org.woehlke.simpleworklist.user.domain.account.UserChangePasswordForm:    private static final long serialVersionUID = 9149342594823222054L;
-org.woehlke.simpleworklist.user.register.UserRegistrationForm:    private static final long serialVersionUID = 6864871862706880939L;
+org.woehlke.simpleworklist.user.domain.register.UserRegistrationForm:    private static final long serialVersionUID = 6864871862706880939L;
 org.woehlke.simpleworklist.user.session.UserSessionBean:    private static final long serialVersionUID = -6649686058228455825L;

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

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.register;
+package org.woehlke.simpleworklist.user.domain.register;
 
 import javax.validation.constraints.Email;
 

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java renamed to src/main/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationController.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.register;
+package org.woehlke.simpleworklist.user.domain.register;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationForm.java renamed to src/main/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationForm.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.register;
+package org.woehlke.simpleworklist.user.domain.register;
 
 import lombok.*;
 

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationRepository.java renamed to src/main/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationRepository.java

@@ -1,8 +1,7 @@
-package org.woehlke.simpleworklist.user.register;
+package org.woehlke.simpleworklist.user.domain.register;
 
 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> {

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationStatus.java renamed to src/main/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationStatus.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.register;
+package org.woehlke.simpleworklist.user.domain.register;
 
 import javax.persistence.Enumerated;
 import java.io.Serializable;

src/main/java/org/woehlke/simpleworklist/user/domain/account/UserAccountPassword.java renamed to src/main/java/org/woehlke/simpleworklist/user/domain/userpassword/UserAccountPassword.java

@@ -1,9 +1,10 @@
-package org.woehlke.simpleworklist.user.domain.account;
+package org.woehlke.simpleworklist.user.domain.userpassword;
 
 import lombok.Getter;
 import lombok.Setter;
 import org.woehlke.simpleworklist.common.domain.AuditModel;
 import org.woehlke.simpleworklist.common.domain.ComparableById;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

src/main/java/org/woehlke/simpleworklist/user/domain/userpassword/UserAccountPasswordRepositories.java

@@ -0,0 +1,8 @@
+package org.woehlke.simpleworklist.user.domain.userpassword;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserAccountPasswordRepositories extends JpaRepository<UserAccountPassword, Long> {
+}

src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryController.java

@@ -10,7 +10,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.user.domain.account.UserAccountForm;
 import org.woehlke.simpleworklist.user.domain.account.UserAccount;
-import org.woehlke.simpleworklist.user.register.UserRegistrationForm;
+import org.woehlke.simpleworklist.user.domain.register.UserRegistrationForm;
 import org.woehlke.simpleworklist.user.services.UserAccountService;
 
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,6 +1,6 @@
 package org.woehlke.simpleworklist.user.services;
 
-import org.woehlke.simpleworklist.user.register.UserRegistration;
+import org.woehlke.simpleworklist.user.domain.register.UserRegistration;
 
 public interface UserRegistrationService {
 

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

@@ -14,11 +14,9 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.application.ApplicationProperties;
-import org.woehlke.simpleworklist.user.register.UserRegistration;
-import org.woehlke.simpleworklist.user.register.UserRegistrationRepository;
-import org.woehlke.simpleworklist.user.register.UserRegistrationStatus;
-import org.woehlke.simpleworklist.user.services.TokenGeneratorService;
-import org.woehlke.simpleworklist.user.services.UserRegistrationService;
+import org.woehlke.simpleworklist.user.domain.register.UserRegistration;
+import org.woehlke.simpleworklist.user.domain.register.UserRegistrationRepository;
+import org.woehlke.simpleworklist.user.domain.register.UserRegistrationStatus;
 
 @Slf4j
 @Service

src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperService.java

@@ -1,7 +1,7 @@
 package org.woehlke.simpleworklist.application.helper;
 
 import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
-import org.woehlke.simpleworklist.user.register.UserRegistration;
+import org.woehlke.simpleworklist.user.domain.register.UserRegistration;
 
 public interface TestHelperService {
 

src/test/java/org/woehlke/simpleworklist/application/helper/TestHelperServiceImpl.java

@@ -5,9 +5,9 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.domain.project.ProjectRepository;
-import org.woehlke.simpleworklist.user.register.UserRegistrationRepository;
+import org.woehlke.simpleworklist.user.domain.register.UserRegistrationRepository;
 import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
-import org.woehlke.simpleworklist.user.register.UserRegistration;
+import org.woehlke.simpleworklist.user.domain.register.UserRegistration;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.domain.task.TaskRepository;

src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java renamed to src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationControllerTest.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.register;
+package org.woehlke.simpleworklist.user.domain.register;
 
 import org.woehlke.simpleworklist.application.config.AbstractTest;
 

src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java renamed to src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationServiceImplTest.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.register;
+package org.woehlke.simpleworklist.user.domain.register;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.woehlke.simpleworklist.application.config.AbstractTest;

src/test/java/org/woehlke/simpleworklist/user/domain/register/UserRegistrationServiceTest.java

@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.user.domain.register;
+
+public class UserRegistrationServiceTest {
+}