Skip to content

Commit 87080d9

Browse files
committed
Simplify controllers code.
Return null (or mark method as returning void) when view name may be deduced from request URL. Inspired by: http://stackoverflow.com/q/6875255/what-does-it-mean-when-spring-mvc-controller-returns-null-view-name No functional changes.
1 parent 79cc3ae commit 87080d9

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

src/main/java/ru/mystamps/web/controller/ActivateAccountController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public String processInput(
8282
final BindingResult result) {
8383

8484
if (result.hasErrors()) {
85-
return "account/activate";
85+
return null;
8686
}
8787

8888
userService.registerUser(

src/main/java/ru/mystamps/web/controller/AuthAccountController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public String processInput(
9797
siteService.logAboutFailedAuthentication(page, user, ip, referer, agent);
9898
}
9999

100-
return "account/auth";
100+
return null;
101101
}
102102

103103
final User user = userService.findByLogin(form.getLogin());

src/main/java/ru/mystamps/web/controller/NotFoundErrorController.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class NotFoundErrorController {
4848
}
4949

5050
@RequestMapping(method = RequestMethod.GET)
51-
public String notFound(
51+
public void notFound(
5252
final HttpServletRequest request,
5353
final HttpSession session,
5454
@RequestHeader(value = "referer", required = false) final String referer,
@@ -66,8 +66,6 @@ public String notFound(
6666
// database error should not break showing of 404 page
6767
log.warn("Cannot log 404 error", ex);
6868
}
69-
70-
return "error/404";
7169
}
7270

7371
}

src/main/java/ru/mystamps/web/controller/RegisterAccountController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public String processInput(
6969
final BindingResult result) {
7070

7171
if (result.hasErrors()) {
72-
return "account/register";
72+
return null;
7373
}
7474

7575
userService.addRegistrationRequest(form.getEmail());

0 commit comments

Comments
 (0)