URL PATH of Actions - Controller Methods Refactoring

Author: thomaswoehlke

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

@@ -33,7 +33,10 @@ public class ProjectRootController extends AbstractController {
     private final TaskMoveService taskMoveService;
 
     @Autowired
-    public ProjectRootController(ProjectControllerService projectControllerService, TaskMoveService taskMoveService) {
+    public ProjectRootController(
+        ProjectControllerService projectControllerService,
+        TaskMoveService taskMoveService
+    ) {
         this.projectControllerService = projectControllerService;
         this.taskMoveService = taskMoveService;
     }
@@ -59,7 +62,7 @@ public final String showRootProject(
             model.addAttribute("isDeleted",isDeleted);
             model.addAttribute("myTaskState","PROJECT");
         }
-        return "project/root";
+        return "project/root/show";
     }
 
     @RequestMapping(path = "/add/project", method = RequestMethod.GET)
@@ -70,7 +73,7 @@ public final String addNewTopLevelProjectForm(
         log.info("/project/root/add/project (GET)");
         Context context = super.getContext(userSession);
         projectControllerService.addNewProjectToRoot(userSession, context, locale, model);
-        return "project/addToplevel";
+        return "project/root/add/project";
     }
 
     @RequestMapping(path = "/add/project", method = RequestMethod.POST)
@@ -89,7 +92,7 @@ public final String addNewTopLevelProjectSave(
             result,
             locale,
             model,
-            "project/addToplevel"
+            "project/root/add/project"
         );
     }
 
@@ -107,24 +110,23 @@ public final String addNewTaskToRootProjectGet(
         task.setTaskTime(TaskTime.NONE);
         Project thisProject;
         Boolean mustChooseArea = false;
-            thisProject = new Project();
-            thisProject.setId(0L);
-            if(userSession.getContextId() == 0L){
-                mustChooseArea = true;
-                task.setContext(userAccount.getDefaultContext());
-                thisProject.setContext(userAccount.getDefaultContext());
-            } else {
-                task.setContext(context);
-                thisProject.setContext(context);
-            }
+        thisProject = new Project();
+        thisProject.setId(0L);
+        if(userSession.getContextId() == 0L){
+            mustChooseArea = true;
+            task.setContext(userAccount.getDefaultContext());
+            thisProject.setContext(userAccount.getDefaultContext());
+        } else {
+            task.setContext(context);
+            thisProject.setContext(context);
+        }
         Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale);
         model.addAttribute("breadcrumb", breadcrumb);
         model.addAttribute("mustChooseArea", mustChooseArea);
         model.addAttribute("thisProject", thisProject);
         model.addAttribute("thisProjectId", thisProject.getId());
         model.addAttribute("breadcrumb", breadcrumb);
         model.addAttribute("task", task);
-        //return "task/addToProject";
         return "project/root/add/task";
     }
 
@@ -146,7 +148,6 @@ public final String addNewTaskToRootProjectPost(
             model.addAttribute("mustChooseArea", mustChooseArea);
             model.addAttribute("breadcrumb", breadcrumb);
             model.addAttribute("task", task);
-            //return "task/addToProject";
             return "project/root/add/task";
         } else {
             task.setProject(null);

src/main/java/org/woehlke/simpleworklist/task/TaskController.java

@@ -57,7 +57,7 @@ public final String editTaskGet(
             model.addAttribute("breadcrumb", breadcrumb);
             model.addAttribute("task", task);
             model.addAttribute("areas", contexts);
-            return "task/edit";
+            return "taskstate/task/edit";
         } else {
             return "redirect:/taskstate/inbox";
         }
@@ -91,7 +91,7 @@ public final String editTaskPost(
             Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale);
             model.addAttribute("breadcrumb", breadcrumb);
             model.addAttribute("task", task);
-            return "task/edit";
+            return "taskstate/task/edit";
         } else {
             persistentTask.setTitle(task.getTitle());
             persistentTask.setText(task.getText());
@@ -116,7 +116,7 @@ public final String editTaskPost(
                 }
                 userSession.setContextId(task.getContext().getId());
                 model.addAttribute("userSession", userSession);
-                return "redirect:/project/0/";
+                return "redirect:/project/root";
             }
             taskService.saveAndFlush(persistentTask);
             return "redirect:/project/" + projectId + "/";