* Issue #249 TaskRepository: move the JQL Query-String to Entity as Prepared Statement

* Issue #234 Taskstate: Task Edit Form -> change Project via DropDown
* Issue #235 Project/Root: Task Edit Form -> change Project via DropDown
* Issue #236 Project/id: Task Edit Form -> change Project via DropDown

Author: thomaswoehlke

build.sh

@@ -31,8 +31,8 @@ function setupTravis() {
 }
 
 function main() {
-    # firstSetup
-    setupTravis
+    firstSetup
+    # setupTravis
 }
 
 main

src/main/java/org/woehlke/simpleworklist/domain/task/Task.java

@@ -11,15 +11,14 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.hibernate.annotations.LazyToOne;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
+import org.hibernate.annotations.*;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 //import org.hibernate.validator.constraints.SafeHtml;
+import org.springframework.data.jpa.repository.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.project.Project;
@@ -53,6 +52,29 @@
         @Index(name = "ix_task_title", columnList = "title")
     }
 )
+@NamedQueries({
+    @NamedQuery(
+        name = "queryGetTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask",
+        query = "select t from Task t"
+            + " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState"
+            + " and t.taskState = :taskState and t.context = :context",
+        readOnly = true
+    ),
+    @NamedQuery(
+        name = "queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask",
+        query = "select t from Task t"
+            + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
+            + " and t.project = :project",
+        readOnly = true
+    ),
+    @NamedQuery(
+        name = "queryGetTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask",
+        query = "select t from Task t"
+            + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
+            + " and t.project is null and t.context = :context ",
+        readOnly = true
+    )
+})
 @Getter
 @Setter
 @EqualsAndHashCode(callSuper = true)

src/main/java/org/woehlke/simpleworklist/domain/task/TaskRepository.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.hibernate.annotations.NamedQuery;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -47,19 +48,19 @@ Page<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
     //TODO: #244 change List<Task> to Page<Task>
     //TODO: #249 move the JQL Query-String to Entity as Prepared Statement
     @Deprecated
-    @Query("select t from Task t"
-            + " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState"
-            + " and t.taskState = :taskState and t.context = :context")
+    //@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<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
         @Param("lowerOrderIdTaskState") long lowerOrderIdTaskState,
         @Param("higherOrderIdTaskState") long higherOrderIdTaskState,
         @Param("taskState") TaskState taskState,
         @Param("context") Context context
     );
+
     //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")
     Page<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
         @Param("lowerOrderIdTaskState") long lowerOrderIdTaskState,
         @Param("higherOrderIdTaskState") long higherOrderIdTaskState,
@@ -71,18 +72,17 @@ Page<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
     //TODO: #244 change List<Task> to Page<Task>
     //TODO: #249 move the JQL Query-String to Entity as Prepared Statement
     @Deprecated
-    @Query("select t from Task t"
-            + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
-            + " and t.project = :project")
+    @Query(name="queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask")
     List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
         @Param("lowerOrderIdProject") long lowerOrderIdProject,
         @Param("higherOrderIdProject") long higherOrderIdProject,
         @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("select t from Task t"
+    //    + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
+    //    + " and t.project = :project")
+    @Query(name="queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask")
     Page<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
         @Param("lowerOrderIdProject") long lowerOrderIdProject,
         @Param("higherOrderIdProject") long higherOrderIdProject,
@@ -93,18 +93,20 @@ Page<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
     //TODO: #244 move from List<Task> to Page<Task>
     //TODO: #249 move the JQL Query-String to Entity as Prepared Statement
     @Deprecated
-    @Query("select t from Task t"
-        + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
-        + " and t.project is null and t.context = :context ")
+    //@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<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
         @Param("lowerOrderIdProject") long lowerOrderIdProject,
         @Param("higherOrderIdProject") long higherOrderIdProject,
         @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("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<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
         @Param("lowerOrderIdProject") long lowerOrderIdProject,
         @Param("higherOrderIdProject") long higherOrderIdProject,