Skip to content

ContactNumberValidator refactor #1491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pivovarit merged 3 commits into from
Mar 25, 2017
Merged

ContactNumberValidator refactor #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27a9960
ContactNumberValidator refactor
pivovarit Mar 25, 2017
bdbfe9c
Refactor controllers
pivovarit Mar 25, 2017
bf7c37b
Merge branch 'master' into ContactNumberValidator
pivovarit Mar 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ public void initialize(ContactNumberConstraint contactNumber) {

@Override
public boolean isValid(String contactField, ConstraintValidatorContext cxt) {
if (contactField == null) {
return false;
}
return contactField.matches("[0-9]+") && (contactField.length() > 8) && (contactField.length() < 14);
return contactField != null && contactField.matches("[0-9]+") && (contactField.length() > 8) && (contactField.length() < 14);
}

}
7 changes: 4 additions & 3 deletions spring-mvc-java/src/main/java/com/baeldung/web/controller/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
import com.baeldung.model.User;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

@Controller
@RequestMapping("/")
public class UserController {

@RequestMapping(value = "/", method = RequestMethod.GET)
@GetMapping("/")
public String showForm(final Model model) {
final User user = new User();
user.setFirstname("John");
Expand All @@ -21,7 +22,7 @@ public String showForm(final Model model) {
return "index";
}

@RequestMapping(value = "/processForm", method = RequestMethod.POST)
@PostMapping("/processForm")
public String processForm(@ModelAttribute(value = "user") final User user, final Model model) {
// Insert User into DB
model.addAttribute("name", user.getFirstname() + " " + user.getLastname());
Expand Down
13 changes: 6 additions & 7 deletions spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
package com.baeldung.web.controller;

import javax.validation.Valid;

import com.baeldung.model.ValidatedPhone;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;

import com.baeldung.model.ValidatedPhone;
import javax.validation.Valid;

@Controller
@EnableWebMvc
public class ValidatedPhoneController {

@RequestMapping(value = "/validatePhone", method = RequestMethod.GET)
@GetMapping("/validatePhone")
public String loadFormPage(Model m) {
m.addAttribute("validatedPhone", new ValidatedPhone());
return "phoneHome";
}

@RequestMapping(value = "/addValidatePhone", method = RequestMethod.POST)
@PostMapping("/addValidatePhone")
public String submitForm(@Valid ValidatedPhone validatedPhone, BindingResult result, Model m) {
if (result.hasErrors()) {
return "phoneHome";
Expand Down