work

Author: thomaswoehlke

etc/serialversions/serialversions.txt

@@ -4,13 +4,13 @@ org.woehlke.simpleworklist.domain.task.TaskState:    private static final long s
 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.account.UserRole:    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;
 org.woehlke.simpleworklist.domain.project.Project:    private static final long serialVersionUID = 4566653175832872422L;
 org.woehlke.simpleworklist.domain.task.Task:    private static final long serialVersionUID = 5247710652586269801L;
 org.woehlke.simpleworklist.user.chat.User2UserMessage:    private static final long serialVersionUID = 4263078228257938175L;
-org.woehlke.simpleworklist.user.account.UserAccount:    private static final long serialVersionUID = 7860692526488291439L;
+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.domain.breadcrumb.BreadcrumbItem:    private static final long serialVersionUID = 8276819198016077167L;
@@ -19,10 +19,10 @@ org.woehlke.simpleworklist.user.login.LoginForm:    private static final long se
 org.woehlke.simpleworklist.domain.context.NewContextForm:    private static final long serialVersionUID = -937143305653156981L;
 org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean:    private static final long serialVersionUID = 1576610181966480168L;
 org.woehlke.simpleworklist.searchRequest.SearchResult:    private static final long serialVersionUID = 1682809351146047764L;
-org.woehlke.simpleworklist.user.account.UserAccountForm:    private static final long serialVersionUID = 9180383385243540190L;
-org.woehlke.simpleworklist.user.account.UserChangeDefaultContextForm:    private static final long serialVersionUID = -8592295563275083292L;
+org.woehlke.simpleworklist.user.domain.account.UserAccountForm:    private static final long serialVersionUID = 9180383385243540190L;
+org.woehlke.simpleworklist.user.domain.account.UserChangeDefaultContextForm:    private static final long serialVersionUID = -8592295563275083292L;
 org.woehlke.simpleworklist.common.language.UserChangeLanguageForm:    private static final long serialVersionUID = 2201123162578113187L;
-org.woehlke.simpleworklist.user.account.UserChangeNameForm:    private static final long serialVersionUID = 5120488382888268418L;
-org.woehlke.simpleworklist.user.account.UserChangePasswordForm:    private static final long serialVersionUID = 9149342594823222054L;
+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.session.UserSessionBean:    private static final long serialVersionUID = -6649686058228455825L;

src/main/bash/getserialversionid.sh

@@ -53,7 +53,7 @@ serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> $SE
 serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> $SERIALVERSIONS_FILE
-#serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> $SERIALVERSIONS_FILE
+#serialver org.woehlke.simpleworklist.user.domain.account.UserDetailsBean >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.UserSessionBean >> $SERIALVERSIONS_FILE
 cd $PROJECT_PATH

src/main/java/org/woehlke/simpleworklist/common/domain/AbstractController.java

@@ -10,7 +10,7 @@
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.domain.task.TaskState;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 import org.woehlke.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.simpleworklist.domain.task.TaskTime;
 import org.woehlke.simpleworklist.domain.context.ContextService;

src/main/java/org/woehlke/simpleworklist/common/testdata/TestDataController.java

@@ -4,7 +4,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;

src/main/java/org/woehlke/simpleworklist/common/testdata/TestDataService.java

@@ -1,6 +1,6 @@
 package org.woehlke.simpleworklist.common.testdata;
 
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 public interface TestDataService {
 

src/main/java/org/woehlke/simpleworklist/common/testdata/TestDataServiceImpl.java

@@ -9,7 +9,7 @@
 import org.woehlke.simpleworklist.domain.task.Task;
 import org.woehlke.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.simpleworklist.domain.task.TaskState;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 import org.woehlke.simpleworklist.domain.task.TaskTime;
 import org.woehlke.simpleworklist.domain.context.ContextRepository;
 import org.woehlke.simpleworklist.domain.task.TaskRepository;

src/main/java/org/woehlke/simpleworklist/domain/context/Context.java

@@ -7,7 +7,7 @@
 //import org.hibernate.validator.constraints.SafeHtml;
 import org.woehlke.simpleworklist.common.domain.AuditModel;
 import org.woehlke.simpleworklist.common.domain.ComparableById;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import javax.persistence.*;
 import javax.persistence.Index;

src/main/java/org/woehlke/simpleworklist/domain/context/ContextRepository.java

@@ -4,7 +4,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import java.util.List;
 

src/main/java/org/woehlke/simpleworklist/domain/context/ContextService.java

@@ -1,8 +1,6 @@
 package org.woehlke.simpleworklist.domain.context;
 
-import org.woehlke.simpleworklist.domain.context.Context;
-import org.woehlke.simpleworklist.domain.context.NewContextForm;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import java.util.List;
 

src/main/java/org/woehlke/simpleworklist/domain/context/ContextServiceImpl.java

@@ -4,11 +4,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.domain.context.Context;
-import org.woehlke.simpleworklist.domain.context.ContextRepository;
-import org.woehlke.simpleworklist.domain.context.ContextService;
-import org.woehlke.simpleworklist.domain.context.NewContextForm;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 import org.woehlke.simpleworklist.domain.project.ProjectRepository;
 import org.woehlke.simpleworklist.domain.task.TaskRepository;
 

src/main/java/org/woehlke/simpleworklist/domain/project/Project.java

@@ -19,7 +19,7 @@
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.common.domain.AuditModel;
 import org.woehlke.simpleworklist.common.domain.ComparableById;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 @Entity
 @Table(

src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java

@@ -20,7 +20,7 @@
 import org.woehlke.simpleworklist.domain.task.TaskTime;
 import org.woehlke.simpleworklist.services.TaskProjektService;
 import org.woehlke.simpleworklist.domain.task.TaskService;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 

src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java

@@ -23,7 +23,7 @@
 import org.woehlke.simpleworklist.services.TaskProjektService;
 import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import javax.validation.Valid;
 import java.util.List;

src/main/java/org/woehlke/simpleworklist/domain/task/Task.java

@@ -32,7 +32,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.project.Project;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 import org.woehlke.simpleworklist.common.domain.AuditModel;
 import org.woehlke.simpleworklist.common.domain.ComparableById;
 

src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTaskController.java

@@ -16,7 +16,7 @@
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import lombok.extern.slf4j.Slf4j;
 import javax.validation.Valid;

src/main/java/org/woehlke/simpleworklist/services/ProjectControllerService.java

@@ -6,7 +6,7 @@
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.domain.task.Task;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import java.util.Locale;
 

src/main/java/org/woehlke/simpleworklist/services/ProjectControllerServiceImpl.java

@@ -15,7 +15,7 @@
 import org.woehlke.simpleworklist.domain.task.Task;
 import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;

src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessage.java

@@ -5,7 +5,7 @@
 import javax.validation.constraints.NotBlank;
 //import org.hibernate.validator.constraints.SafeHtml;
 import org.woehlke.simpleworklist.common.domain.AuditModel;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java

@@ -17,7 +17,7 @@
 import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 import org.woehlke.simpleworklist.domain.context.Context;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import javax.validation.Valid;
 import java.util.Locale;

src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageRepository.java

@@ -6,7 +6,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import java.util.List;
 

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

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

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

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.account;
+package org.woehlke.simpleworklist.user.domain.account;
 
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;

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

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.account;
+package org.woehlke.simpleworklist.user.domain.account;
 
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.account;
+package org.woehlke.simpleworklist.user.domain.account;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.account;
+package org.woehlke.simpleworklist.user.domain.account;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -8,7 +8,6 @@
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
-import org.woehlke.simpleworklist.user.account.UserAccount;
 
 
 @Getter

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

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

src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java

@@ -6,7 +6,7 @@
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.LocaleResolver;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;

src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java

@@ -16,7 +16,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 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.domain.account.UserAccount;
 import org.woehlke.simpleworklist.user.services.UserAccountAccessService;
 import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
 

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

@@ -9,7 +9,7 @@
 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.account.UserAccountForm;
+import org.woehlke.simpleworklist.user.domain.account.UserAccountForm;
 import org.woehlke.simpleworklist.user.services.UserAccountService;
 import org.woehlke.simpleworklist.user.services.UserRegistrationService;
 

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

@@ -8,8 +8,8 @@
 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.account.UserAccountForm;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+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.services.UserAccountService;
 

src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java

@@ -21,10 +21,10 @@
 import org.woehlke.simpleworklist.common.language.UserChangeLanguageForm;
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.common.language.Language;
-import org.woehlke.simpleworklist.user.account.UserAccount;
-import org.woehlke.simpleworklist.user.account.UserChangeDefaultContextForm;
-import org.woehlke.simpleworklist.user.account.UserChangeNameForm;
-import org.woehlke.simpleworklist.user.account.UserChangePasswordForm;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserChangeDefaultContextForm;
+import org.woehlke.simpleworklist.user.domain.account.UserChangeNameForm;
+import org.woehlke.simpleworklist.user.domain.account.UserChangePasswordForm;
 import org.woehlke.simpleworklist.user.services.UserAccountAccessService;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 

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

@@ -2,7 +2,7 @@
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 import org.woehlke.simpleworklist.user.chat.User2UserMessage;
 import org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean;
 

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

@@ -6,13 +6,12 @@
 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.domain.account.UserAccount;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.chat.User2UserMessage;
 import org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean;
 import org.woehlke.simpleworklist.user.chat.User2UserMessageRepository;
-import org.woehlke.simpleworklist.user.services.User2UserMessageService;
 
 import java.util.List;
 import java.util.UUID;

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

@@ -1,7 +1,7 @@
 package org.woehlke.simpleworklist.user.services;
 
-import org.woehlke.simpleworklist.user.account.UserChangePasswordForm;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserChangePasswordForm;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 import org.woehlke.simpleworklist.user.login.LoginForm;
 
 public interface UserAccountAccessService {

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

@@ -10,10 +10,10 @@
 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.domain.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccountRepository;
 import org.woehlke.simpleworklist.user.login.LoginForm;
-import org.woehlke.simpleworklist.user.account.UserChangePasswordForm;
+import org.woehlke.simpleworklist.user.domain.account.UserChangePasswordForm;
 
 @Slf4j
 @Service

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

@@ -1,7 +1,7 @@
 package org.woehlke.simpleworklist.user.services;
 
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.woehlke.simpleworklist.user.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
 
 public interface UserAccountLoginSuccessService {
 

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

@@ -9,9 +9,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.account.UserAccountRepository;
-import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.user.domain.account.UserAccount;
+import org.woehlke.simpleworklist.user.domain.account.UserAccountRepository;
 
 import java.util.Date;