Skip to content

Commit 14ef699

Browse files
thomaswoehlkethomaswoehlke
committed
URL PATH of Actions - Controller Methods Refactoring
1 parent 735303e commit 14ef699

File tree

12 files changed

+167
-167
lines changed

12 files changed

+167
-167
lines changed

‎etc/urls01.txt‎

Lines changed: 58 additions & 58 deletions
Large diffs are not rendered by default.

‎etc/urls02.txt‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
etc/urls01.txt
22
---------------------------------------------------------------------
3-
5. Apr 23:17:52
3+
5. Apr 23:19:11
44
---------------------------------------------------------------------
55
/context
66
---------------------------------------------------------------------
77
= "/context")
8-
@RequestMapping(value = "/choose/{newContextId}",
8+
@RequestMapping(path = "/choose/{newContextId}",
99
/error
1010
---------------------------------------------------------------------
1111
@RequestMapping(path="/fehler", method={RequestMethod.GET,RequestMethod.POST, RequestMethod.PUT})
@@ -31,7 +31,7 @@ etc/urls01.txt
3131
@RequestMapping(path = "/{projectId}/task/add/",
3232
/search
3333
---------------------------------------------------------------------
34-
@RequestMapping(value = "/search",
34+
@RequestMapping(path = "/search",
3535
/task
3636
---------------------------------------------------------------------
3737
= "/task")
@@ -47,74 +47,74 @@ etc/urls01.txt
4747
/taskstate
4848
---------------------------------------------------------------------
4949
= "/taskstate")
50-
@RequestMapping(value = "/inbox",
51-
@RequestMapping(value = "/today",
52-
@RequestMapping(value = "/next",
53-
@RequestMapping(value = "/waiting",
54-
@RequestMapping(value = "/scheduled",
55-
@RequestMapping(value = "/someday",
56-
@RequestMapping(value = "/completed",
57-
@RequestMapping(value = "/trash",
58-
@RequestMapping(value = "/focus",
50+
@RequestMapping(path = "/inbox",
51+
@RequestMapping(path = "/today",
52+
@RequestMapping(path = "/next",
53+
@RequestMapping(path = "/waiting",
54+
@RequestMapping(path = "/scheduled",
55+
@RequestMapping(path = "/someday",
56+
@RequestMapping(path = "/completed",
57+
@RequestMapping(path = "/trash",
58+
@RequestMapping(path = "/focus",
5959
= "/taskstate/task")
60-
@RequestMapping(value = "/{sourceTaskId}/changeorderto/{destinationTaskId}",
61-
@RequestMapping(value = "/{taskId}/move/to/project/{projectId}",
62-
@RequestMapping(value = "/{taskId}/move/to/taskstate/inbox",
63-
@RequestMapping(value = "/{taskId}/move/to/taskstate/today",
64-
@RequestMapping(value = "/{taskId}/move/to/taskstate//next",
65-
@RequestMapping(value = "/{taskId}/move/to/taskstate/waiting",
66-
@RequestMapping(value = "/{taskId}/move/to/taskstate//someday",
67-
@RequestMapping(value = "/{taskId}/move/to/taskstate/focus",
68-
@RequestMapping(value = "/{taskId}/move/to/taskstate/completed",
69-
@RequestMapping(value = "/{taskId}/move/to/taskstate/trash",
70-
@RequestMapping(value = "/completed/move/to/taskstate/trash",
71-
@RequestMapping(value = "/trash/empty",
60+
@RequestMapping(path = "/{sourceTaskId}/changeorderto/{destinationTaskId}",
61+
@RequestMapping(path = "/{taskId}/move/to/project/{projectId}",
62+
@RequestMapping(path = "/{taskId}/move/to/taskstate/inbox",
63+
@RequestMapping(path = "/{taskId}/move/to/taskstate/today",
64+
@RequestMapping(path = "/{taskId}/move/to/taskstate//next",
65+
@RequestMapping(path = "/{taskId}/move/to/taskstate/waiting",
66+
@RequestMapping(path = "/{taskId}/move/to/taskstate//someday",
67+
@RequestMapping(path = "/{taskId}/move/to/taskstate/focus",
68+
@RequestMapping(path = "/{taskId}/move/to/taskstate/completed",
69+
@RequestMapping(path = "/{taskId}/move/to/taskstate/trash",
70+
@RequestMapping(path = "/completed/move/to/taskstate/trash",
71+
@RequestMapping(path = "/trash/empty",
7272
@RequestMapping(path = "/{taskId}/complete",
7373
@RequestMapping(path = "/{taskId}/incomplete/",
7474
@RequestMapping(path = "/{taskId}/setfocus/",
7575
@RequestMapping(path = "/{taskId}/unsetfocus",
7676
/testdata
7777
---------------------------------------------------------------------
7878
= "/test")
79-
@RequestMapping(value = "/helper/project/createTree",
79+
@RequestMapping(path = "/helper/project/createTree",
8080
---------------------------------------------------------------------
8181
/user/login
8282
---------------------------------------------------------------------
83-
@RequestMapping(value = "/login",
84-
@RequestMapping(value = "/login",
85-
@RequestMapping(value="/logout", method =
83+
@RequestMapping(path = "/login",
84+
@RequestMapping(path = "/login",
85+
@RequestMapping(path="/logout", method =
8686
/user/messages
8787
---------------------------------------------------------------------
8888
= "/user2user/")
89-
@RequestMapping(value = "/{userId}/messages/",
90-
@RequestMapping(value = "/{userId}/messages/",
89+
@RequestMapping(path = "/{userId}/messages/",
90+
@RequestMapping(path = "/{userId}/messages/",
9191
/user/register
9292
---------------------------------------------------------------------
93-
@RequestMapping(value = "/register",
94-
@RequestMapping(value = "/register",
95-
@RequestMapping(value = "/confirm/{confirmId}",
96-
@RequestMapping(value = "/confirm/{confirmId}",
93+
@RequestMapping(path = "/register",
94+
@RequestMapping(path = "/register",
95+
@RequestMapping(path = "/confirm/{confirmId}",
96+
@RequestMapping(path = "/confirm/{confirmId}",
9797
/user/resetpassword
9898
---------------------------------------------------------------------
99-
@RequestMapping(value = "/resetPassword",
100-
@RequestMapping(value = "/resetPassword",
101-
@RequestMapping(value = "/passwordResetConfirm/{confirmId}",
102-
@RequestMapping(value = "/passwordResetConfirm/{confirmId}",
99+
@RequestMapping(path = "/resetPassword",
100+
@RequestMapping(path = "/resetPassword",
101+
@RequestMapping(path = "/passwordResetConfirm/{confirmId}",
102+
@RequestMapping(path = "/passwordResetConfirm/{confirmId}",
103103
/user/selfservice
104104
---------------------------------------------------------------------
105105
= "/user/selfservice")
106-
@RequestMapping(value = "/profile",
107-
@RequestMapping(value = "/name",
108-
@RequestMapping(value = "/name",
109-
@RequestMapping(value = "/password",
110-
@RequestMapping(value = "/password",
111-
@RequestMapping(value = "/contexts",
112-
@RequestMapping(value = "/contexts",
113-
@RequestMapping(value = "/context/add",
114-
@RequestMapping(value = "/context/add",
115-
@RequestMapping(value = "/context/edit/{contextId}",
116-
@RequestMapping(value = "/context/edit/{contextId}",
117-
@RequestMapping(value = "/context/delete/{id}",
118-
@RequestMapping(value = "/language",
119-
@RequestMapping(value = "/language",
106+
@RequestMapping(path = "/profile",
107+
@RequestMapping(path = "/name",
108+
@RequestMapping(path = "/name",
109+
@RequestMapping(path = "/password",
110+
@RequestMapping(path = "/password",
111+
@RequestMapping(path = "/contexts",
112+
@RequestMapping(path = "/contexts",
113+
@RequestMapping(path = "/context/add",
114+
@RequestMapping(path = "/context/add",
115+
@RequestMapping(path = "/context/edit/{contextId}",
116+
@RequestMapping(path = "/context/edit/{contextId}",
117+
@RequestMapping(path = "/context/delete/{id}",
118+
@RequestMapping(path = "/language",
119+
@RequestMapping(path = "/language",
120120
---------------------------------------------------------------------

‎src/main/java/org/woehlke/simpleworklist/context/ContextController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Created by tw on 13.03.16.
1616
*/
1717
@Controller
18-
@RequestMapping(value = "/context")
18+
@RequestMapping(path = "/context")
1919
public class ContextController extends AbstractController {
2020

2121
private final ContextService contextService;
@@ -25,7 +25,7 @@ public ContextController(ContextService contextService) {
2525
this.contextService = contextService;
2626
}
2727

28-
@RequestMapping(value = "/choose/{newContextId}", method = RequestMethod.GET)
28+
@RequestMapping(path = "/choose/{newContextId}", method = RequestMethod.GET)
2929
public String switchContxt(@PathVariable("newContextId") Context setContext,
3030
@ModelAttribute("userSession") UserSessionBean userSession, Model model){
3131
Context isContext = super.getContext(userSession);

‎src/main/java/org/woehlke/simpleworklist/search/SearchController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public SearchController(SearchService searchService) {
3333
this.searchService = searchService;
3434
}
3535

36-
@RequestMapping(value = "/search", method = RequestMethod.GET)
36+
@RequestMapping(path = "/search", method = RequestMethod.GET)
3737
public final String searchResults(
3838
@RequestParam String searchterm,
3939
@ModelAttribute("userSession") UserSessionBean userSession,

‎src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateDisplayController.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
@Slf4j
2323
@Controller
24-
@RequestMapping(value = "/taskstate")
24+
@RequestMapping(path = "/taskstate")
2525
public class TaskStateDisplayController extends AbstractController {
2626

2727

@@ -36,7 +36,7 @@ public TaskStateDisplayController(TaskStateService taskStateService, TaskMoveSer
3636
this.taskControllerService = taskControllerService;
3737
}
3838

39-
@RequestMapping(value = "/inbox", method = RequestMethod.GET)
39+
@RequestMapping(path = "/inbox", method = RequestMethod.GET)
4040
public final String inbox(
4141
@PageableDefault(sort = "orderIdTaskState") Pageable pageable,
4242
@ModelAttribute("userSession") UserSessionBean userSession,
@@ -48,7 +48,7 @@ public final String inbox(
4848
return taskControllerService.getTaskStatePage(TaskState.INBOX, taskPage, userSession, locale, model);
4949
}
5050

51-
@RequestMapping(value = "/today", method = RequestMethod.GET)
51+
@RequestMapping(path = "/today", method = RequestMethod.GET)
5252
public final String today(
5353
@PageableDefault(sort = "orderIdTaskState", direction = Sort.Direction.DESC) Pageable pageable,
5454
@ModelAttribute("userSession") UserSessionBean userSession,
@@ -60,7 +60,7 @@ public final String today(
6060
return taskControllerService.getTaskStatePage(TaskState.TODAY, taskPage, userSession, locale, model);
6161
}
6262

63-
@RequestMapping(value = "/next", method = RequestMethod.GET)
63+
@RequestMapping(path = "/next", method = RequestMethod.GET)
6464
public final String next(
6565
@PageableDefault(sort = "orderIdTaskState", direction = Sort.Direction.DESC) Pageable pageable,
6666
@ModelAttribute("userSession") UserSessionBean userSession,
@@ -72,7 +72,7 @@ public final String next(
7272
return taskControllerService.getTaskStatePage(TaskState.NEXT, taskPage, userSession, locale, model);
7373
}
7474

75-
@RequestMapping(value = "/waiting", method = RequestMethod.GET)
75+
@RequestMapping(path = "/waiting", method = RequestMethod.GET)
7676
public final String waiting(
7777
@PageableDefault(sort = "orderIdTaskState", direction = Sort.Direction.DESC) Pageable pageable,
7878
@ModelAttribute("userSession") UserSessionBean userSession,
@@ -84,7 +84,7 @@ public final String waiting(
8484
return taskControllerService.getTaskStatePage(TaskState.WAITING, taskPage, userSession, locale, model);
8585
}
8686

87-
@RequestMapping(value = "/scheduled", method = RequestMethod.GET)
87+
@RequestMapping(path = "/scheduled", method = RequestMethod.GET)
8888
public final String scheduled(
8989
@PageableDefault(sort = "orderIdTaskState", direction = Sort.Direction.DESC) Pageable pageable,
9090
@ModelAttribute("userSession") UserSessionBean userSession,
@@ -96,7 +96,7 @@ public final String scheduled(
9696
return taskControllerService.getTaskStatePage(TaskState.SCHEDULED, taskPage, userSession, locale, model);
9797
}
9898

99-
@RequestMapping(value = "/someday", method = RequestMethod.GET)
99+
@RequestMapping(path = "/someday", method = RequestMethod.GET)
100100
public final String someday(
101101
@PageableDefault(sort = "orderIdTaskState", direction = Sort.Direction.DESC) Pageable pageable,
102102
@ModelAttribute("userSession") UserSessionBean userSession,
@@ -108,7 +108,7 @@ public final String someday(
108108
return taskControllerService.getTaskStatePage(TaskState.SOMEDAY, taskPage, userSession, locale, model);
109109
}
110110

111-
@RequestMapping(value = "/completed", method = RequestMethod.GET)
111+
@RequestMapping(path = "/completed", method = RequestMethod.GET)
112112
public final String completed(
113113
@PageableDefault(sort = "orderIdTaskState", direction = Sort.Direction.DESC) Pageable pageable,
114114
@ModelAttribute("userSession") UserSessionBean userSession,
@@ -120,7 +120,7 @@ public final String completed(
120120
return taskControllerService.getTaskStatePage(TaskState.COMPLETED, taskPage, userSession, locale, model);
121121
}
122122

123-
@RequestMapping(value = "/trash", method = RequestMethod.GET)
123+
@RequestMapping(path = "/trash", method = RequestMethod.GET)
124124
public final String trash(
125125
@PageableDefault(sort = "orderIdTaskState", direction = Sort.Direction.DESC) Pageable pageable,
126126
@ModelAttribute("userSession") UserSessionBean userSession,
@@ -132,7 +132,7 @@ public final String trash(
132132
return taskControllerService.getTaskStatePage(TaskState.TRASH, taskPage, userSession, locale, model);
133133
}
134134

135-
@RequestMapping(value = "/focus", method = RequestMethod.GET)
135+
@RequestMapping(path = "/focus", method = RequestMethod.GET)
136136
public final String focus(
137137
@PageableDefault(sort = "orderIdTaskState", direction = Sort.Direction.DESC) Pageable pageable,
138138
@ModelAttribute("userSession") UserSessionBean userSession,

‎src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateWorkflowController.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
@Slf4j
2020
@Controller
21-
@RequestMapping(value = "/taskstate/task")
21+
@RequestMapping(path = "/taskstate/task")
2222
public class TaskStateWorkflowController extends AbstractController {
2323

2424
private final TaskStateService taskStateService;
@@ -37,7 +37,7 @@ public TaskStateWorkflowController(
3737
}
3838

3939

40-
@RequestMapping(value = "/{sourceTaskId}/changeorderto/{destinationTaskId}", method = RequestMethod.GET)
40+
@RequestMapping(path = "/{sourceTaskId}/changeorderto/{destinationTaskId}", method = RequestMethod.GET)
4141
public String changeTaskOrderId(
4242
@PathVariable("sourceTaskId") Task sourceTask,
4343
@PathVariable("destinationTaskId") Task destinationTask,
@@ -56,7 +56,7 @@ public String changeTaskOrderId(
5656
}
5757

5858

59-
@RequestMapping(value = "/{taskId}/move/to/project/{projectId}", method = RequestMethod.GET)
59+
@RequestMapping(path = "/{taskId}/move/to/project/{projectId}", method = RequestMethod.GET)
6060
public final String moveTaskToAnotherProject(@PathVariable("taskId") Task task,
6161
@PathVariable long projectId) {
6262
if(projectId == 0) {
@@ -68,63 +68,63 @@ public final String moveTaskToAnotherProject(@PathVariable("taskId") Task task,
6868
return "redirect:/project/" + projectId + "/";
6969
}
7070

71-
@RequestMapping(value = "/{taskId}/move/to/taskstate/inbox", method = RequestMethod.GET)
71+
@RequestMapping(path = "/{taskId}/move/to/taskstate/inbox", method = RequestMethod.GET)
7272
public final String moveTaskToInbox(@PathVariable("taskId") Task task) {
7373
log.info("dragged and dropped "+task.getId()+" to inbox");
7474
task = taskMoveService.moveTaskToInbox(task);
7575
return "redirect:/taskstate/inbox";
7676
}
7777

78-
@RequestMapping(value = "/{taskId}/move/to/taskstate/today", method = RequestMethod.GET)
78+
@RequestMapping(path = "/{taskId}/move/to/taskstate/today", method = RequestMethod.GET)
7979
public final String moveTaskToToday(@PathVariable("taskId") Task task) {
8080
log.info("dragged and dropped "+task.getId()+" to today");
8181
task = taskMoveService.moveTaskToToday(task);
8282
return "redirect:/taskstate/today";
8383
}
8484

85-
@RequestMapping(value = "/{taskId}/move/to/taskstate//next", method = RequestMethod.GET)
85+
@RequestMapping(path = "/{taskId}/move/to/taskstate//next", method = RequestMethod.GET)
8686
public final String moveTaskToNext(@PathVariable("taskId") Task task) {
8787
log.info("dragged and dropped "+task.getId()+" to next");
8888
task = taskMoveService.moveTaskToNext(task);
8989
return "redirect:/taskstate/next";
9090
}
9191

92-
@RequestMapping(value = "/{taskId}/move/to/taskstate/waiting", method = RequestMethod.GET)
92+
@RequestMapping(path = "/{taskId}/move/to/taskstate/waiting", method = RequestMethod.GET)
9393
public final String moveTaskToWaiting(@PathVariable("taskId") Task task) {
9494
log.info("dragged and dropped "+task.getId()+" to waiting");
9595
task = taskMoveService.moveTaskToWaiting(task);
9696
return "redirect:/taskstate/waiting";
9797
}
9898

99-
@RequestMapping(value = "/{taskId}/move/to/taskstate//someday", method = RequestMethod.GET)
99+
@RequestMapping(path = "/{taskId}/move/to/taskstate//someday", method = RequestMethod.GET)
100100
public final String moveTaskToSomeday(@PathVariable("taskId") Task task) {
101101
log.info("dragged and dropped "+task.getId()+" to someday");
102102
task = taskMoveService.moveTaskToSomeday(task);
103103
return "redirect:/taskstate/someday";
104104
}
105105

106-
@RequestMapping(value = "/{taskId}/move/to/taskstate/focus", method = RequestMethod.GET)
106+
@RequestMapping(path = "/{taskId}/move/to/taskstate/focus", method = RequestMethod.GET)
107107
public final String moveTaskToFocus(@PathVariable("taskId") Task task) {
108108
log.info("dragged and dropped "+task.getId()+" to focus");
109109
task = taskMoveService.moveTaskToFocus(task);
110110
return "redirect:/taskstate/focus";
111111
}
112112

113-
@RequestMapping(value = "/{taskId}/move/to/taskstate/completed", method = RequestMethod.GET)
113+
@RequestMapping(path = "/{taskId}/move/to/taskstate/completed", method = RequestMethod.GET)
114114
public final String moveTaskToCompleted(@PathVariable("taskId") Task task) {
115115
log.info("dragged and dropped "+task.getId()+" to completed");
116116
task = taskMoveService.moveTaskToCompleted(task);
117117
return "redirect:/taskstate/completed";
118118
}
119119

120-
@RequestMapping(value = "/{taskId}/move/to/taskstate/trash", method = RequestMethod.GET)
120+
@RequestMapping(path = "/{taskId}/move/to/taskstate/trash", method = RequestMethod.GET)
121121
public final String moveTaskToTrash(@PathVariable("taskId") Task task) {
122122
log.info("dragged and dropped "+task.getId()+" to trash");
123123
task = taskMoveService.moveTaskToTrash(task);
124124
return "redirect:/taskstate/trash";
125125
}
126126

127-
@RequestMapping(value = "/completed/move/to/taskstate/trash", method = RequestMethod.GET)
127+
@RequestMapping(path = "/completed/move/to/taskstate/trash", method = RequestMethod.GET)
128128
public final String deleteallCompleted(
129129
@ModelAttribute("userSession") UserSessionBean userSession
130130
) {
@@ -133,7 +133,7 @@ public final String deleteallCompleted(
133133
return "redirect:/taskstate/trash";
134134
}
135135

136-
@RequestMapping(value = "/trash/empty", method = RequestMethod.GET)
136+
@RequestMapping(path = "/trash/empty", method = RequestMethod.GET)
137137
public final String emptyTrash(
138138
@ModelAttribute("userSession") UserSessionBean userSession
139139
) {

‎src/main/java/org/woehlke/simpleworklist/testdata/TestDataController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.woehlke.simpleworklist.user.login.UserAccountLoginSuccessService;
1010

1111
@Controller
12-
@RequestMapping(value = "/test")
12+
@RequestMapping(path = "/test")
1313
public class TestDataController {
1414

1515
private final TestDataService testDataService;
@@ -22,7 +22,7 @@ public TestDataController(TestDataService testDataService, UserAccountLoginSucce
2222
this.userAccountLoginSuccessService = userAccountLoginSuccessService;
2323
}
2424

25-
@RequestMapping(value = "/helper/project/createTree", method = RequestMethod.GET)
25+
@RequestMapping(path = "/helper/project/createTree", method = RequestMethod.GET)
2626
public String createTestCategoryTree() {
2727
UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser();
2828
testDataService.createTestCategoryTreeForUserAccount(user);

0 commit comments

Comments
 (0)