Merge pull request #5324 from amit2103/BAEL-9021

[BAEL-9021] - Fixed compilation error and uncommented module in paren…
This commit is contained in:
Loredana Crusoveanu 2018-09-27 00:11:56 +03:00 committed by GitHub
commit 1e60c8f11e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -643,7 +643,7 @@
<module>spring-mobile</module> <module>spring-mobile</module>
<!-- <module>spring-mustache</module> --><!-- PMD voilation --> <!-- <module>spring-mustache</module> --><!-- PMD voilation -->
<module>spring-mvc-simple</module> <module>spring-mvc-simple</module>
<!-- <module>spring-mybatis</module> --><!-- Compilation failure --> <module>spring-mybatis</module>
<module>spring-rest-hal-browser</module> <module>spring-rest-hal-browser</module>
<module>spring-rest-shell</module> <module>spring-rest-shell</module>
<module>spring-rest-template</module> <module>spring-rest-template</module>
@ -960,7 +960,7 @@
<module>spring-mobile</module> <module>spring-mobile</module>
<!-- <module>spring-mustache</module> --><!-- PMD voilation --> <!-- <module>spring-mustache</module> --><!-- PMD voilation -->
<module>spring-mvc-simple</module> <module>spring-mvc-simple</module>
<!-- <module>spring-mybatis</module> --><!-- Compilation failure --> <module>spring-mybatis</module>
<module>spring-rest-hal-browser</module> <module>spring-rest-hal-browser</module>
<module>spring-rest-shell</module> <module>spring-rest-shell</module>
<module>spring-rest-template</module> <module>spring-rest-template</module>

View File

@ -31,7 +31,7 @@ public class StudentController {
@RequestMapping(value = "/signup", method = RequestMethod.POST) @RequestMapping(value = "/signup", method = RequestMethod.POST)
public String signup(@Validated @ModelAttribute("student") Student student, BindingResult result, ModelMap model) { public String signup(@Validated @ModelAttribute("student") Student student, BindingResult result, ModelMap model) {
if (studentService.getStudentByUserName(student.getUserName())) { if (studentService.getStudentByUserName(student.getUserName()) != null) {
model.addAttribute("message", "User Name exists. Try another user name"); model.addAttribute("message", "User Name exists. Try another user name");
return "signup"; return "signup";
} else { } else {
@ -50,7 +50,7 @@ public class StudentController {
@RequestMapping(value = "/login", method = RequestMethod.POST) @RequestMapping(value = "/login", method = RequestMethod.POST)
public String login(@ModelAttribute("studentLogin") StudentLogin studentLogin, BindingResult result, ModelMap model) { public String login(@ModelAttribute("studentLogin") StudentLogin studentLogin, BindingResult result, ModelMap model) {
boolean found = studentService.getStudentByLogin(studentLogin.getUserName(), studentLogin.getPassword()); boolean found = studentService.getStudentByLogin(studentLogin.getUserName(), studentLogin.getPassword()) != null;
if (found) { if (found) {
return "success"; return "success";
} else { } else {