work

Author: thomaswoehlke

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

@@ -46,7 +46,13 @@ public class ProjectIdController extends AbstractController {
   private final BreadcrumbService breadcrumbService;
 
   @Autowired
-  public ProjectIdController(ProjectControllerService projectControllerService, TaskMoveService taskMoveService, TaskService taskService, ContextService contextService, BreadcrumbService breadcrumbService) {
+  public ProjectIdController(
+      ProjectControllerService projectControllerService,
+      TaskMoveService taskMoveService,
+      TaskService taskService,
+      ContextService contextService,
+      BreadcrumbService breadcrumbService
+  ) {
     this.projectControllerService = projectControllerService;
     this.taskMoveService = taskMoveService;
     this.taskService = taskService;

src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdTaskController.java

@@ -41,7 +41,13 @@ public class ProjectIdTaskController extends AbstractController {
   private final ContextService contextService;
 
   @Autowired
-  public ProjectIdTaskController(ProjectControllerService projectControllerService, ProjectService projectService, TaskLifecycleService taskLifecycleService, BreadcrumbService breadcrumbService, ContextService contextService) {
+  public ProjectIdTaskController(
+      ProjectControllerService projectControllerService,
+      ProjectService projectService,
+      TaskLifecycleService taskLifecycleService,
+      BreadcrumbService breadcrumbService,
+      ContextService contextService
+  ) {
     this.projectControllerService = projectControllerService;
     this.projectService = projectService;
     this.taskLifecycleService = taskLifecycleService;

src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootTaskController.java

@@ -43,7 +43,11 @@ public class ProjectRootTaskController extends AbstractController {
   private final BreadcrumbService breadcrumbService;
 
   @Autowired
-  public ProjectRootTaskController(ProjectControllerService projectControllerService, TaskLifecycleService taskLifecycleService, BreadcrumbService breadcrumbService) {
+  public ProjectRootTaskController(
+      ProjectControllerService projectControllerService,
+      TaskLifecycleService taskLifecycleService,
+      BreadcrumbService breadcrumbService
+  ) {
     this.projectControllerService = projectControllerService;
     this.taskLifecycleService = taskLifecycleService;
     this.breadcrumbService = breadcrumbService;
@@ -65,7 +69,6 @@ public final String projectRootTaskAddGet(
     thisTask.setTaskTime(TaskTime.NONE);
     thisTask.unsetFocus();
     Boolean mustChooseContext = false;
-
     Context projectsContext;
     if(userSession.getLastContextId() == 0L){
       mustChooseContext = true;
@@ -78,7 +81,8 @@ public final String projectRootTaskAddGet(
     List<Project> rootProjects = projectControllerService.findRootProjectsByContext(context);
     Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShoProjectId(thisProject,locale,userSession);
     model.addAttribute("breadcrumb", breadcrumb);
-    model.addAttribute("mustChooseContext", mustChooseContext); //TODO: rename mustChooseArea -> mustChooseContext
+    //TODO: rename mustChooseArea -> mustChooseContext
+    model.addAttribute("mustChooseContext", mustChooseContext);
     model.addAttribute("thisProject", null);
     model.addAttribute("thisProjectId", thisProject.getId());
     model.addAttribute("breadcrumb", breadcrumb);

src/main/java/org/woehlke/java/simpleworklist/domain/TaskLifecycleController.java

@@ -42,7 +42,11 @@ public class TaskLifecycleController extends AbstractController {
     private final ContextService contextService;
 
     @Autowired
-    public TaskLifecycleController(TaskLifecycleService taskLifecycleService, BreadcrumbService breadcrumbService, ContextService contextService) {
+    public TaskLifecycleController(
+        TaskLifecycleService taskLifecycleService,
+        BreadcrumbService breadcrumbService,
+        ContextService contextService
+    ) {
       this.taskLifecycleService = taskLifecycleService;
       this.breadcrumbService = breadcrumbService;
       this.contextService = contextService;

src/main/java/org/woehlke/java/simpleworklist/domain/UserChatMessageController.java

@@ -41,7 +41,10 @@ public class UserChatMessageController extends AbstractController {
   private final BreadcrumbService breadcrumbService;
 
   @Autowired
-  public UserChatMessageController(UserChatMessageControllerService userChatMessageControllerService, BreadcrumbService breadcrumbService) {
+  public UserChatMessageController(
+      UserChatMessageControllerService userChatMessageControllerService,
+      BreadcrumbService breadcrumbService
+  ) {
     this.userChatMessageControllerService = userChatMessageControllerService;
     this.breadcrumbService = breadcrumbService;
   }
@@ -69,9 +72,8 @@ public final String getLastMessagesBetweenCurrentAndOtherUser(
     log.info(chatMessageForm.toString());
     log.info("-----------------------------------------------------------------------------------------------");
     log.info("Page<UserAccountChatMessage> user2UserMessagePage");
-    Page<UserAccountChatMessage> user2UserMessagePage = userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(
-      thisUser, otherUser, request
-    );
+    Page<UserAccountChatMessage> user2UserMessagePage =
+        userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(thisUser, otherUser, request);
     for (UserAccountChatMessage o : user2UserMessagePage) {
       log.info(o.toString());
     }
@@ -112,7 +114,8 @@ public final String sendNewMessageToOtherUser(
       for (ObjectError objectError : result.getAllErrors()) {
         log.info("result.hasErrors: " + objectError.toString());
       }
-      Page<UserAccountChatMessage> user2UserMessagePage = userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(thisUser, otherUser, request);
+      Page<UserAccountChatMessage> user2UserMessagePage =
+          userChatMessageControllerService.readAllMessagesBetweenCurrentAndOtherUser(thisUser, otherUser, request);
       model.addAttribute("otherUser", otherUser);
       model.addAttribute("user2UserMessagePage", user2UserMessagePage);
       model.addAttribute("userSession", userSession);

src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java

@@ -29,7 +29,10 @@ public class UserPasswordRecoveryController {
     private final UserAccountPasswordRecoveryService userAccountPasswordRecoveryService;
 
     @Autowired
-    public UserPasswordRecoveryController(UserAccountService userAccountService, UserAccountPasswordRecoveryService userAccountPasswordRecoveryService) {
+    public UserPasswordRecoveryController(
+        UserAccountService userAccountService,
+        UserAccountPasswordRecoveryService userAccountPasswordRecoveryService
+    ) {
         this.userAccountService = userAccountService;
         this.userAccountPasswordRecoveryService = userAccountPasswordRecoveryService;
     }
@@ -102,7 +105,8 @@ public final String enterNewPasswordFormular(
         @PathVariable String confirmId,
         Model model
     ) {
-        UserAccountPasswordRecovery oUserAccountPasswordRecovery = userAccountPasswordRecoveryService.findByToken(confirmId);
+        UserAccountPasswordRecovery oUserAccountPasswordRecovery =
+            userAccountPasswordRecoveryService.findByToken(confirmId);
         if (oUserAccountPasswordRecovery != null) {
             userAccountPasswordRecoveryService.passwordRecoveryClickedInEmail(oUserAccountPasswordRecovery);
             UserAccount ua = userAccountService.findByUserEmail(oUserAccountPasswordRecovery.getEmail());

src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java

@@ -27,7 +27,10 @@ public class UserRegistrationController {
     private final UserAccountRegistrationService userAccountRegistrationService;
 
     @Autowired
-    public UserRegistrationController(UserAccountService userAccountService, UserAccountRegistrationService userAccountRegistrationService) {
+    public UserRegistrationController(
+        UserAccountService userAccountService,
+        UserAccountRegistrationService userAccountRegistrationService
+    ) {
         this.userAccountService = userAccountService;
         this.userAccountRegistrationService = userAccountRegistrationService;
     }
@@ -69,7 +72,11 @@ public final String registerPost(
         } else {
             userAccountRegistrationService.registrationCheckIfResponseIsInTime(userAccountRegistrationForm.getEmail());
             if (userAccountService.isEmailAvailable(userAccountRegistrationForm.getEmail())) {
-                if (userAccountRegistrationService.registrationIsRetryAndMaximumNumberOfRetries(userAccountRegistrationForm.getEmail())) {
+                boolean registrationIsRetryAndMaximumNumberOfRetries =
+                    userAccountRegistrationService.registrationIsRetryAndMaximumNumberOfRetries(
+                        userAccountRegistrationForm.getEmail()
+                    );
+                if (registrationIsRetryAndMaximumNumberOfRetries) {
                     String objectName = "userAccountRegistrationForm";
                     String field = "email";
                     String defaultMessage = "Maximum Number of Retries reached.";

src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java

@@ -49,7 +49,12 @@ public class UserSelfserviceController extends AbstractController {
     private final ContextService contextService;
 
     @Autowired
-    public UserSelfserviceController(UserAuthorizationService userAuthorizationService, BreadcrumbService breadcrumbService, UserAccountService userAccountService, ContextService contextService) {
+    public UserSelfserviceController(
+        UserAuthorizationService userAuthorizationService,
+        BreadcrumbService breadcrumbService,
+        UserAccountService userAccountService,
+        ContextService contextService
+    ) {
         this.userAuthorizationService = userAuthorizationService;
         this.breadcrumbService = breadcrumbService;
         this.userAccountService = userAccountService;