Formatted using the eclipse formatter

This commit is contained in:
Martin van Wingerden 2019-10-02 13:52:41 +02:00
parent 76e0fe4642
commit 86dd449968
No known key found for this signature in database
GPG Key ID: 6DB72288DF1725E3
21 changed files with 275 additions and 241 deletions

View File

@ -20,7 +20,6 @@ public class Customer {
@PositiveOrZero @PositiveOrZero
private OptionalInt numberOfOrders; private OptionalInt numberOfOrders;
//@NotBlank
private Profile profile; private Profile profile;
public String getName() { public String getName() {

View File

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

View File

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

View File

@ -13,7 +13,7 @@ public class RegistrationForm {
@NotBlank(groups = BasicInfo.class) @NotBlank(groups = BasicInfo.class)
private String phone; private String phone;
@NotBlank(groups = {BasicInfo.class, AdvanceInfo.class}) @NotBlank(groups = { BasicInfo.class, AdvanceInfo.class })
private String captcha; private String captcha;
@NotBlank(groups = AdvanceInfo.class) @NotBlank(groups = AdvanceInfo.class)
@ -25,7 +25,7 @@ public class RegistrationForm {
@NotBlank(groups = AdvanceInfo.class) @NotBlank(groups = AdvanceInfo.class)
private String city; private String city;
@NotBlank(groups = AdvanceInfo.class) @NotBlank(groups = AdvanceInfo.class)
private String contry; private String country;
public String getStreet() { public String getStreet() {
return street; return street;
@ -59,12 +59,12 @@ public class RegistrationForm {
this.city = city; this.city = city;
} }
public String getContry() { public String getCountry() {
return contry; return country;
} }
public void setContry(String contry) { public void setCountry(String country) {
this.contry = contry; this.country = country;
} }
public String getFirstName() { public String getFirstName() {

View File

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

View File

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

View File

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

View File

@ -1,15 +1,16 @@
package org.baeldung.javaxval.methodvalidation.constraints; 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.CONSTRUCTOR;
import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME; 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) @Constraint(validatedBy = ValidReservationValidator.class)
@Target({ METHOD, CONSTRUCTOR }) @Target({ METHOD, CONSTRUCTOR })
@Retention(RUNTIME) @Retention(RUNTIME)

View File

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

View File

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

View File

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

View File

@ -1,17 +1,20 @@
package org.baeldung.javaxval.methodvalidation.model; 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.ConsistentDateParameters;
import org.baeldung.javaxval.methodvalidation.constraints.ValidReservation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.*;
import java.time.LocalDate;
import java.util.List;
@Controller @Controller
@Validated @Validated
public class ReservationManagement { public class ReservationManagement {

View File

@ -10,8 +10,8 @@ import javax.validation.ConstraintViolation;
import javax.validation.Validation; import javax.validation.Validation;
import javax.validation.Validator; import javax.validation.Validator;
import javax.validation.ValidatorFactory; import javax.validation.ValidatorFactory;
import org.baeldung.valueextractors.ProfileValueExtractor;
import org.baeldung.valueextractors.ProfileValueExtractor;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -20,8 +20,10 @@ public class ContainerValidationIntegrationTest {
@Before @Before
public void setup() { public void setup() {
ValidatorFactory factory = Validation.byDefaultProvider().configure() ValidatorFactory factory = Validation.byDefaultProvider()
.addValueExtractor(new ProfileValueExtractor()).buildValidatorFactory(); .configure()
.addValueExtractor(new ProfileValueExtractor())
.buildValidatorFactory();
validator = factory.getValidator(); validator = factory.getValidator();
} }
@ -74,7 +76,7 @@ public class ContainerValidationIntegrationTest {
assertEquals(0, violations.size()); assertEquals(0, violations.size());
} }
//@Test // @Test
public void whenProfileCompanyNameBlank_thenValidationFails() { public void whenProfileCompanyNameBlank_thenValidationFails() {
Customer customer = new Customer(); Customer customer = new Customer();
customer.setName("John"); customer.setName("John");

View File

@ -18,7 +18,8 @@ public class InvoiceUnitTest {
@BeforeClass @BeforeClass
public static void setupValidatorInstance() { public static void setupValidatorInstance() {
validator = Validation.buildDefaultValidatorFactory().getValidator(); validator = Validation.buildDefaultValidatorFactory()
.getValidator();
} }
@Test @Test
@ -26,8 +27,7 @@ public class InvoiceUnitTest {
Invoice invoice = new Invoice(new BigDecimal(10.21), "Book purchased"); Invoice invoice = new Invoice(new BigDecimal(10.21), "Book purchased");
Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice); Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice);
assertThat(violations.size()).isEqualTo(1); assertThat(violations.size()).isEqualTo(1);
violations.forEach(action-> assertThat(action.getMessage()) violations.forEach(action -> assertThat(action.getMessage()).isEqualTo("numeric value out of bounds (<3 digits>.<2 digits> expected)"));
.isEqualTo("numeric value out of bounds (<3 digits>.<2 digits> expected)"));
} }
@Test @Test
@ -42,8 +42,7 @@ public class InvoiceUnitTest {
Invoice invoice = new Invoice(new BigDecimal(1021.21), "Book purchased"); Invoice invoice = new Invoice(new BigDecimal(1021.21), "Book purchased");
Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice); Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice);
assertThat(violations.size()).isEqualTo(1); assertThat(violations.size()).isEqualTo(1);
violations.forEach(action-> assertThat(action.getMessage()) violations.forEach(action -> assertThat(action.getMessage()).isEqualTo("numeric value out of bounds (<3 digits>.<2 digits> expected)"));
.isEqualTo("numeric value out of bounds (<3 digits>.<2 digits> expected)"));
} }
@Test @Test
@ -51,8 +50,7 @@ public class InvoiceUnitTest {
Invoice invoice = new Invoice(new BigDecimal(000.00), "Book purchased"); Invoice invoice = new Invoice(new BigDecimal(000.00), "Book purchased");
Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice); Set<ConstraintViolation<Invoice>> violations = validator.validate(invoice);
assertThat(violations.size()).isEqualTo(1); assertThat(violations.size()).isEqualTo(1);
violations.forEach(action-> assertThat(action.getMessage()) violations.forEach(action -> assertThat(action.getMessage()).isEqualTo("must be greater than 0.0"));
.isEqualTo("must be greater than 0.0"));
} }
@Test @Test

View File

@ -1,10 +1,13 @@
package org.baeldung.javabeanconstraints.test; package org.baeldung.javabeanconstraints.test;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set; import java.util.Set;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import javax.validation.Validation; import javax.validation.Validation;
import javax.validation.Validator; import javax.validation.Validator;
import static org.assertj.core.api.Assertions.assertThat;
import org.baeldung.javabeanconstraints.entities.UserNotBlank; import org.baeldung.javabeanconstraints.entities.UserNotBlank;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@ -15,7 +18,8 @@ public class UserNotBlankUnitTest {
@BeforeClass @BeforeClass
public static void setupValidatorInstance() { public static void setupValidatorInstance() {
validator = Validation.buildDefaultValidatorFactory().getValidator(); validator = Validation.buildDefaultValidatorFactory()
.getValidator();
} }
@Test @Test

View File

@ -1,10 +1,13 @@
package org.baeldung.javabeanconstraints.test; package org.baeldung.javabeanconstraints.test;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set; import java.util.Set;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import javax.validation.Validation; import javax.validation.Validation;
import javax.validation.Validator; import javax.validation.Validator;
import static org.assertj.core.api.Assertions.assertThat;
import org.baeldung.javabeanconstraints.entities.UserNotEmpty; import org.baeldung.javabeanconstraints.entities.UserNotEmpty;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@ -15,7 +18,8 @@ public class UserNotEmptyUnitTest {
@BeforeClass @BeforeClass
public static void setupValidatorInstance() { public static void setupValidatorInstance() {
validator = Validation.buildDefaultValidatorFactory().getValidator(); validator = Validation.buildDefaultValidatorFactory()
.getValidator();
} }
@Test @Test

View File

@ -1,10 +1,13 @@
package org.baeldung.javabeanconstraints.test; package org.baeldung.javabeanconstraints.test;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set; import java.util.Set;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import javax.validation.Validation; import javax.validation.Validation;
import javax.validation.Validator; import javax.validation.Validator;
import static org.assertj.core.api.Assertions.assertThat;
import org.baeldung.javabeanconstraints.entities.UserNotNull; import org.baeldung.javabeanconstraints.entities.UserNotNull;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@ -15,7 +18,8 @@ public class UserNotNullUnitTest {
@BeforeClass @BeforeClass
public static void setupValidatorInstance() { public static void setupValidatorInstance() {
validator = Validation.buildDefaultValidatorFactory().getValidator(); validator = Validation.buildDefaultValidatorFactory()
.getValidator();
} }
@Test @Test

View File

@ -16,7 +16,8 @@ public class RegistrationFormUnitTest {
@BeforeClass @BeforeClass
public static void setupValidatorInstance() { public static void setupValidatorInstance() {
validator = Validation.buildDefaultValidatorFactory().getValidator(); validator = Validation.buildDefaultValidatorFactory()
.getValidator();
} }
@Test @Test
@ -27,7 +28,8 @@ public class RegistrationFormUnitTest {
assertThat(violations.size()).isEqualTo(1); assertThat(violations.size()).isEqualTo(1);
violations.forEach(action -> { violations.forEach(action -> {
assertThat(action.getMessage()).isEqualTo("must not be blank"); assertThat(action.getMessage()).isEqualTo("must not be blank");
assertThat(action.getPropertyPath().toString()).isEqualTo("firstName"); assertThat(action.getPropertyPath()
.toString()).isEqualTo("firstName");
}); });
} }
@ -39,7 +41,8 @@ public class RegistrationFormUnitTest {
assertThat(violations.size()).isEqualTo(1); assertThat(violations.size()).isEqualTo(1);
violations.forEach(action -> { violations.forEach(action -> {
assertThat(action.getMessage()).isEqualTo("must not be blank"); assertThat(action.getMessage()).isEqualTo("must not be blank");
assertThat(action.getPropertyPath().toString()).isEqualTo("zipCode"); assertThat(action.getPropertyPath()
.toString()).isEqualTo("zipCode");
}); });
} }
@ -51,7 +54,8 @@ public class RegistrationFormUnitTest {
assertThat(violations.size()).isEqualTo(1); assertThat(violations.size()).isEqualTo(1);
violations.forEach(action -> { violations.forEach(action -> {
assertThat(action.getMessage()).isEqualTo("must not be blank"); assertThat(action.getMessage()).isEqualTo("must not be blank");
assertThat(action.getPropertyPath().toString()).isEqualTo("captcha"); assertThat(action.getPropertyPath()
.toString()).isEqualTo("captcha");
}); });
} }
@ -63,7 +67,8 @@ public class RegistrationFormUnitTest {
assertThat(violations.size()).isEqualTo(1); assertThat(violations.size()).isEqualTo(1);
violations.forEach(action -> { violations.forEach(action -> {
assertThat(action.getMessage()).isEqualTo("must not be blank"); assertThat(action.getMessage()).isEqualTo("must not be blank");
assertThat(action.getPropertyPath().toString()).isEqualTo("captcha"); assertThat(action.getPropertyPath()
.toString()).isEqualTo("captcha");
}); });
} }
@ -75,7 +80,8 @@ public class RegistrationFormUnitTest {
assertThat(violations.size()).isEqualTo(1); assertThat(violations.size()).isEqualTo(1);
violations.forEach(action -> { violations.forEach(action -> {
assertThat(action.getMessage()).isEqualTo("must not be blank"); assertThat(action.getMessage()).isEqualTo("must not be blank");
assertThat(action.getPropertyPath().toString()).isEqualTo("firstName"); assertThat(action.getPropertyPath()
.toString()).isEqualTo("firstName");
}); });
} }
@ -87,7 +93,8 @@ public class RegistrationFormUnitTest {
assertThat(violations.size()).isEqualTo(1); assertThat(violations.size()).isEqualTo(1);
violations.forEach(action -> { violations.forEach(action -> {
assertThat(action.getMessage()).isEqualTo("must not be blank"); assertThat(action.getMessage()).isEqualTo("must not be blank");
assertThat(action.getPropertyPath().toString()).isEqualTo("zipCode"); assertThat(action.getPropertyPath()
.toString()).isEqualTo("zipCode");
}); });
} }
@ -122,7 +129,7 @@ public class RegistrationFormUnitTest {
private RegistrationForm populateAdvanceInfo(RegistrationForm form) { private RegistrationForm populateAdvanceInfo(RegistrationForm form) {
form.setCity("Berlin"); form.setCity("Berlin");
form.setContry("DE"); form.setCountry("DE");
form.setStreet("alexa str."); form.setStreet("alexa str.");
form.setZipCode("19923"); form.setZipCode("19923");
form.setHouseNumber("2a"); form.setHouseNumber("2a");

View File

@ -1,5 +1,10 @@
package org.baeldung.javaxval.methodvalidation; package org.baeldung.javaxval.methodvalidation;
import java.time.LocalDate;
import java.util.List;
import javax.validation.ConstraintViolationException;
import org.baeldung.javaxval.methodvalidation.model.Customer; import org.baeldung.javaxval.methodvalidation.model.Customer;
import org.baeldung.javaxval.methodvalidation.model.Reservation; import org.baeldung.javaxval.methodvalidation.model.Reservation;
import org.baeldung.javaxval.methodvalidation.model.ReservationManagement; import org.baeldung.javaxval.methodvalidation.model.ReservationManagement;
@ -12,10 +17,6 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader; import org.springframework.test.context.support.AnnotationConfigContextLoader;
import javax.validation.ConstraintViolationException;
import java.time.LocalDate;
import java.util.List;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = { MethodValidationConfig.class }, loader = AnnotationConfigContextLoader.class) @ContextConfiguration(classes = { MethodValidationConfig.class }, loader = AnnotationConfigContextLoader.class)
public class ContainerValidationIntegrationTest { public class ContainerValidationIntegrationTest {

View File

@ -1,21 +1,23 @@
package org.baeldung.javaxval.methodvalidation; package org.baeldung.javaxval.methodvalidation;
import static org.junit.Assert.assertEquals;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.time.LocalDate;
import java.util.Collections;
import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.ValidatorFactory;
import javax.validation.executable.ExecutableValidator;
import org.baeldung.javaxval.methodvalidation.model.Customer; import org.baeldung.javaxval.methodvalidation.model.Customer;
import org.baeldung.javaxval.methodvalidation.model.Reservation; import org.baeldung.javaxval.methodvalidation.model.Reservation;
import org.baeldung.javaxval.methodvalidation.model.ReservationManagement; import org.baeldung.javaxval.methodvalidation.model.ReservationManagement;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.ValidatorFactory;
import javax.validation.executable.ExecutableValidator;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.time.LocalDate;
import java.util.Collections;
import java.util.Set;
public class ValidationIntegrationTest { public class ValidationIntegrationTest {