From 42f1ef0bf38782db75a00cfb5a7af678b490407a Mon Sep 17 00:00:00 2001
From: slavisa-baeldung <slavisa.baeldung@gmail.com>
Date: Sat, 18 Mar 2017 09:20:33 +0000
Subject: [PATCH] BAEL-112 - custom validator - format fixes

---
 .../ContactNumberConstraint.java              |  6 +++--
 .../ContactNumberValidator.java               |  7 +++---
 .../com/baeldung/model/ValidatedPhone.java    |  6 ++++-
 .../controller/ValidatedPhoneController.java  | 24 +++++++++----------
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java b/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java
index 2fba2720c3..dbd38c1122 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberConstraint.java
@@ -11,12 +11,14 @@ import javax.validation.Payload;
 
 @Documented
 @Constraint(validatedBy = ContactNumberValidator.class)
-@Target( { ElementType.METHOD, ElementType.FIELD })
+@Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ContactNumberConstraint {
 
     String message() default "Invalid phone number";
+
     Class<?>[] groups() default {};
+
     Class<? extends Payload>[] payload() default {};
-    
+
 }
diff --git a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java b/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java
index a7eb7a9df4..713b7429cf 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/customvalidator/ContactNumberValidator.java
@@ -6,14 +6,15 @@ import javax.validation.ConstraintValidatorContext;
 public class ContactNumberValidator implements ConstraintValidator<ContactNumberConstraint, String> {
 
     @Override
-    public void initialize(ContactNumberConstraint contactNumber) {}
+    public void initialize(ContactNumberConstraint contactNumber) {
+    }
 
     @Override
     public boolean isValid(String contactField, ConstraintValidatorContext cxt) {
-        if(contactField == null) {
+        if (contactField == null) {
             return false;
         }
-        return contactField.matches("[0-9]+") && (contactField.length() > 8) && (contactField.length() < 14);        
+        return contactField.matches("[0-9]+") && (contactField.length() > 8) && (contactField.length() < 14);
     }
 
 }
diff --git a/spring-mvc-java/src/main/java/com/baeldung/model/ValidatedPhone.java b/spring-mvc-java/src/main/java/com/baeldung/model/ValidatedPhone.java
index f860394707..be702a8517 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/model/ValidatedPhone.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/model/ValidatedPhone.java
@@ -3,7 +3,7 @@ package com.baeldung.model;
 import com.baeldung.customvalidator.ContactNumberConstraint;
 
 public class ValidatedPhone {
-    
+
     @ContactNumberConstraint
     private String phone;
 
@@ -15,4 +15,8 @@ public class ValidatedPhone {
         this.phone = phone;
     }
 
+    @Override
+    public String toString() {
+        return phone;
+    }
 }
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java b/spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java
index 70b151e066..54b0e19e60 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java
@@ -15,21 +15,21 @@ import com.baeldung.model.ValidatedPhone;
 @EnableWebMvc
 public class ValidatedPhoneController {
 
-    @RequestMapping(value="/validatePhone", method=RequestMethod.GET)
+    @RequestMapping(value = "/validatePhone", method = RequestMethod.GET)
     public String loadFormPage(Model m) {
-            m.addAttribute("validatedPhone", new ValidatedPhone());
-            return "phoneHome";
+        m.addAttribute("validatedPhone", new ValidatedPhone());
+        return "phoneHome";
     }
-    
-    @RequestMapping(value="/addValidatePhone", method=RequestMethod.POST)
+
+    @RequestMapping(value = "/addValidatePhone", method = RequestMethod.POST)
     public String submitForm(@Valid ValidatedPhone validatedPhone, BindingResult result, Model m) {
-            if(result.hasErrors()) {
-                    return "phoneHome";
-            }
-            
-            m.addAttribute("message", "Successfully saved phone: " + validatedPhone.toString());
+        if (result.hasErrors()) {
             return "phoneHome";
+        }
+
+        m.addAttribute("message", "Successfully saved phone: " + validatedPhone.toString());
+        return "phoneHome";
     }
-    
-    
+
+
 }