work in progress

thomaswoehlke · thomaswoehlke · commit c0ed5d697252 · 2020-04-11T16:52:45.000+02:00
diff --git a/etc/serialversions/getserialversionid.cmd b/etc/serialversions/getserialversionid.cmd
@@ -26,15 +26,15 @@ serialver org.woehlke.simpleworklist.application.common.AuditModel >> ..\..\etc\
 serialver org.woehlke.simpleworklist.context.Context  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.project.Project  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.task.Task  >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.user.messages.User2UserMessage  >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.user.chat.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.user.register.UserRegistration  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbItem  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.NewContextForm >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.searchRequest.SearchResult >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.account.UserAccountForm  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt
@@ -43,6 +43,6 @@ serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> ..\.
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> ..\..\etc\serialversions.txt
 @rem serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.session.UserSessionBean >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.user.session.UserSessionBean >> ..\..\etc\serialversions.txt
 cd ..\..
 echo FINISHED
diff --git a/etc/serialversions/serialversions.txt b/etc/serialversions/serialversions.txt
@@ -9,20 +9,20 @@ org.woehlke.simpleworklist.application.common.AuditModel:    private static fina
 org.woehlke.simpleworklist.context.Context:    private static final long serialVersionUID = -5035732370606951871L;
 org.woehlke.simpleworklist.project.Project:    private static final long serialVersionUID = 4566653175832872422L;
 org.woehlke.simpleworklist.task.Task:    private static final long serialVersionUID = 5247710652586269801L;
-org.woehlke.simpleworklist.user.messages.User2UserMessage:    private static final long serialVersionUID = 4263078228257938175L;
+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.resetpassword.UserPasswordRecovery:    private static final long serialVersionUID = 6860716425733119940L;
 org.woehlke.simpleworklist.user.register.UserRegistration:    private static final long serialVersionUID = -1955967514018161878L;
 org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbItem:    private static final long serialVersionUID = 8276819198016077167L;
 org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb:    private static final long serialVersionUID = 7932703111140692689L;
 org.woehlke.simpleworklist.user.login.LoginForm:    private static final long serialVersionUID = 5936886560348238355L;
 org.woehlke.simpleworklist.context.NewContextForm:    private static final long serialVersionUID = -937143305653156981L;
-org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean:    private static final long serialVersionUID = 1576610181966480168L;
+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.context.UserChangeDefaultContextForm:    private static final long serialVersionUID = -8592295563275083292L;
 org.woehlke.simpleworklist.application.language.UserChangeLanguageForm:    private static final long serialVersionUID = 2201123162578113187L;
 org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm:    private static final long serialVersionUID = 5120488382888268418L;
 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.session.UserSessionBean:    private static final long serialVersionUID = -6649686058228455825L;
+org.woehlke.simpleworklist.user.session.UserSessionBean:    private static final long serialVersionUID = -6649686058228455825L;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java b/src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java
@@ -15,9 +15,9 @@
 import org.woehlke.simpleworklist.task.TaskTime;
 import org.woehlke.simpleworklist.context.ContextService;
 import org.woehlke.simpleworklist.project.ProjectService;
-import org.woehlke.simpleworklist.user.messages.User2UserMessageService;
+import org.woehlke.simpleworklist.user.chat.User2UserMessageService;
 import org.woehlke.simpleworklist.user.account.UserAccountService;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.testdata;
+package org.woehlke.simpleworklist.application.testdata;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataService.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.testdata;
+package org.woehlke.simpleworklist.application.testdata;
 
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceImpl.java
@@ -1,8 +1,6 @@
-package org.woehlke.simpleworklist.testdata;
+package org.woehlke.simpleworklist.application.testdata;
 
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java b/src/main/java/org/woehlke/simpleworklist/application/testdata/TestDataServiceTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.testdata;
+package org.woehlke.simpleworklist.application.testdata;
 
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/context/ContextController.java b/src/main/java/org/woehlke/simpleworklist/context/ContextController.java
@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.application.common.AbstractController;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -16,7 +16,7 @@
 import org.woehlke.simpleworklist.task.*;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import javax.validation.Valid;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java
@@ -16,7 +16,7 @@
 import org.woehlke.simpleworklist.application.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.task.*;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import javax.validation.Valid;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerService.java
@@ -3,7 +3,7 @@
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import java.util.Locale;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectControllerServiceImpl.java
@@ -8,7 +8,7 @@
 import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbService;
 import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import javax.validation.constraints.Min;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectRepository.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectRepository.java
@@ -9,14 +9,6 @@
 @Repository
 public interface ProjectRepository extends JpaRepository<Project, Long> {
 
-    List<Project> findByParentIsNull();
-
-    //@Deprecated
-    //List<Project> findByParentIsNullAndUserAccount(UserAccount userAccount);
-
-    //@Deprecated
-    //List<Project> findByUserAccount(UserAccount userAccount);
-
     List<Project> findByContext(Context context);
 
     List<Project> findByParentIsNullAndContext(Context context);
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java
@@ -7,8 +7,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchController.java b/src/main/java/org/woehlke/simpleworklist/search/SearchController.java
@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.woehlke.simpleworklist.application.common.AbstractController;
 import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 import org.woehlke.simpleworklist.context.Context;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerService.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerService.java
@@ -3,7 +3,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.ui.Model;
 import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import java.util.Locale;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateControllerServiceImpl.java
@@ -11,7 +11,7 @@
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.project.ProjectService;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import javax.validation.constraints.NotNull;
 import java.util.Locale;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTabController.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.application.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import java.util.Locale;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskStateTaskController.java
@@ -11,7 +11,7 @@
 import org.woehlke.simpleworklist.application.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.account.UserAccount;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java
@@ -14,10 +14,10 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.user.messages.User2UserMessage;
+import org.woehlke.simpleworklist.user.chat.User2UserMessage;
 import org.woehlke.simpleworklist.application.language.Language;
 import org.woehlke.simpleworklist.context.ContextRepository;
-import org.woehlke.simpleworklist.user.messages.User2UserMessageRepository;
+import org.woehlke.simpleworklist.user.chat.User2UserMessageRepository;
 
 @Slf4j
 @Service("userAccountService")
diff --git a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessage.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessage.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.messages;
+package org.woehlke.simpleworklist.user.chat;
 
 import lombok.*;
 import org.hibernate.validator.constraints.Length;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.messages;
+package org.woehlke.simpleworklist.user.chat;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -15,7 +15,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.application.common.AbstractController;
 import org.woehlke.simpleworklist.application.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageFormBean.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageFormBean.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.messages;
+package org.woehlke.simpleworklist.user.chat;
 
 
 import lombok.*;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageRepository.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageRepository.java
@@ -1,12 +1,11 @@
-package org.woehlke.simpleworklist.user.messages;
+package org.woehlke.simpleworklist.user.chat;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import org.woehlke.simpleworklist.user.messages.User2UserMessage;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 
 import java.util.List;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageService.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.messages;
+package org.woehlke.simpleworklist.user.chat;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceImpl.java
@@ -1,8 +1,6 @@
-package org.woehlke.simpleworklist.user.messages;
+package org.woehlke.simpleworklist.user.chat;
 
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java b/src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java
@@ -21,13 +21,17 @@
  */
 @Slf4j
 @Component
-public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler implements AuthenticationSuccessHandler {
+public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler
+    implements AuthenticationSuccessHandler {
 
     private final UserAccountLoginSuccessService userAccountLoginSuccessService;
     private final LocaleResolver localeResolver;
 
     @Autowired
-    public LoginSuccessHandler(UserAccountLoginSuccessService userAccountLoginSuccessService, LocaleResolver localeResolver) {
+    public LoginSuccessHandler(
+        UserAccountLoginSuccessService userAccountLoginSuccessService,
+        LocaleResolver localeResolver
+    ) {
         super();
         this.userAccountLoginSuccessService = userAccountLoginSuccessService;
         this.localeResolver = localeResolver;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java b/src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java
@@ -28,7 +28,10 @@ public class UserLoginController {
     private final UserAccountAccessService userAccountAccessService;
 
     @Autowired
-    public UserLoginController(UserAccountLoginSuccessService userAccountLoginSuccessService, UserAccountAccessService userAccountAccessService) {
+    public UserLoginController(
+        UserAccountLoginSuccessService userAccountLoginSuccessService,
+        UserAccountAccessService userAccountAccessService
+    ) {
         this.userAccountLoginSuccessService = userAccountLoginSuccessService;
         this.userAccountAccessService = userAccountAccessService;
     }
@@ -41,7 +44,7 @@ public UserLoginController(UserAccountLoginSuccessService userAccountLoginSucces
      * @return Login Screen.
      */
     @RequestMapping(path = "/login", method = RequestMethod.GET)
-    public final String loginForm(Model model) {
+    public final String loginGet(Model model) {
         log.info("loginForm");
         LoginForm loginForm = new LoginForm();
         model.addAttribute("loginForm", loginForm);
@@ -57,7 +60,7 @@ public final String loginForm(Model model) {
      * @return Shows Root Project after successful login or login form with error messages.
      */
     @RequestMapping(path = "/login", method = RequestMethod.POST)
-    public final String loginPerform(
+    public final String loginPost(
         @Valid LoginForm loginForm,
         BindingResult result,
         Model model
@@ -68,13 +71,16 @@ public final String loginPerform(
             UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser();
             userAccountLoginSuccessService.updateLastLoginTimestamp(user);
             log.info("logged in");
-            return "redirect:/";
+            return "redirect:/home";
         } else {
             String objectName = "loginForm";
             String field = "userEmail";
             String defaultMessage = "Email or Password wrong.";
-            FieldError e = new FieldError(objectName, field, defaultMessage);
-            result.addError(e);
+            FieldError fieldError = new FieldError(objectName, field, defaultMessage);
+            result.addError(fieldError);
+            field = "userPassword";
+            fieldError = new FieldError(objectName, field, defaultMessage);
+            result.addError(fieldError);
             log.info("not logged in");
             return "user/login/loginForm";
         }
@@ -92,6 +98,6 @@ public String logoutPage (
             new SecurityContextLogoutHandler().logout(request, response, auth);
         }
         status.setComplete();
-        return "redirect:/";
+        return "redirect:/home";
     }
 }
diff --git a/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java
@@ -24,7 +24,7 @@
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.application.language.Language;
 import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
-import org.woehlke.simpleworklist.session.UserSessionBean;
+import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import javax.validation.Valid;
 import java.util.List;
diff --git a/src/main/java/org/woehlke/simpleworklist/user/session/UserSessionBean.java b/src/main/java/org/woehlke/simpleworklist/user/session/UserSessionBean.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.session;
+package org.woehlke.simpleworklist.user.session;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
diff --git a/src/test/java/org/woehlke/simpleworklist/testdata/TestDataControllerTest.java b/src/test/java/org/woehlke/simpleworklist/testdata/TestDataControllerTest.java
diff --git a/src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.user.chat;
+
+public class User2UserMessageControllerTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/chat/User2UserMessageServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.user.chat;
+
+public class User2UserMessageServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageControllerTest.java
diff --git a/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.woehlke.simpleworklist.testdata;`
	`1`	`+package org.woehlke.simpleworklist.application.testdata;`
`2`	`2`
`3`	`3`	`import lombok.extern.slf4j.Slf4j;`
`4`	`4`	`import org.springframework.stereotype.Controller;`