From c8cfe56354bc014617c6887c17953643ff2b7df1 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 20:22:55 +0200 Subject: [PATCH 01/15] work --- .../application/pages/PagesController.java | 28 ++++++++++ src/main/resources/application.yml | 1 + src/main/resources/messages_de.properties | 1 + src/main/resources/messages_en.properties | 1 + .../templates/pages/information.html | 55 +++++++++++++++++++ .../templates/user/login/loginForm.html | 25 --------- 6 files changed, 86 insertions(+), 25 deletions(-) create mode 100644 src/main/java/org/woehlke/java/simpleworklist/application/pages/PagesController.java create mode 100644 src/main/resources/templates/pages/information.html diff --git a/src/main/java/org/woehlke/java/simpleworklist/application/pages/PagesController.java b/src/main/java/org/woehlke/java/simpleworklist/application/pages/PagesController.java new file mode 100644 index 00000000..cca75b5a --- /dev/null +++ b/src/main/java/org/woehlke/java/simpleworklist/application/pages/PagesController.java @@ -0,0 +1,28 @@ +package org.woehlke.java.simpleworklist.application.pages; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; + +import javax.validation.constraints.NotNull; +import java.util.Locale; + +@Slf4j +@Controller +@RequestMapping(path = "/") +public class PagesController { + + + @RequestMapping(path = "/information", method = RequestMethod.GET) + public final String renderPageInformation( + @NotNull @ModelAttribute("userSession") UserSessionBean userSession, + Locale locale, Model model + ) { + log.info("addNewTaskToInboxGet"); + return "pages/information"; + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bfa8e9b1..b1d03beb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -115,6 +115,7 @@ org: - "/user/resetPassword/**" - "/user/resetPassword/confirm/**" - "/error*" + - "/information*" logging: level: root: INFO diff --git a/src/main/resources/messages_de.properties b/src/main/resources/messages_de.properties index 3890ffa3..ece81b09 100644 --- a/src/main/resources/messages_de.properties +++ b/src/main/resources/messages_de.properties @@ -63,6 +63,7 @@ pages.chatMessages.newMessage=Neue Nachricht\: pages.chatMessages.newUserMessageButton=Sende Nachricht pages.chatMessages.showAllText1=Zeige alle Nachrichten pages.chatMessages.showAllText2=(hier werden nur die letzten 20 Angezeigt) +pages.information.h1=Informationen project.add.h1=Neues Projekt project.add.description=Beschreibung project.add.button=Neues Projekt speichern diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index 79d64788..a4de71ba 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -270,4 +270,5 @@ user.loginForm.email.placeholder=Enter your Email user.loginForm.password.label=Password user.loginForm.password.placeholder=Enter your Password user.registerSentMail.action=Please check the Inbox of your Email-Client. +pages.information.h1=Information diff --git a/src/main/resources/templates/pages/information.html b/src/main/resources/templates/pages/information.html new file mode 100644 index 00000000..070680f6 --- /dev/null +++ b/src/main/resources/templates/pages/information.html @@ -0,0 +1,55 @@ + + + + Information + + + +
+
+
+

+ + Information +

+
+
+
+ +
+
+INFORMATION PAGE +
+
+
+ For More Information please visit: + +
+
+ + GTD® and Getting Things Done® are registered trademarks of the David Allen Company. SimpleWorklist is + not affiliated with or endorsed by the David Allen Company. + +
+
+
+ + + diff --git a/src/main/resources/templates/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html index bc582db0..308e6b87 100644 --- a/src/main/resources/templates/user/login/loginForm.html +++ b/src/main/resources/templates/user/login/loginForm.html @@ -62,31 +62,6 @@

Your Todo-List for Getting Things Done -
-
- For More Information please visit: - -
-
- - GTD® and Getting Things Done® are registered trademarks of the David Allen Company. SimpleWorklist is - not affiliated with or endorsed by the David Allen Company. - -
-
From 49c4102069950893b5c220d0929763b4a94e2d73 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 20:23:49 +0200 Subject: [PATCH 02/15] work --- src/main/resources/templates/pages/information.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/templates/pages/information.html b/src/main/resources/templates/pages/information.html index 070680f6..13f6e8aa 100644 --- a/src/main/resources/templates/pages/information.html +++ b/src/main/resources/templates/pages/information.html @@ -21,9 +21,6 @@

-
-INFORMATION PAGE -
For More Information please visit: From 944af5cbe480cdb877fd87b191e749299f88756b Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 21:21:34 +0200 Subject: [PATCH 03/15] work --- .../resources/templates/layout/navbartop.html | 26 ++++--------------- .../templates/user/login/loginForm.html | 20 ++++++++------ 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/src/main/resources/templates/layout/navbartop.html b/src/main/resources/templates/layout/navbartop.html index 0302d64c..4679887b 100644 --- a/src/main/resources/templates/layout/navbartop.html +++ b/src/main/resources/templates/layout/navbartop.html @@ -20,6 +20,7 @@
- register as new user - +
+ + + register as new user + +
- - - Password forgotten? - +
+ + + Password forgotten? + +
From bff21f51cac08d82cc6160d394ed817d94b4fddc Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 21:26:20 +0200 Subject: [PATCH 04/15] [maven-release-plugin] prepare release v2.3.58 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index affe37c7..abcd29c1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.woehlke simpleworklist - 2.3.58-SNAPSHOT + 2.3.58 jar @@ -17,7 +17,7 @@ scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag} - head + v2.3.58 simpleworklist From 5330286426a207d5fbf2b2fe2bbda28e87035d88 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 21:26:25 +0200 Subject: [PATCH 05/15] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index abcd29c1..4e05012a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.woehlke simpleworklist - 2.3.58 + 2.3.59-SNAPSHOT jar @@ -17,7 +17,7 @@ scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag} - v2.3.58 + head simpleworklist From fb1a9ee9e18df8cea59d6eadacec6ed0c84946a4 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 21:51:06 +0200 Subject: [PATCH 06/15] work --- .../resources/templates/user/login/loginForm.html | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/resources/templates/user/login/loginForm.html b/src/main/resources/templates/user/login/loginForm.html index de1590a3..17dc2d6e 100644 --- a/src/main/resources/templates/user/login/loginForm.html +++ b/src/main/resources/templates/user/login/loginForm.html @@ -47,20 +47,14 @@

Your Todo-List for Getting Things Done

-
- - - register as new user + + -
-
- - - Password forgotten? + + -
From fa8dfd26e6c76fc0b3c3aac878bb8f30d494bb00 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 22:12:22 +0200 Subject: [PATCH 07/15] work --- .../resources/templates/layout/projects.html | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/resources/templates/layout/projects.html b/src/main/resources/templates/layout/projects.html index f0e88367..1c311841 100644 --- a/src/main/resources/templates/layout/projects.html +++ b/src/main/resources/templates/layout/projects.html @@ -44,21 +44,22 @@ ondrop="drop2project(event)" ondragover="allowDrop2Project(event)" draggable="true" ondragstart="dragProject(event)" - class="btn btn-dark btn-sm"> + class="m-2 btn btn-dark btn-sm"> - - - - - - + + + + + +
    From 68bd8d608da8c0c11a0494d004b0747624e11214 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 22:20:11 +0200 Subject: [PATCH 08/15] work --- .../domain/{chat => }/ChatMessageController.java | 4 +++- .../domain/{context => }/ContextController.java | 4 +++- .../{application/pages => domain}/PagesController.java | 2 +- .../domain/{project => }/ProjectIdController.java | 4 +++- .../domain/{project => }/ProjectRootController.java | 4 +++- .../simpleworklist/domain/{search => }/SearchController.java | 3 ++- .../domain/{taskworkflow => }/TaskStateTabController.java | 5 ++++- .../domain/{taskworkflow => }/TaskStateTaskController.java | 5 ++++- .../domain/{testdata => }/TestDataController.java | 3 ++- .../domain/{user/login => }/UserLoginController.java | 4 +++- .../UserPasswordRecoveryController.java | 4 +++- .../domain/{user/signup => }/UserRegistrationController.java | 5 ++++- .../accountselfservice => }/UserSelfserviceController.java | 5 ++++- 13 files changed, 39 insertions(+), 13 deletions(-) rename src/main/java/org/woehlke/java/simpleworklist/domain/{chat => }/ChatMessageController.java (96%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{context => }/ContextController.java (89%) rename src/main/java/org/woehlke/java/simpleworklist/{application/pages => domain}/PagesController.java (93%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{project => }/ProjectIdController.java (99%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{project => }/ProjectRootController.java (99%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{search => }/SearchController.java (94%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{taskworkflow => }/TaskStateTabController.java (96%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{taskworkflow => }/TaskStateTaskController.java (98%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{testdata => }/TestDataController.java (91%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{user/login => }/UserLoginController.java (94%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{user/passwordrecovery => }/UserPasswordRecoveryController.java (96%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{user/signup => }/UserRegistrationController.java (95%) rename src/main/java/org/woehlke/java/simpleworklist/domain/{user/accountselfservice => }/UserSelfserviceController.java (98%) diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ChatMessageController.java similarity index 96% rename from src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/ChatMessageController.java index ccd06b9e..e2f791ab 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ChatMessageController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.chat; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.woehlke.java.simpleworklist.application.framework.AbstractController; import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; +import org.woehlke.java.simpleworklist.domain.chat.ChatMessage; +import org.woehlke.java.simpleworklist.domain.chat.ChatMessageForm; import org.woehlke.java.simpleworklist.domain.context.Context; import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ContextController.java similarity index 89% rename from src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/ContextController.java index c3dd16cb..b32ccccd 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ContextController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.context; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.woehlke.java.simpleworklist.application.framework.AbstractController; +import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.context.ContextService; import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/java/simpleworklist/application/pages/PagesController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java similarity index 93% rename from src/main/java/org/woehlke/java/simpleworklist/application/pages/PagesController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java index cca75b5a..6d7d503d 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/application/pages/PagesController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.application.pages; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java similarity index 99% rename from src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java index b988629b..3d89b650 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.project; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -14,6 +14,8 @@ import org.woehlke.java.simpleworklist.application.framework.AbstractController; import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.project.ProjectControllerService; import org.woehlke.java.simpleworklist.domain.task.Task; import org.woehlke.java.simpleworklist.domain.task.TaskEnergy; import org.woehlke.java.simpleworklist.domain.task.TaskService; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRootController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java similarity index 99% rename from src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRootController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java index 831f270c..6df02ec0 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectRootController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.project; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.*; import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.project.Project; +import org.woehlke.java.simpleworklist.domain.project.ProjectControllerService; import org.woehlke.java.simpleworklist.domain.task.Task; import org.woehlke.java.simpleworklist.domain.task.TaskEnergy; import org.woehlke.java.simpleworklist.domain.task.TaskService; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/SearchController.java similarity index 94% rename from src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/SearchController.java index 3a1bf6af..55d8fc1b 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/SearchController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.search; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.woehlke.java.simpleworklist.application.framework.AbstractController; import org.woehlke.java.simpleworklist.domain.context.Context; +import org.woehlke.java.simpleworklist.domain.search.SearchService; import org.woehlke.java.simpleworklist.domain.search.result.SearchResult; import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb; import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java similarity index 96% rename from src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java index eff7f2b8..a6475dce 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.taskworkflow; +package org.woehlke.java.simpleworklist.domain; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; @@ -14,6 +14,9 @@ import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; import lombok.extern.slf4j.Slf4j; +import org.woehlke.java.simpleworklist.domain.taskworkflow.MoveTaskToTaskInTaskstateService; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; + import javax.validation.constraints.NotNull; import java.util.Locale; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java similarity index 98% rename from src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java index 663b91a0..04eec994 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.taskworkflow; +package org.woehlke.java.simpleworklist.domain; import org.springframework.stereotype.Controller; @@ -14,6 +14,9 @@ import org.woehlke.java.simpleworklist.domain.task.TaskEnergy; import org.woehlke.java.simpleworklist.domain.task.TaskService; import org.woehlke.java.simpleworklist.domain.task.TaskTime; +import org.woehlke.java.simpleworklist.domain.taskworkflow.MoveTaskToTaskInTaskstateService; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; +import org.woehlke.java.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService; import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import org.woehlke.java.simpleworklist.application.framework.AbstractController; import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/TestDataController.java similarity index 91% rename from src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/TestDataController.java index e83ab96a..5728f18d 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/TestDataController.java @@ -1,9 +1,10 @@ -package org.woehlke.java.simpleworklist.domain.testdata; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.woehlke.java.simpleworklist.domain.testdata.TestDataService; import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserLoginController.java similarity index 94% rename from src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/UserLoginController.java index 14e5b8ed..58e76662 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserLoginController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.user.login; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -18,6 +18,8 @@ import org.springframework.web.bind.support.SessionStatus; import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService; import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.login.LoginForm; +import org.woehlke.java.simpleworklist.domain.user.login.UserAccountLoginSuccessService; @Slf4j @Controller diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java similarity index 96% rename from src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java index f7b5ced1..3bdbbea3 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.user.passwordrecovery; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -11,6 +11,8 @@ import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService; import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm; import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery; +import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService; import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationForm; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java similarity index 95% rename from src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java index e288bac8..1293de2f 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.user.signup; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -11,6 +11,9 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService; import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationForm; +import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationService; import javax.validation.Valid; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java b/src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java similarity index 98% rename from src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java rename to src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java index 97112e6c..e9f48014 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java @@ -1,4 +1,4 @@ -package org.woehlke.java.simpleworklist.domain.user.accountselfservice; +package org.woehlke.java.simpleworklist.domain; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +24,9 @@ import org.woehlke.java.simpleworklist.domain.context.Context; import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; +import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangeDefaultContextForm; +import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangeNameForm; +import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm; import javax.validation.Valid; import java.util.List; From 0d59d3737cffb361ac9980942d58022ba7189358 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 23:07:43 +0200 Subject: [PATCH 09/15] work --- .../domain/breadcrumb/BreadcrumbService.java | 7 --- .../breadcrumb/BreadcrumbServiceImpl.java | 31 ------------- .../domain/chat/ChatMessage.java | 1 - .../domain/chat/ChatMessageForm.java | 2 - .../domain/chat/ChatMessageRepository.java | 9 ---- .../domain/context/Context.java | 5 -- .../domain/context/ContextRepository.java | 1 - .../domain/context/NewContextForm.java | 3 -- .../domain/project/Project.java | 4 -- .../java/simpleworklist/domain/task/Task.java | 17 +------ .../domain/task/TaskRepository.java | 46 ------------------- .../domain/task/TaskServiceImpl.java | 17 ------- .../access/UserAuthorizationServiceImpl.java | 1 - 13 files changed, 1 insertion(+), 143 deletions(-) diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java index 3e7e79ab..bcd79df5 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java @@ -2,7 +2,6 @@ import org.woehlke.java.simpleworklist.domain.context.Context; import org.woehlke.java.simpleworklist.domain.project.Project; -import org.woehlke.java.simpleworklist.domain.task.Task; import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; import org.woehlke.java.simpleworklist.domain.session.UserSessionBean; @@ -16,12 +15,6 @@ public interface BreadcrumbService { Breadcrumb getBreadcrumbForTaskstate(TaskState taskstate, Locale locale, UserSessionBean userSession); - Breadcrumb getBreadcrumbForTaskstateAll(Locale locale, UserSessionBean userSession); - - Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale, UserSessionBean userSession); - - Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale local, UserSessionBean userSession); - Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale,UserSessionBean userSession); Breadcrumb getBreadcrumbForUserChangeName(Locale locale, UserSessionBean userSession); diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java index a7bb1c5b..be7c3b99 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java @@ -85,37 +85,6 @@ public Breadcrumb getBreadcrumbForTaskstate( return breadcrumb; } - @Override - public Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale, UserSessionBean userSession) { - log.info("getBreadcrumbForTaskInTaskstate"); - Optional context = contextService.getContextFor(userSession); - Breadcrumb breadcrumb = new Breadcrumb(locale, context.get()); - breadcrumb.addTaskstate(taskstate); - breadcrumb.addTask(task); - return breadcrumb; - } - - @Override - public Breadcrumb getBreadcrumbForTaskstateAll(Locale locale, UserSessionBean userSession) { - log.info("getBreadcrumbForTaskstateAll"); - Optional context = contextService.getContextFor(userSession); - Breadcrumb breadcrumb = new Breadcrumb(locale, context.get()); - String code="layout.page.all"; - String name= messageSource.getMessage(code,null,locale); - String url="/taskstate/all"; - breadcrumb.addPage(name,url); - return breadcrumb; - } - - @Override - public Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale locale, UserSessionBean userSession) { - log.info("getBreadcrumbForTaskInProject"); - Breadcrumb breadcrumb = new Breadcrumb(locale,thisProject.getContext()); - breadcrumb.addProject(thisProject); - breadcrumb.addTask(task); - return breadcrumb; - } - @Override public Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale, UserSessionBean userSession) { log.info("getBreadcrumbForUserProfileAndMenu"); diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java index 035519cf..856df9a6 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java @@ -47,7 +47,6 @@ public class ChatMessage extends AuditModel implements Serializable { ) private Long id; - //@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT) @NotBlank @Length(min=1,max=65535) @Column(name="message_text", nullable = false, length = 65535, columnDefinition="text") diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java index cc81dbc8..f413576c 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java @@ -3,7 +3,6 @@ import lombok.*; import org.hibernate.validator.constraints.Length; -//import org.hibernate.validator.constraints.SafeHtml; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -18,7 +17,6 @@ public class ChatMessageForm implements Serializable { private static final long serialVersionUID = 1576610181966480168L; - //@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT) @NotBlank @Length(min=1,max=65535) private String messageText; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java index 910e562b..0b30f667 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java @@ -33,17 +33,8 @@ List findByReceiverAndReadByReceiver( boolean readByReceiver ); - Page findByReceiverAndReadByReceiver( - UserAccount receiver, - boolean readByReceiver, - Pageable request - ); - List findBySenderAndReceiverAndReadByReceiver( UserAccount sender, UserAccount receiver, boolean readByReceiver ); - Page findBySenderAndReceiverAndReadByReceiver( - UserAccount sender, UserAccount receiver, boolean readByReceiver, Pageable request - ); } diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java index 9ccdee00..30368a00 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java @@ -4,7 +4,6 @@ import org.hibernate.annotations.LazyToOne; import org.hibernate.validator.constraints.Length; -//import org.hibernate.validator.constraints.SafeHtml; import org.woehlke.java.simpleworklist.application.framework.AuditModel; import org.woehlke.java.simpleworklist.application.framework.ComparableById; import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; @@ -62,14 +61,10 @@ public class Context extends AuditModel implements Serializable, ComparableById< @LazyToOne(PROXY) private UserAccount userAccount; - //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) - //@NotBlank @Length(min = 1, max = 255) @Column(name = "name_de", nullable = false) private String nameDe; - //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) - //@NotBlank @Length(min = 1, max = 255) @Column(name = "name_en", nullable = false) private String nameEn; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java index 83736d17..1bc56f3a 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java @@ -15,7 +15,6 @@ public interface ContextRepository extends JpaRepository { List findByUserAccount(UserAccount user); - Page findByUserAccount(UserAccount user, Pageable pageRequest); Context findByIdAndUserAccount(long newContextId, UserAccount userAccount); diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java b/src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java index 75818973..64474510 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java @@ -3,7 +3,6 @@ import lombok.*; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; -//import org.hibernate.validator.constraints.SafeHtml; import java.io.Serializable; @@ -20,12 +19,10 @@ public class NewContextForm implements Serializable { private static final long serialVersionUID = -937143305653156981L; - //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) @NotBlank @Length(min = 1, max = 255) private String nameDe; - //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) @NotBlank @Length(min = 1, max = 255) private String nameEn; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java b/src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java index f421f7f2..426375a6 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java @@ -16,7 +16,6 @@ import org.hibernate.annotations.OnDeleteAction; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; -//import org.hibernate.validator.constraints.SafeHtml; import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; import org.woehlke.java.simpleworklist.domain.context.Context; import org.woehlke.java.simpleworklist.application.framework.AuditModel; @@ -80,13 +79,11 @@ public class Project extends AuditModel implements Serializable, ComparableById< @OnDelete(action = OnDeleteAction.NO_ACTION) private Context context; - //@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE) @NotBlank @Length(min = 1, max = 255) @Column(name = "name", nullable = false) private String name; - //@SafeHtml(whitelistType= SafeHtml.WhiteListType.RELAXED) @Length(min = 0, max = 65535) @Column(name = "description", nullable = true, length = 65535, columnDefinition = "text") private String description; @@ -147,7 +144,6 @@ public boolean equalsByUuid(Project otherObject) { public static Project newProjectFactoryForParentProject(Project parent) { Project thisProject = new Project(); thisProject.setUuid(UUID.randomUUID()); - //thisProject.setName("name"); thisProject.setParent(parent); thisProject.setContext(parent.getContext()); return thisProject; diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java index 4383af16..78ccc85b 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/Task.java @@ -10,10 +10,6 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; -//import org.hibernate.annotations.*; -//import org.hibernate.annotations.CascadeType; -//import org.hibernate.annotations.NamedQueries; -//import org.hibernate.annotations.NamedQuery; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -27,8 +23,6 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -//import org.hibernate.validator.constraints.SafeHtml; -//import org.springframework.data.jpa.repository.Temporal; import org.springframework.format.annotation.DateTimeFormat; import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState; import org.woehlke.java.simpleworklist.domain.user.account.UserAccount; @@ -48,15 +42,7 @@ @UniqueConstraint( name="ux_task", columnNames = {"uuid", "context_id" } - )/*, - @UniqueConstraint( - name="ux_task_order_id_project", - columnNames = {"order_id_project", "project_id", "context_id", "user_account_id"} - ), - @UniqueConstraint( - name="ux_task_order_id_task_state", - columnNames = {"order_id_task_state", "task_state", "context_id", "user_account_id"} - )*/ + ) }, indexes = { @Index(name = "ix_task_uuid", columnList = "uuid"), @@ -153,7 +139,6 @@ public class Task extends AuditModel implements Serializable, ComparableById { Page findByProjectIsNullAndContext(Context context, Pageable request); List findByContext(Context context); - Page findByContext(Context context, Pageable pageable); Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState taskState, Context context); Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context context); @@ -36,14 +35,7 @@ public interface TaskRepository extends JpaRepository { List findByTaskStateAndContextOrderByOrderIdTaskStateAsc( TaskState taskState, Context context ); - Page findByTaskStateAndContextOrderByOrderIdTaskStateAsc( - TaskState taskState, Context context, Pageable request - ); - //TODO: #249 move the JQL Query-String to Entity as Prepared Statement - //@Query("select t from Task t" - // + " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState" - // + " and t.taskState = :taskState and t.context = :context") @Query(name="queryGetTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask") List getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask( @Param("lowerOrderIdTaskState") long lowerOrderIdTaskState, @@ -52,17 +44,6 @@ List getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask( @Param("context") Context context ); - //TODO: #249 move the JQL Query-String to Entity as Prepared Statement - @Query(name="queryGetTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask") - Page getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask( - @Param("lowerOrderIdTaskState") long lowerOrderIdTaskState, - @Param("higherOrderIdTaskState") long higherOrderIdTaskState, - @Param("taskState") TaskState taskState, - @Param("context") Context context, - Pageable request - ); - - //TODO: #249 move the JQL Query-String to Entity as Prepared Statement @Query(name="queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask") List getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask( @Param("lowerOrderIdProject") long lowerOrderIdProject, @@ -70,22 +51,6 @@ List getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask( @Param("project") Project project ); - //TODO: #249 move the JQL Query-String to Entity as Prepared Statement - //@Query("select t from Task t" - // + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject" - // + " and t.project = :project") - @Query(name="queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask") - Page getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask( - @Param("lowerOrderIdProject") long lowerOrderIdProject, - @Param("higherOrderIdProject") long higherOrderIdProject, - @Param("project") Project project, - Pageable request - ); - - //TODO: #249 move the JQL Query-String to Entity as Prepared Statement - //@Query("select t from Task t" - // + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject" - // + " and t.project is null and t.context = :context ") @Query(name = "queryGetTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask") List getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask( @Param("lowerOrderIdProject") long lowerOrderIdProject, @@ -93,16 +58,5 @@ List getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask( @Param("context") Context context ); - //TODO: #249 move the JQL Query-String to Entity as Prepared Statement - //@Query("select t from Task t" - // + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject" - // + " and t.project is null and t.context = :context ") - @Query(name = "queryGetTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask") - Page getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask( - @Param("lowerOrderIdProject") long lowerOrderIdProject, - @Param("higherOrderIdProject") long higherOrderIdProject, - @Param("context") Context context, - Pageable request - ); } diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java index c60a7486..0c752958 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java @@ -89,8 +89,6 @@ public Task findOne(@Min(1L) long taskId) { @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) public Task updatedViaTaskstate(@NotNull Task task) { log.info("updatedViaTaskstate"); - //long maxOrderIdTaskState = this.getMaxOrderIdTaskState(task.getTaskState(),task.getContext()); - //task.setOrderIdTaskState(++maxOrderIdTaskState); task = taskRepository.saveAndFlush(task); log.info("persisted: " + task.outTaskstate()); return task; @@ -100,8 +98,6 @@ public Task updatedViaTaskstate(@NotNull Task task) { @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) public Task updatedViaProject(@NotNull Task task) { log.info("updatedViaProject"); - //long maxOrderIdProject = this.getMaxOrderIdProject(task.getProject(), task.getContext()); - //task.setOrderIdProject(++maxOrderIdProject); task = taskRepository.saveAndFlush(task); log.info("persisted Task: " + task.outProject()); return task; @@ -111,8 +107,6 @@ public Task updatedViaProject(@NotNull Task task) { @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false) public Task updatedViaProjectRoot(@NotNull Task task) { log.info("updatedViaProject"); - //long maxOrderIdProject = this.getMaxOrderIdProjectRoot(task.getContext()); - //task.setOrderIdProject(++maxOrderIdProject); task = taskRepository.saveAndFlush(task); log.info("persisted Task: " + task.outProject()); return task; @@ -332,14 +326,11 @@ public void moveTasksUpByProjectRoot(@NotNull Task sourceTask, @NotNull Task des Context context = sourceTask.getContext(); long lowerOrderIdProject = destinationTask.getOrderIdProject(); long higherOrderIdProject = sourceTask.getOrderIdProject(); - //TODO: #244 change List to Page - //noinspection deprecation List tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask( lowerOrderIdProject, higherOrderIdProject, context ); - //TODO: #244 change List to Page List tasksMoved = new ArrayList<>(tasks.size()+2); for(Task task:tasks){ task.moveUpByProject(); @@ -366,14 +357,11 @@ public void moveTasksDownByProjectRoot(@NotNull Task sourceTask, @NotNull Task d Context context = sourceTask.getContext(); final long lowerOrderIdProject = sourceTask.getOrderIdProject(); final long higherOrderIdProject = destinationTask.getOrderIdProject(); - //TODO: #244 change List to Page - //noinspection deprecation List tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask( lowerOrderIdProject, higherOrderIdProject, context ); - //TODO: #244 change List to Page List tasksMoved = new ArrayList<>(tasks.size()+2); for(Task task:tasks){ task.moveDownByProject(); @@ -401,14 +389,11 @@ public void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destina log.info("-------------------------------------------------------------------------------"); long lowerOrderIdProject = destinationTask.getOrderIdProject(); long higherOrderIdProject = sourceTask.getOrderIdProject(); - //TODO: #244 change List to Page - //noinspection deprecation List tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask( lowerOrderIdProject, higherOrderIdProject, project ); - //TODO: #244 change List to Page List tasksMoved = new ArrayList<>(tasks.size()+2); for(Task task:tasks){ task.moveUpByProject(); @@ -437,13 +422,11 @@ public void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task desti log.info("-------------------------------------------------------------------------------"); final long lowerOrderIdProject = sourceTask.getOrderIdProject(); final long higherOrderIdProject = destinationTask.getOrderIdProject(); - //TODO: #244 change List to Page List tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask( lowerOrderIdProject, higherOrderIdProject, project ); - //TODO: #244 change List to Page List tasksMoved = new ArrayList<>(tasks.size()+2); for(Task task:tasks){ task.moveDownByProject(); diff --git a/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java index d08a8ac3..c4b8f7bc 100644 --- a/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java +++ b/src/main/java/org/woehlke/java/simpleworklist/domain/user/access/UserAuthorizationServiceImpl.java @@ -31,7 +31,6 @@ public UserAuthorizationServiceImpl( ) { this.userAccountRepository = userAccountRepository; this.authenticationManager = authenticationManager; - //TODO: int strength = 10; this.encoder = new BCryptPasswordEncoder(strength); } From dad08bdcdba826c982f0424d0c081d1023de1788 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 23:08:57 +0200 Subject: [PATCH 10/15] [maven-release-plugin] prepare release v2.3.59 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4e05012a..0aa7d18d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.woehlke simpleworklist - 2.3.59-SNAPSHOT + 2.3.59 jar @@ -17,7 +17,7 @@ scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag} - head + v2.3.59 simpleworklist From 29bc4ffae59e24039862dfbcbddfb70fe7d676db Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 23:09:02 +0200 Subject: [PATCH 11/15] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0aa7d18d..9143b226 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.woehlke simpleworklist - 2.3.59 + 2.3.60-SNAPSHOT jar @@ -17,7 +17,7 @@ scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag} - v2.3.59 + head simpleworklist From 948e6dd08cc4d3ce011420159915484578f7cc57 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 23:41:52 +0200 Subject: [PATCH 12/15] work --- pom.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pom.xml b/pom.xml index 9143b226..361b7a7c 100644 --- a/pom.xml +++ b/pom.xml @@ -1322,6 +1322,11 @@ maven-failsafe-plugin ${maven-failsafe-plugin.version} + + com.heroku.sdk + heroku-maven-plugin + 3.0.3 + @@ -1457,6 +1462,7 @@ org.apache.maven.plugins maven-dependency-plugin + report site @@ -1611,6 +1618,14 @@ --> + + copy-dependencies + package + copy-dependencies + + compile + + @@ -1716,6 +1731,10 @@ + + com.heroku.sdk + heroku-maven-plugin + org.asciidoctor asciidoctor-maven-plugin From d7db2fe4d00d3f35f17da7310b82bfa9206c2162 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 23:52:20 +0200 Subject: [PATCH 13/15] work --- pom.xml | 61 --------------------------------------------------------- 1 file changed, 61 deletions(-) diff --git a/pom.xml b/pom.xml index 361b7a7c..8967a8f7 100644 --- a/pom.xml +++ b/pom.xml @@ -1259,58 +1259,6 @@ org.apache.maven.plugins maven-site-plugin ${version.maven-site-plugin} - org.apache.maven.plugins @@ -1322,11 +1270,6 @@ maven-failsafe-plugin ${maven-failsafe-plugin.version} - - com.heroku.sdk - heroku-maven-plugin - 3.0.3 - @@ -1731,10 +1674,6 @@ - - com.heroku.sdk - heroku-maven-plugin - org.asciidoctor asciidoctor-maven-plugin From f1af48465da2b8bcac0071303c396ec865713285 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 23:53:04 +0200 Subject: [PATCH 14/15] [maven-release-plugin] prepare release v2.3.60 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8967a8f7..3ed7e1bb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.woehlke simpleworklist - 2.3.60-SNAPSHOT + 2.3.60 jar @@ -17,7 +17,7 @@ scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag} - head + v2.3.60 simpleworklist From f4168b0057588be2a2fc12a613798fbaef0c1028 Mon Sep 17 00:00:00 2001 From: thomaswoehlke Date: Thu, 25 Aug 2022 23:53:07 +0200 Subject: [PATCH 15/15] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3ed7e1bb..f4679547 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.woehlke simpleworklist - 2.3.60 + 2.3.61-SNAPSHOT jar @@ -17,7 +17,7 @@ scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag} - v2.3.60 + head simpleworklist