From 76e0fe46428a47a521d15d7b8322cb5e33650bca Mon Sep 17 00:00:00 2001 From: Martin van Wingerden Date: Wed, 2 Oct 2019 13:37:28 +0200 Subject: [PATCH] Reformatting code of javaxval before starting on [BAEL-3306] --- .../src/main/java/org/baeldung/Customer.java | 10 +- .../main/java/org/baeldung/CustomerMap.java | 4 +- .../appplication/Application.java | 4 +- .../bigdecimal/Invoice.java | 16 +- .../entities/UserNotBlank.java | 6 +- .../entities/UserNotEmpty.java | 8 +- .../entities/UserNotNull.java | 8 +- .../validationgroup/RegistrationForm.java | 162 +++++++++--------- .../javaxval/beanvalidation/User.java | 9 +- .../ValidReservationValidator.java | 6 +- 10 files changed, 116 insertions(+), 117 deletions(-) diff --git a/javaxval/src/main/java/org/baeldung/Customer.java b/javaxval/src/main/java/org/baeldung/Customer.java index a90fb419de..f301fe6c80 100644 --- a/javaxval/src/main/java/org/baeldung/Customer.java +++ b/javaxval/src/main/java/org/baeldung/Customer.java @@ -10,16 +10,16 @@ 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 private Profile profile; diff --git a/javaxval/src/main/java/org/baeldung/CustomerMap.java b/javaxval/src/main/java/org/baeldung/CustomerMap.java index 37446cf86e..d8830a7f42 100644 --- a/javaxval/src/main/java/org/baeldung/CustomerMap.java +++ b/javaxval/src/main/java/org/baeldung/CustomerMap.java @@ -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 getCustomers() { return customers; diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/appplication/Application.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/appplication/Application.java index c9f2ab6f98..f60eab3e63 100644 --- a/javaxval/src/main/java/org/baeldung/javabeanconstraints/appplication/Application.java +++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/appplication/Application.java @@ -6,9 +6,9 @@ import org.baeldung.javabeanconstraints.entities.UserNotBlank; public class Application { - public static void main(String[] args) throws Exception { + 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())); + validator.validate(user).stream().forEach(violation -> System.out.println(violation.getMessage())); } } diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/bigdecimal/Invoice.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/bigdecimal/Invoice.java index 6df1b79a60..886123dad7 100644 --- a/javaxval/src/main/java/org/baeldung/javabeanconstraints/bigdecimal/Invoice.java +++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/bigdecimal/Invoice.java @@ -6,14 +6,14 @@ import javax.validation.constraints.DecimalMin; import javax.validation.constraints.Digits; public class Invoice { - - @DecimalMin(value = "0.0", inclusive = false) - @Digits(integer=3, fraction=2) + + @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; - } + + public Invoice(BigDecimal price, String description) { + this.price = price; + this.description = description; + } } diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotBlank.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotBlank.java index 2ea6a3af56..b49e587ce5 100644 --- a/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotBlank.java +++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotBlank.java @@ -6,15 +6,15 @@ 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 + "}"; diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotEmpty.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotEmpty.java index 39e34b63d3..0da768b103 100644 --- a/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotEmpty.java +++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotEmpty.java @@ -3,18 +3,18 @@ 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 + "}"; diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotNull.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotNull.java index 598c9ba9f9..63a1017b75 100644 --- a/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotNull.java +++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/entities/UserNotNull.java @@ -3,18 +3,18 @@ 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 + "}"; diff --git a/javaxval/src/main/java/org/baeldung/javabeanconstraints/validationgroup/RegistrationForm.java b/javaxval/src/main/java/org/baeldung/javabeanconstraints/validationgroup/RegistrationForm.java index ac8da5c26b..4cebe0e218 100644 --- a/javaxval/src/main/java/org/baeldung/javabeanconstraints/validationgroup/RegistrationForm.java +++ b/javaxval/src/main/java/org/baeldung/javabeanconstraints/validationgroup/RegistrationForm.java @@ -4,107 +4,107 @@ 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) + 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 = {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; + @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 String getStreet() { + return street; + } - public void setStreet(String street) { - this.street = street; - } + public void setStreet(String street) { + this.street = street; + } - public String getHouseNumber() { - return houseNumber; - } + public String getHouseNumber() { + return houseNumber; + } - public void setHouseNumber(String houseNumber) { - this.houseNumber = houseNumber; - } + public void setHouseNumber(String houseNumber) { + this.houseNumber = houseNumber; + } - public String getZipCode() { - return zipCode; - } + public String getZipCode() { + return zipCode; + } - public void setZipCode(String zipCode) { - this.zipCode = zipCode; - } + public void setZipCode(String zipCode) { + this.zipCode = zipCode; + } - public String getCity() { - return city; - } + public String getCity() { + return city; + } - public void setCity(String city) { - this.city = city; - } + public void setCity(String city) { + this.city = city; + } - public String getContry() { - return contry; - } + public String getContry() { + return contry; + } - public void setContry(String contry) { - this.contry = contry; - } + public void setContry(String contry) { + this.contry = contry; + } - public String getFirstName() { - return firstName; - } + public String getFirstName() { + return firstName; + } - public void setFirstName(String firstName) { - this.firstName = firstName; - } + public void setFirstName(String firstName) { + this.firstName = firstName; + } - public String getLastName() { - return lastName; - } + public String getLastName() { + return lastName; + } - public void setLastName(String lastName) { - this.lastName = lastName; - } + public void setLastName(String lastName) { + this.lastName = lastName; + } - public String getEmail() { - return email; - } + public String getEmail() { + return email; + } - public void setEmail(String email) { - this.email = email; - } + public void setEmail(String email) { + this.email = email; + } - public String getPhone() { - return phone; - } + public String getPhone() { + return phone; + } - public void setPhone(String phone) { - this.phone = phone; - } - - public String getCaptcha() { - return captcha; - } + public void setPhone(String phone) { + this.phone = phone; + } - public void setCaptcha(String captcha) { - this.captcha = captcha; - } + public String getCaptcha() { + return captcha; + } + + public void setCaptcha(String captcha) { + this.captcha = captcha; + } } diff --git a/javaxval/src/main/java/org/baeldung/javaxval/beanvalidation/User.java b/javaxval/src/main/java/org/baeldung/javaxval/beanvalidation/User.java index cf80266c9d..8303edd033 100644 --- a/javaxval/src/main/java/org/baeldung/javaxval/beanvalidation/User.java +++ b/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 preferences) { this.preferences = preferences; } - } diff --git a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java b/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java index 7b730480ed..3d3a84ab9f 100644 --- a/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java +++ b/javaxval/src/main/java/org/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java @@ -24,9 +24,9 @@ public class ValidReservationValidator implements ConstraintValidator 0); + && reservation.getRoom() > 0); } }