work

Author: thomaswoehlke

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

@@ -78,7 +78,7 @@ public final String project(
       thisProject = new Project();
       thisProject.setId(0L);
       thisProject.setContext(context);
-      taskPage = taskService.findByRootProject(context, pageable);
+      taskPage = taskService.findByProjectRoot(context, pageable);
     }
     Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShoProjectId(thisProject, locale, userSession);
     model.addAttribute("breadcrumb", breadcrumb);
@@ -238,7 +238,7 @@ public final String projectDeleteGet(
         s.append("Project has child categories.");
       }
       Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShoProjectId(project, locale, userSession);
-      Page<Task> taskPage = taskService.findByProject(project, request);
+      Page<Task> taskPage = taskService.findByProjectId(project, request);
       model.addAttribute("message", s.toString());
       model.addAttribute("isDeleted", false);
       model.addAttribute("taskPage", taskPage);

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

@@ -72,7 +72,7 @@ public final String projectRoot(
         Context context = super.getContext(userSession);
         userSession.setLastProjectId(0L);
         model.addAttribute("userSession",userSession);
-        Page<Task> taskPage = taskService.findByRootProject(context,pageable);
+        Page<Task> taskPage = taskService.findByProjectRoot(context,pageable);
         Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowProjectRoot(locale,userSession);
         model.addAttribute("breadcrumb", breadcrumb);
         model.addAttribute("taskPage", taskPage);

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/task/TaskService.java

@@ -10,8 +10,7 @@
 
 public interface TaskService {
 
-    //TODO: rename to findById
-    Task findOne(long taskId);
+    Task findById(long taskId);
 
     List<Task> findByTaskStateInbox(Context context);
     List<Task> findByTaskStateToday(Context context);
@@ -37,9 +36,8 @@ public interface TaskService {
     Page<Task> findByTaskStateDeleted(Context context, Pageable request);
     Page<Task> findByTaskStateProjects(Context context, Pageable request);
 
-    Page<Task> findByProject(Project thisProject, Pageable request);
-    //TODO: rename to findByProjectRoot
-    Page<Task> findByRootProject(Context context, Pageable request);
+    Page<Task> findByProjectId(Project thisProject, Pageable request);
+    Page<Task> findByProjectRoot(Context context, Pageable request);
 
     boolean projectHasNoTasks(Project project);
 

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

@@ -36,7 +36,7 @@ public boolean projectHasNoTasks(Project project) {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
-    public Page<Task> findByProject(
+    public Page<Task> findByProjectId(
         @NotNull Project thisProject,Pageable request
     ) {
         log.info("findByProject: ");
@@ -48,14 +48,14 @@ public Page<Task> findByProject(
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
-    public Page<Task> findByRootProject( Context context,Pageable request) {
+    public Page<Task> findByProjectRoot(Context context, Pageable request) {
         log.info("findByRootProject: ");
         return taskRepository.findByProjectIsNullAndContext(context, request);
     }
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, readOnly = true)
-    public Task findOne(@Min(1L) long taskId) {
+    public Task findById(@Min(1L) long taskId) {
         log.info("findOne: ");
         if(taskRepository.existsById(taskId)) {
             return taskRepository.getReferenceById(taskId);

src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerServiceImpl.java

@@ -107,7 +107,7 @@ public Project findByProjectId(@Min(1L) long projectId) {
 
   @Override
   public Page<Task> findByProject(Project thisProject, Pageable pageable) {
-    return taskService.findByProject(thisProject,pageable
+    return taskService.findByProjectId(thisProject,pageable
     );
   }
 

src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskLifecycleServiceImpl.java

@@ -13,7 +13,6 @@
 import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectService;
 import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
 import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
-import org.woehlke.java.simpleworklist.domain.meso.task.TaskLifecycleService;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -209,7 +208,7 @@ public Project addProjectFromTaskToModel(Task task, Model model){
 
 
   public Task addProject(Task task){
-      Task persistentTask = taskService.findOne(task.getId());
+      Task persistentTask = taskService.findById(task.getId());
       if (task.getProject() == null || task.getProject().getId() == null || task.getProject().getId() == 0L) {
         persistentTask.setProject(null);
         if (persistentTask.getProject() == null || persistentTask.getProject().getId() == null || persistentTask.getProject().getId() == 0L) {

src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMove2TaskServiceImpl.java

@@ -27,7 +27,7 @@ public TaskMove2TaskServiceImpl(TaskService taskService) {
   }
 
   @Override
-  public void moveTaskToTaskAndChangeTaskOrderInTaskstate(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
+  public void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task destinationTask ) {
     log.info("-------------------------------------------------------------------------------");
     log.info(" START: moveTaskToTask AndChangeTaskOrder In Taskstate ");
     log.info("        "+sourceTask.getTaskState().name());
@@ -206,7 +206,7 @@ public void moveTasksUpByTaskState(Task sourceTask, Task destinationTask ) {
 
 
   @Override
-  @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+  //@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
   public void moveTasksDownByTaskState(Task sourceTask, Task destinationTask ) {
     log.info("-------------------------------------------------------------------------------");
     log.info(" moveTasks DOWN By TaskState: "+sourceTask.getId() +" -> "+ destinationTask.getId());