Merge pull request #7948 from martinvw/feature/pre-cleanup

Feature/pre cleanup

javaxval/README.md

@@ -8,3 +8,4 @@ This module contains articles about Bean Validation.
 - [Method Constraints with Bean Validation 2.0](https://www.baeldung.com/javax-validation-method-constraints)
 - [Difference Between @NotNull, @NotEmpty, and @NotBlank Constraints in Bean Validation](https://www.baeldung.com/java-bean-validation-not-null-empty-blank)
 - [Javax BigDecimal Validation](https://www.baeldung.com/javax-bigdecimal-validation)
+- [Grouping Javax Validation Constraints](https://www.baeldung.com/javax-validation-groups)

javaxval/src/main/java/org/baeldung/javabeanconstraints/appplication/Application.java

@@ -1,14 +0,0 @@
-package org.baeldung.javabeanconstraints.appplication;
-
-import javax.validation.Validation;
-import javax.validation.Validator;
-import org.baeldung.javabeanconstraints.entities.UserNotBlank;
-
-public class Application {
-
-    public static void main(String[] args) throws Exception {
-        Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
-        UserNotBlank user = new UserNotBlank(" ");
-        validator.validate(user).stream().forEach(violation -> System.out.println(violation.getMessage())); 
-    }
-}

javaxval/src/main/java/org/baeldung/javabeanconstraints/bigdecimal/Invoice.java

@@ -1,19 +0,0 @@
-package org.baeldung.javabeanconstraints.bigdecimal;
-
-import java.math.BigDecimal;
-
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Digits;
-
-public class Invoice {
-	
-	@DecimalMin(value = "0.0", inclusive = false)
-	@Digits(integer=3, fraction=2)
-    private BigDecimal price;
-    private String description;
-    
-	public Invoice(BigDecimal price, String description) {
-		this.price = price;
-		this.description = description;
-	}
-}

javaxval/src/main/java/org/baeldung/javabeanconstraints/validationgroup/AdvanceInfo.java

@@ -1,5 +0,0 @@
-package org.baeldung.javabeanconstraints.validationgroup;
-
-public interface AdvanceInfo {
-
-}

javaxval/src/main/java/org/baeldung/javabeanconstraints/validationgroup/BasicInfo.java

@@ -1,5 +0,0 @@
-package org.baeldung.javabeanconstraints.validationgroup;
-
-public interface BasicInfo {
-
-}

javaxval/src/main/java/org/baeldung/javabeanconstraints/validationgroup/CompleteInfo.java

@@ -1,8 +0,0 @@
-package org.baeldung.javabeanconstraints.validationgroup;
-
-import javax.validation.GroupSequence;
-
-@GroupSequence({BasicInfo.class, AdvanceInfo.class})
-public interface CompleteInfo {
-
-}

javaxval/src/main/java/org/baeldung/javabeanconstraints/validationgroup/RegistrationForm.java

@@ -1,110 +0,0 @@
-package org.baeldung.javabeanconstraints.validationgroup;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-
-public class RegistrationForm {
-	@NotBlank(groups = BasicInfo.class)
-	private String firstName;
-	@NotBlank(groups = BasicInfo.class)
-	private String lastName;
-	@Email(groups = BasicInfo.class)
-	private String email;
-	@NotBlank(groups = BasicInfo.class)
-	private String phone;
-
-	@NotBlank(groups = { BasicInfo.class, AdvanceInfo.class })
-	private String captcha;
-
-	@NotBlank(groups = AdvanceInfo.class)
-	private String street;
-	@NotBlank(groups = AdvanceInfo.class)
-	private String houseNumber;
-	@NotBlank(groups = AdvanceInfo.class)
-	private String zipCode;
-	@NotBlank(groups = AdvanceInfo.class)
-	private String city;
-	@NotBlank(groups = AdvanceInfo.class)
-	private String contry;
-
-	public String getStreet() {
-		return street;
-	}
-
-	public void setStreet(String street) {
-		this.street = street;
-	}
-
-	public String getHouseNumber() {
-		return houseNumber;
-	}
-
-	public void setHouseNumber(String houseNumber) {
-		this.houseNumber = houseNumber;
-	}
-
-	public String getZipCode() {
-		return zipCode;
-	}
-
-	public void setZipCode(String zipCode) {
-		this.zipCode = zipCode;
-	}
-
-	public String getCity() {
-		return city;
-	}
-
-	public void setCity(String city) {
-		this.city = city;
-	}
-
-	public String getContry() {
-		return contry;
-	}
-
-	public void setContry(String contry) {
-		this.contry = contry;
-	}
-
-	public String getFirstName() {
-		return firstName;
-	}
-
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-
-	public String getLastName() {
-		return lastName;
-	}
-
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getPhone() {
-		return phone;
-	}
-
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-	
-	public String getCaptcha() {
-		return captcha;
-	}
-
-	public void setCaptcha(String captcha) {
-		this.captcha = captcha;
-	}
-
-}

javaxval/src/main/java/org/baeldung/javaxval/beanvalidation/User.java

@@ -8,10 +8,10 @@ import javax.validation.constraints.AssertTrue;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Past;
 import javax.validation.constraints.Size;
-import javax.validation.constraints.NotBlank;
 
 public class User {
 
@@ -30,9 +30,9 @@ public class User {
 
     @Email(message = "Email should be valid")
     private String email;
-    
-    List<@NotBlank String> preferences;
-    
+
+    private List<@NotBlank String> preferences;
+
     private LocalDate dateOfBirth;
 
     public int getAge() {
@@ -90,5 +90,4 @@ public class User {
     public void setPreferences(List<String> preferences) {
         this.preferences = preferences;
     }
-   
 }

javaxval/src/main/java/org/baeldung/javaxval/bigdecimal/Invoice.java

@@ -0,0 +1,19 @@
+package org.baeldung.javaxval.bigdecimal;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Digits;
+
+public class Invoice {
+
+    @DecimalMin(value = "0.0", inclusive = false)
+    @Digits(integer = 3, fraction = 2)
+    private BigDecimal price;
+    private String description;
+
+    public Invoice(BigDecimal price, String description) {
+        this.price = price;
+        this.description = description;
+    }
+}

javaxval/src/main/java/org/baeldung/javaxval/container/validation/Customer.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package org.baeldung.javaxval.container.validation;
 
 import java.util.List;
 import java.util.Optional;
@@ -10,17 +10,17 @@ import javax.validation.constraints.PositiveOrZero;
 
 public class Customer {
 
-    @NotBlank(message="Name cannot be empty")
+    @NotBlank(message = "Name cannot be empty")
     private String name;
 
-    private List<@NotBlank(message="Address must not be blank") String> addresses;
-    
+    private List<@NotBlank(message = "Address must not be blank") String> addresses;
+
     private Integer age;
-    
+
     @PositiveOrZero
     private OptionalInt numberOfOrders;
-    
-    //@NotBlank
+
+    @NotBlank
     private Profile profile;
 
     public String getName() {

javaxval/src/main/java/org/baeldung/javaxval/container/validation/CustomerMap.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package org.baeldung.javaxval.container.validation;
 
 import java.util.Map;
 
@@ -6,8 +6,8 @@ import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 
 public class CustomerMap {
-    
-    private Map<@Email(message="Must be a valid email") String, @NotNull Customer> customers;
+
+    private Map<@Email(message = "Must be a valid email") String, @NotNull Customer> customers;
 
     public Map<String, Customer> getCustomers() {
         return customers;

javaxval/src/main/java/org/baeldung/javaxval/container/validation/Profile.java

@@ -1,4 +1,4 @@
-package org.baeldung;
+package org.baeldung.javaxval.container.validation;
 
 public class Profile {
     private String companyName;

javaxval/src/main/java/org/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java

@@ -1,10 +1,10 @@
-package org.baeldung.valueextractors;
+package org.baeldung.javaxval.container.validation.valueextractors;
 
 import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.UnwrapByDefault;
 import javax.validation.valueextraction.ValueExtractor;
 
-import org.baeldung.Profile;
+import org.baeldung.javaxval.container.validation.Profile;
 
 @UnwrapByDefault
 public class ProfileValueExtractor implements ValueExtractor<@ExtractedValue(type = String.class) Profile> {

javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/application/Application.java

@@ -0,0 +1,18 @@
+package org.baeldung.javaxval.javabeanconstraints.application;
+
+import javax.validation.Validation;
+import javax.validation.Validator;
+
+import org.baeldung.javaxval.javabeanconstraints.entities.UserNotBlank;
+
+public class Application {
+
+    public static void main(String[] args) {
+        Validator validator = Validation.buildDefaultValidatorFactory()
+            .getValidator();
+        UserNotBlank user = new UserNotBlank(" ");
+        validator.validate(user)
+            .stream()
+            .forEach(violation -> System.out.println(violation.getMessage()));
+    }
+}

javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java

@@ -1,22 +1,22 @@
-package org.baeldung.javabeanconstraints.entities;
-
-import javax.validation.constraints.NotBlank;
-
-public class UserNotBlank {
-
-    @NotBlank(message = "Name is mandatory")
-    private final String name;
-    
-    public UserNotBlank(String name) {
-        this.name = name;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    @Override
-    public String toString() {
-        return "User{" + "name=" + name + "}";
-    }
-}
+package org.baeldung.javaxval.javabeanconstraints.entities;
+
+import javax.validation.constraints.NotBlank;
+
+public class UserNotBlank {
+
+    @NotBlank(message = "Name is mandatory")
+    private final String name;
+
+    public UserNotBlank(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" + "name=" + name + "}";
+    }
+}

javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java

@@ -1,22 +1,22 @@
-package org.baeldung.javabeanconstraints.entities;
-
-import javax.validation.constraints.NotEmpty;
-
-public class UserNotEmpty {
-    
-    @NotEmpty(message = "Name is mandatory")
-    private final String name;
-    
-    public UserNotEmpty(String name) {
-        this.name = name;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    @Override
-    public String toString() {
-        return "User{" + "name=" + name + "}";
-    }
-}
+package org.baeldung.javaxval.javabeanconstraints.entities;
+
+import javax.validation.constraints.NotEmpty;
+
+public class UserNotEmpty {
+
+    @NotEmpty(message = "Name is mandatory")
+    private final String name;
+
+    public UserNotEmpty(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" + "name=" + name + "}";
+    }
+}

javaxval/src/main/java/org/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java

@@ -1,22 +1,22 @@
-package org.baeldung.javabeanconstraints.entities;
-
-import javax.validation.constraints.NotNull;
-
-public class UserNotNull {
-    
-    @NotNull(message = "Name is mandatory")
-    private final String name;
-    
-    public UserNotNull(String name) {
-        this.name = name;
-    }
-    
-    public String getName() {
-        return name;
-    }
-    
-    @Override
-    public String toString() {
-        return "User{" + "name=" + name + "}";
-    }
-}
+package org.baeldung.javaxval.javabeanconstraints.entities;
+
+import javax.validation.constraints.NotNull;
+
+public class UserNotNull {
+
+    @NotNull(message = "Name is mandatory")
+    private final String name;
+
+    public UserNotNull(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" + "name=" + name + "}";
+    }
+}

javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/MethodValidationConfig.java

@@ -1,5 +1,7 @@
 package org.baeldung.javaxval.methodvalidation;
 
+import java.time.LocalDate;
+
 import org.baeldung.javaxval.methodvalidation.model.Customer;
 import org.baeldung.javaxval.methodvalidation.model.Reservation;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -9,8 +11,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
 
-import java.time.LocalDate;
-
 @Configuration
 @ComponentScan({ "org.baeldung.javaxval.methodvalidation.model" })
 public class MethodValidationConfig {

javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java

@@ -1,10 +1,11 @@
 package org.baeldung.javaxval.methodvalidation.constraints;
 
+import java.time.LocalDate;
+
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 import javax.validation.constraintvalidation.SupportedValidationTarget;
 import javax.validation.constraintvalidation.ValidationTarget;
-import java.time.LocalDate;
 
 @SupportedValidationTarget(ValidationTarget.PARAMETERS)
 public class ConsistentDateParameterValidator implements ConstraintValidator<ConsistentDateParameters, Object[]> {

javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java

@@ -1,13 +1,15 @@
 package org.baeldung.javaxval.methodvalidation.constraints;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import javax.validation.Constraint;
+import javax.validation.Payload;
 
 @Constraint(validatedBy = ConsistentDateParameterValidator.class)
 @Target({ METHOD, CONSTRUCTOR })

javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java

@@ -1,15 +1,16 @@
 package org.baeldung.javaxval.methodvalidation.constraints;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
 @Constraint(validatedBy = ValidReservationValidator.class)
 @Target({ METHOD, CONSTRUCTOR })
 @Retention(RUNTIME)

javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java

@@ -1,10 +1,11 @@
 package org.baeldung.javaxval.methodvalidation.constraints;
 
-import org.baeldung.javaxval.methodvalidation.model.Reservation;
+import java.time.LocalDate;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
-import java.time.LocalDate;
+
+import org.baeldung.javaxval.methodvalidation.model.Reservation;
 
 public class ValidReservationValidator implements ConstraintValidator<ValidReservation, Reservation> {
 

javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/Customer.java

@@ -1,10 +1,10 @@
 package org.baeldung.javaxval.methodvalidation.model;
 
-import org.springframework.validation.annotation.Validated;
-
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
+import org.springframework.validation.annotation.Validated;
+
 @Validated
 public class Customer {
 

javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/Reservation.java

@@ -1,13 +1,14 @@
 package org.baeldung.javaxval.methodvalidation.model;
 
+import java.time.LocalDate;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Positive;
+
 import org.baeldung.javaxval.methodvalidation.constraints.ConsistentDateParameters;
 import org.baeldung.javaxval.methodvalidation.constraints.ValidReservation;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Positive;
-import java.time.LocalDate;
-
 @Validated
 public class Reservation {
 

javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/model/ReservationManagement.java

@@ -1,17 +1,20 @@
 package org.baeldung.javaxval.methodvalidation.model;
 
+import java.time.LocalDate;
+import java.util.List;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Future;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
 import org.baeldung.javaxval.methodvalidation.constraints.ConsistentDateParameters;
-import org.baeldung.javaxval.methodvalidation.constraints.ValidReservation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-import java.time.LocalDate;
-import java.util.List;
-
 @Controller
 @Validated
 public class ReservationManagement {

javaxval/src/main/java/org/baeldung/javaxval/validationgroup/AdvanceInfo.java

@@ -0,0 +1,5 @@
+package org.baeldung.javaxval.validationgroup;
+
+public interface AdvanceInfo {
+
+}

javaxval/src/main/java/org/baeldung/javaxval/validationgroup/BasicInfo.java

@@ -0,0 +1,5 @@
+package org.baeldung.javaxval.validationgroup;
+
+public interface BasicInfo {
+
+}

javaxval/src/main/java/org/baeldung/javaxval/validationgroup/CompleteInfo.java

@@ -0,0 +1,8 @@
+package org.baeldung.javaxval.validationgroup;
+
+import javax.validation.GroupSequence;
+
+@GroupSequence({ BasicInfo.class, AdvanceInfo.class })
+public interface CompleteInfo {
+
+}

javaxval/src/main/java/org/baeldung/javaxval/validationgroup/RegistrationForm.java

@@ -0,0 +1,110 @@
+package org.baeldung.javaxval.validationgroup;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+
+public class RegistrationForm {
+    @NotBlank(groups = BasicInfo.class)
+    private String firstName;
+    @NotBlank(groups = BasicInfo.class)
+    private String lastName;
+    @Email(groups = BasicInfo.class)
+    private String email;
+    @NotBlank(groups = BasicInfo.class)
+    private String phone;
+
+    @NotBlank(groups = { BasicInfo.class, AdvanceInfo.class })
+    private String captcha;
+
+    @NotBlank(groups = AdvanceInfo.class)
+    private String street;
+    @NotBlank(groups = AdvanceInfo.class)
+    private String houseNumber;
+    @NotBlank(groups = AdvanceInfo.class)
+    private String zipCode;
+    @NotBlank(groups = AdvanceInfo.class)
+    private String city;
+    @NotBlank(groups = AdvanceInfo.class)
+    private String country;
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
+    public String getHouseNumber() {
+        return houseNumber;
+    }
+
+    public void setHouseNumber(String houseNumber) {
+        this.houseNumber = houseNumber;
+    }
+
+    public String getZipCode() {
+        return zipCode;
+    }
+
+    public void setZipCode(String zipCode) {
+        this.zipCode = zipCode;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getCaptcha() {
+        return captcha;
+    }
+
+    public void setCaptcha(String captcha) {
+        this.captcha = captcha;
+    }
+
+}

javaxval/src/main/resources/META-INF/services/javax.validation.valueextraction.ValueExtractor

@@ -1 +1 @@
-org.baeldung.valueextractors.ProfileValueExtractor
+org.baeldung.javaxval.container.validation.valueextractors.ProfileValueExtractor