refactoring of java classes

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageRepository.java

@@ -17,7 +17,7 @@
 public interface ChatMessageRepository extends JpaRepository<ChatMessage, Long> {
 
     //TODO: #247 move the JQL Query-String to Entity as Prepared Statement
-    String JQL = "select m from User2UserMessage m "
+    String JQL = "select m from ChatMessage m "
     + "where (m.sender = :thisUser and m.receiver = :otherUser) "
     + "or (m.sender = :otherUser and m.receiver = :thisUser)";
 

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

@@ -92,7 +92,7 @@ public final String addNewTaskToInboxPost(
             }
             Boolean mustChooseArea = false;
             task.setContext(context);
-            Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(TaskState.INBOX,locale, userSession);
+            Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(TaskState.INBOX, locale, userSession);
             model.addAttribute("mustChooseArea", mustChooseArea);
             model.addAttribute("breadcrumb", breadcrumb);
             model.addAttribute("task", task);

src/main/resources/application.yml

@@ -6,7 +6,7 @@ server:
     enabled: false
     min-response-size: 2048
   servlet:
-    context-path: "/simpleworklist"
+    context-path: "/"
 spring:
   config:
     name: simpleworklist

src/main/resources/templates/taskstate/completed.html

@@ -34,7 +34,7 @@ <h1 class="col-md-12 mb-12">
              th:if="${message} != null" id="mytwcontent-message">
         </div>
         <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='COMPLETED', myUrlPath='/taskstate')">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='COMPLETED',myUrlPath=@{/taskstate})">
             </div>
         </div>
         <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

src/main/resources/templates/taskstate/focus.html

@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
         <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
         </div>
         <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='FOCUS', myUrlPath='/taskstate')">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='FOCUS', myUrlPath=@{/taskstate})">
             </div>
         </div>
         <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

src/main/resources/templates/taskstate/inbox.html

@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
         <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
         </div>
         <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='INBOX', myUrlPath='/taskstate')">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='INBOX', myUrlPath=@{/taskstate})">
             </div>
         </div>
         <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

src/main/resources/templates/taskstate/next.html

@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
         <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
         </div>
         <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='NEXT', myUrlPath='/taskstate')">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='NEXT',myUrlPath=@{/taskstate})">
             </div>
         </div>
         <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

src/main/resources/templates/taskstate/scheduled.html

@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
         <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
         </div>
         <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SCHEDULED', myUrlPath='/taskstate')">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SCHEDULED',myUrlPath=@{/taskstate})">
             </div>
         </div>
         <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

src/main/resources/templates/taskstate/someday.html

@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
         <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
         </div>
         <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SOMEDAY', myUrlPath='/taskstate')">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SOMEDAY',myUrlPath=@{/taskstate})">
             </div>
         </div>
         <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

src/main/resources/templates/taskstate/today.html

@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
         <div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
         </div>
         <div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
-            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='TODAY', myUrlPath='/taskstate')">
+            <div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='TODAY',myUrlPath=@{/taskstate})">
             </div>
         </div>
         <div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">