wontfix #251, wontfix #224, wontfix #245, wontfix #246

Author: thomaswoehlke

etc/TODO.md

@@ -73,3 +73,7 @@
 * 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
+
+
+
+wontfix #251, wontfix #224, wontfix #245, wontfix #246 

src/main/java/org/woehlke/simpleworklist/domain/context/ContextRepository.java

@@ -11,12 +11,9 @@
 /**
  * Created by tw on 13.03.16.
  */
-@SuppressWarnings("Deprecation")
 @Repository
 public interface ContextRepository extends JpaRepository<Context, Long> {
 
-    //TODO: #251 change List<Context> to Page<Context>
-    @Deprecated
     List<Context> findByUserAccount(UserAccount user);
     Page<Context> findByUserAccount(UserAccount user, Pageable pageRequest);
 

src/main/java/org/woehlke/simpleworklist/domain/context/ContextService.java

@@ -11,7 +11,6 @@
  */
 public interface ContextService {
 
-    //TODO: #251 change List<Context> to Page<Context>
     //TODO: rename to findByUser
     List<Context> getAllForUser(UserAccount user);
 

src/main/java/org/woehlke/simpleworklist/domain/context/ContextServiceImpl.java

@@ -36,7 +36,6 @@ public ContextServiceImpl(ContextRepository contextRepository, TaskRepository ta
     @Override
     public List<Context> getAllForUser(UserAccount user) {
         log.info("getAllForUser");
-        //noinspection deprecation
         return contextRepository.findByUserAccount(user);
     }
 
@@ -79,9 +78,7 @@ public boolean delete(Context context) {
     @Override
     public boolean contextHasItems(Context context) {
         log.info("contextHasItems");
-        //noinspection deprecation
         long numberOfTasks = taskRepository.findByContext(context).size();
-        //noinspection deprecation
         int numberOfProjects = projectRepository.findByContext(context).size();
         return ((numberOfTasks + numberOfProjects) > 0);
     }

src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRepository.java

@@ -7,17 +7,13 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import org.woehlke.simpleworklist.domain.context.Context;
-@SuppressWarnings("Deprecation")
+
 @Repository
 public interface ProjectRepository extends JpaRepository<Project, Long> {
 
-    //TODO: #245 change List<Project> to Page<Project>
-    @Deprecated
     List<Project> findByContext(Context context);
     Page<Project> findByContext(Context context, Pageable pageRequest);
 
-    //TODO: #245 change List<Project> to Page<Project>
-    @Deprecated
     List<Project> findByParentIsNullAndContext(Context context);
     Page<Project> findByParentIsNullAndContext(Context context, Pageable pageRequest);
 

src/main/java/org/woehlke/simpleworklist/domain/project/ProjectService.java

@@ -9,13 +9,9 @@
 
 public interface ProjectService {
 
-    //TODO: #245 change List<Project> to Page<Project>
-    @Deprecated
     List<Project> findRootProjectsByContext(Context context);
     Page<Project> findRootProjectsByContext(Context context, Pageable pageRequest);
 
-    //TODO: #245 change List<Project> to Page<Project>
-    @Deprecated
     List<Project> findAllProjectsByContext(Context context);
     Page<Project> findAllProjectsByContext(Context context, Pageable pageRequest);
 

src/main/java/org/woehlke/simpleworklist/domain/project/ProjectServiceImpl.java

@@ -36,9 +36,7 @@ public ProjectServiceImpl(
         this.taskRepository = taskRepository;
     }
 
-    //TODO: #245 change List<Project> to Page<Project>
-    @Deprecated
-    //@Override
+    @Override
     public List<Project> findRootProjectsByContext(@NotNull Context context) {
         log.info("findRootProjectsByContext");
         //TODO: #245 change List<Project> to Page<Project>
@@ -51,9 +49,7 @@ public Page<Project> findRootProjectsByContext(@NotNull Context context, Pageabl
         return projectRepository.findByParentIsNullAndContext(context,pageRequest);
     }
 
-    //TODO: #245 change List<Project> to Page<Project>
-    @Deprecated
-    //@Override
+    @Override
     public List<Project> findAllProjectsByContext(@NotNull Context context) {
         log.info("findAllProjectsByContext");
         //TODO: #245 change List<Project> to Page<Project>
@@ -117,7 +113,6 @@ public Project moveProjectToAnotherContext(@NotNull Project thisProject, @NotNul
         //TODO: remove Recursion, remove unbounded Recursion and List instead of Page.
         List<Project> listProject = getAllChildrenOfProject(thisProject);
         for(Project childProject : listProject){
-            //noinspection deprecation
             List<Task> tasksOfChildProject = taskRepository.findByProject(childProject);
             for(Task task:tasksOfChildProject){
                 task.setContext(newContext);

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

@@ -10,7 +10,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-//simport org.hibernate.annotations.*;
+//import org.hibernate.annotations.*;
 //import org.hibernate.annotations.CascadeType;
 //import org.hibernate.annotations.NamedQueries;
 //import org.hibernate.annotations.NamedQuery;

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

@@ -15,39 +15,29 @@
 @Repository
 public interface TaskRepository extends JpaRepository<Task, Long> {
 
-    //TODO: #244 change List<Task> to Page<Task>
-    @Deprecated
     List<Task> findByProject(Project thisProject);
     Page<Task> findByProject(Project thisProject, Pageable pageable);
     Page<Task> findByFocusAndContext(boolean focus, Context context, Pageable request);
     Page<Task> findByProjectIsNullAndContext(Context context, Pageable request);
 
-    //TODO: #244 change List<Task> to Page<Task>
-    @Deprecated
     List<Task> findByContext(Context context);
     Page<Task> findByContext(Context context, Pageable pageable);
 
     Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState taskState, Context context);
     Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context context);
     Task findTopByProjectAndContextOrderByOrderIdProjectDesc(Project project, Context context);
 
-    //TODO: #244 change List<Task> to Page<Task>>
-    @Deprecated
     List<Task> findByTaskStateAndContext(TaskState taskState, Context context);
     Page<Task> findByTaskStateAndContext(TaskState taskState, Context context, Pageable request);
 
-    //TODO: #244 change List<Task> to Page<Task>
-    @Deprecated
     List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
         TaskState taskState, Context context
     );
     Page<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
         TaskState taskState, Context context, Pageable request
     );
 
-    //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")
@@ -69,15 +59,14 @@ Page<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
         Pageable request
     );
 
-    //TODO: #244 change List<Task> to Page<Task>
     //TODO: #249 move the JQL Query-String to Entity as Prepared Statement
-    @Deprecated
     @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"
@@ -90,9 +79,7 @@ Page<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
         Pageable request
     );
 
-    //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 ")
@@ -102,6 +89,7 @@ List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
         @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"

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

@@ -199,8 +199,6 @@ public void moveAllCompletedToTrash(@NotNull Context context) {
             context
         );
         long newOrderIdTaskState = maxOrderIdTaskState;
-        //TODO: #244 change List<Task> to Page<Task>
-        //noinspection deprecation
         List<Task> taskListCompleted = taskRepository.findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
             TaskState.COMPLETED,
             context
@@ -216,12 +214,10 @@ public void moveAllCompletedToTrash(@NotNull Context context) {
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public void emptyTrash(@NotNull Context context) {
-        //TODO: #244 change List<Task> to Page<Task>
         List<Task> taskList = taskRepository.findByTaskStateAndContext(
             TaskState.TRASH,
             context
         );
-        //TODO: #244 change List<Task> to Page<Task>
         List<Task> taskListChanged = new ArrayList<>(taskList.size());
         for(Task task: taskList){
             task.emptyTrash();
@@ -266,15 +262,12 @@ public void moveTasksUpByTaskState(@NotNull Task sourceTask, @NotNull Task desti
         Context context = sourceTask.getContext();
         final long lowerOrderIdTaskState = destinationTask.getOrderIdTaskState();
         final long higherOrderIdTaskState = sourceTask.getOrderIdTaskState();
-        //TODO: #244 change List<Task> to Page<Task>
-        //noinspection deprecation
         List<Task> tasks = taskRepository.getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
             lowerOrderIdTaskState,
             higherOrderIdTaskState,
             taskState,
             context
         );
-        //TODO: #244 change List<Task> to Page<Task>
         List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
         for(Task task:tasks){
             task.moveUpByTaskState();
@@ -301,15 +294,12 @@ public void moveTasksDownByTaskState(@NotNull Task sourceTask, @NotNull Task des
         Context context = sourceTask.getContext();
         long lowerOrderIdTaskState = sourceTask.getOrderIdTaskState();
         long higherOrderIdTaskState = destinationTask.getOrderIdTaskState();
-        //TODO: #244 change List<Task> to Page<Task>
-        //noinspection deprecation
         List<Task> tasks = taskRepository.getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
             lowerOrderIdTaskState,
             higherOrderIdTaskState,
             taskState,
             context
         );
-        //TODO: #244 change List<Task> to Page<Task>
         List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
         for(Task task:tasks){
             task.moveDownByTaskState();