refactoring of java classes

Author: thomaswoehlke

etc/serialversions/serialversions.txt

@@ -9,15 +9,15 @@ org.woehlke.simpleworklist.application.framework.AuditModel:    private static f
 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.domain.user.chat.User2UserMessage:    private static final long serialVersionUID = 4263078228257938175L;
+org.woehlke.simpleworklist.domain.user.chat.ChatMessage:    private static final long serialVersionUID = 4263078228257938175L;
 org.woehlke.simpleworklist.user.domain.account.UserAccount:    private static final long serialVersionUID = 7860692526488291439L;
 org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecovery:    private static final long serialVersionUID = 6860716425733119940L;
 org.woehlke.simpleworklist.domain.user.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;
 org.woehlke.simpleworklist.domain.context.NewContextForm:    private static final long serialVersionUID = -937143305653156981L;
-org.woehlke.simpleworklist.domain.user.chat.User2UserMessageFormBean:    private static final long serialVersionUID = 1576610181966480168L;
+org.woehlke.simpleworklist.domain.user.chat.ChatMessageForm:    private static final long serialVersionUID = 1576610181966480168L;
 org.woehlke.simpleworklist.searchRequest.SearchResult:    private static final long serialVersionUID = 1682809351146047764L;
 org.woehlke.simpleworklist.user.domain.account.UserAccountForm:    private static final long serialVersionUID = 9180383385243540190L;
 org.woehlke.simpleworklist.user.selfservice.UserChangeDefaultContextForm:    private static final long serialVersionUID = -8592295563275083292L;

src/main/java/org/woehlke/simpleworklist/application/framework/AbstractController.java

@@ -15,13 +15,13 @@
 import org.woehlke.simpleworklist.domain.task.TaskTime;
 import org.woehlke.simpleworklist.domain.context.ContextService;
 import org.woehlke.simpleworklist.domain.project.ProjectService;
-import org.woehlke.simpleworklist.user.services.User2UserMessageService;
-import org.woehlke.simpleworklist.user.services.UserAccountService;
+import org.woehlke.simpleworklist.domain.user.chat.ChatMessageService;
+import org.woehlke.simpleworklist.domain.user.account.UserAccountService;
 import org.woehlke.simpleworklist.application.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.user.services.UserAccountAccessService;
-import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
+import org.woehlke.simpleworklist.application.login.access.UserAccountAccessService;
+import org.woehlke.simpleworklist.application.login.UserAccountLoginSuccessService;
 
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
@@ -52,7 +52,7 @@ public abstract class AbstractController {
     protected UserAccountAccessService userAccountAccessService;
 
     @Autowired
-    protected User2UserMessageService user2UserMessageService;
+    protected ChatMessageService chatMessageService;
 
     @Autowired
     protected UserAccountLoginSuccessService userAccountLoginSuccessService;
@@ -86,7 +86,7 @@ public final List<Project> getRootCategories(
     @ModelAttribute("numberOfNewIncomingMessages")
     public final int getNumberOfNewIncomingMessages(){
         UserAccount user = this.getUser();
-        return user2UserMessageService.getNumberOfNewIncomingMessagesForUser(user);
+        return chatMessageService.getNumberOfNewIncomingMessagesForUser(user);
     }
 
     @ModelAttribute("listTaskEnergy")

src/main/java/org/woehlke/simpleworklist/application/listener/ApplicationContextRefreshedListener.java

@@ -6,7 +6,7 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.stereotype.Component;
-import org.woehlke.simpleworklist.services.SearchService;
+import org.woehlke.simpleworklist.domain.search.SearchService;
 
 
 /**

src/main/java/org/woehlke/simpleworklist/application/listener/ApplicationContextStartedListener.java

@@ -5,7 +5,7 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextStartedEvent;
 import org.springframework.stereotype.Component;
-import org.woehlke.simpleworklist.services.SearchService;
+import org.woehlke.simpleworklist.domain.search.SearchService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 

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

@@ -9,7 +9,6 @@
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;

src/main/java/org/woehlke/simpleworklist/user/services/UserAccountLoginSuccessService.java renamed to src/main/java/org/woehlke/simpleworklist/application/login/UserAccountLoginSuccessService.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.services;
+package org.woehlke.simpleworklist.application.login;
 
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;

src/main/java/org/woehlke/simpleworklist/user/services/UserAccountLoginSuccessServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/application/login/UserAccountLoginSuccessServiceImpl.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.services;
+package org.woehlke.simpleworklist.application.login;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +9,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.woehlke.simpleworklist.application.login.UserAccountLoginSuccessService;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
 

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

@@ -16,9 +16,8 @@
 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.application.login.access.UserAccountAccessService;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.simpleworklist.user.services.UserAccountAccessService;
-import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;
 
 @Slf4j
 @Controller

src/main/java/org/woehlke/simpleworklist/user/services/UserAccountAccessService.java renamed to src/main/java/org/woehlke/simpleworklist/application/login/access/UserAccountAccessService.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.services;
+package org.woehlke.simpleworklist.application.login.access;
 
 import org.woehlke.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;

src/main/java/org/woehlke/simpleworklist/user/services/UserAccountAccessServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/application/login/access/UserAccountAccessServiceImpl.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.services;
+package org.woehlke.simpleworklist.application.login.access;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,9 +10,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.woehlke.simpleworklist.application.login.LoginForm;
+import org.woehlke.simpleworklist.application.login.access.UserAccountAccessService;
 import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
-import org.woehlke.simpleworklist.application.login.LoginForm;
 import org.woehlke.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;
 
 @Slf4j