Commit 4d57c32

committed

Update user, with constraint groups, completed

1 parent 789e024 commit 4d57c32Copy full SHA for 4d57c32

File tree

+15

-6

lines changed

+15

-6

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,18 @@`
`14`	`14`
`15`	`15`	`public class UserCommand {`
`16`	`16`
`17`		`- @UniqueEmail`
	`17`	`+ public static interface SignupValidation {}`
	`18`	`+ public static interface UpdateValidation {}`
	`19`	`+`
	`20`	`+`
	`21`	`+ @UniqueEmail(groups = SignupValidation.class)`
`18`	`22`	`private String email;`
`19`	`23`
`20`		`- @NotBlank`
`21`		`- @Size(min=1, max=100)`
	`24`	`+ @NotBlank(groups = {SignupValidation.class, UpdateValidation.class})`
	`25`	`+ @Size(min=1, max=100, groups = {SignupValidation.class, UpdateValidation.class})`
`22`	`26`	`private String name;`
`23`	`27`
`24`		`- @Password`
	`28`	`+ @Password(groups = SignupValidation.class)`
`25`	`29`	`private String password;`
`26`	`30`
`27`	`31`	`private Collection<Role> roles = new HashSet<Role>();`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import org.springframework.web.servlet.mvc.support.RedirectAttributes;`
`14`	`14`
`15`	`15`	`import com.naturalprogrammer.spring5tutorial.commands.UserCommand;`
	`16`	`+import com.naturalprogrammer.spring5tutorial.commands.UserCommand.SignupValidation;`
`16`	`17`	`import com.naturalprogrammer.spring5tutorial.services.UserService;`
`17`	`18`	`import com.naturalprogrammer.spring5tutorial.utils.MyUtils;`
`18`	`19`
`@@ -37,7 +38,9 @@ public String signup(Model model) {`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`@PostMapping`
`40`		`- public String doSignup(@Validated @ModelAttribute("user") UserCommand user,`
	`41`	`+ public String doSignup(`
	`42`	`+ @Validated(SignupValidation.class)`
	`43`	`+ @ModelAttribute("user") UserCommand user,`
`41`	`44`	`BindingResult result,`
`42`	`45`	`RedirectAttributes redirectAttributes) {`
`43`	`46`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`import org.springframework.web.servlet.mvc.support.RedirectAttributes;`
`15`	`15`
`16`	`16`	`import com.naturalprogrammer.spring5tutorial.commands.UserCommand;`
	`17`	`+import com.naturalprogrammer.spring5tutorial.commands.UserCommand.UpdateValidation;`
`17`	`18`	`import com.naturalprogrammer.spring5tutorial.domain.User;`
`18`	`19`	`import com.naturalprogrammer.spring5tutorial.services.UserService;`
`19`	`20`	`import com.naturalprogrammer.spring5tutorial.utils.MyUtils;`
`@@ -62,7 +63,8 @@ public String edit(@PathVariable("userId") User user, Model model) {`
`62`	`63`
`63`	`64`	`@PostMapping("/{userId}/edit")`
`64`	`65`	`public String update(@PathVariable("userId") User oldUser,`
`65`		`- @Validated @ModelAttribute("user") UserCommand userCommand,`
	`66`	`+ @Validated(UpdateValidation.class)`
	`67`	`+ @ModelAttribute("user") UserCommand userCommand,`
`66`	`68`	`BindingResult result,`
`67`	`69`	`RedirectAttributes redirectAttributes) {`
`68`	`70`

Comments

(0)