Reformatting code of javaxval before starting on [BAEL-3306]

This commit is contained in:
Martin van Wingerden 2019-10-02 13:37:28 +02:00
parent 0ba79b88b4
commit 76e0fe4642
No known key found for this signature in database
GPG Key ID: 6DB72288DF1725E3
10 changed files with 116 additions and 117 deletions

View File

@ -10,10 +10,10 @@ import javax.validation.constraints.PositiveOrZero;
public class Customer { public class Customer {
@NotBlank(message="Name cannot be empty") @NotBlank(message = "Name cannot be empty")
private String name; 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; private Integer age;

View File

@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
public class CustomerMap { 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() { public Map<String, Customer> getCustomers() {
return customers; return customers;

View File

@ -6,7 +6,7 @@ import org.baeldung.javabeanconstraints.entities.UserNotBlank;
public class Application { public class Application {
public static void main(String[] args) throws Exception { 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

@ -7,13 +7,13 @@ import javax.validation.constraints.Digits;
public class Invoice { public class Invoice {
@DecimalMin(value = "0.0", inclusive = false) @DecimalMin(value = "0.0", inclusive = false)
@Digits(integer=3, fraction=2) @Digits(integer = 3, fraction = 2)
private BigDecimal price; private BigDecimal price;
private String description; private String description;
public Invoice(BigDecimal price, String description) { public Invoice(BigDecimal price, String description) {
this.price = price; this.price = price;
this.description = description; this.description = description;
} }
} }

View File

@ -4,107 +4,107 @@ import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
public class RegistrationForm { public class RegistrationForm {
@NotBlank(groups = BasicInfo.class) @NotBlank(groups = BasicInfo.class)
private String firstName; private String firstName;
@NotBlank(groups = BasicInfo.class) @NotBlank(groups = BasicInfo.class)
private String lastName; private String lastName;
@Email(groups = BasicInfo.class) @Email(groups = BasicInfo.class)
private String email; private String email;
@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)
private String street; private String street;
@NotBlank(groups = AdvanceInfo.class) @NotBlank(groups = AdvanceInfo.class)
private String houseNumber; private String houseNumber;
@NotBlank(groups = AdvanceInfo.class) @NotBlank(groups = AdvanceInfo.class)
private String zipCode; private String zipCode;
@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 contry;
public String getStreet() { public String getStreet() {
return street; return street;
} }
public void setStreet(String street) { public void setStreet(String street) {
this.street = street; this.street = street;
} }
public String getHouseNumber() { public String getHouseNumber() {
return houseNumber; return houseNumber;
} }
public void setHouseNumber(String houseNumber) { public void setHouseNumber(String houseNumber) {
this.houseNumber = houseNumber; this.houseNumber = houseNumber;
} }
public String getZipCode() { public String getZipCode() {
return zipCode; return zipCode;
} }
public void setZipCode(String zipCode) { public void setZipCode(String zipCode) {
this.zipCode = zipCode; this.zipCode = zipCode;
} }
public String getCity() { public String getCity() {
return city; return city;
} }
public void setCity(String city) { public void setCity(String city) {
this.city = city; this.city = city;
} }
public String getContry() { public String getContry() {
return contry; return contry;
} }
public void setContry(String contry) { public void setContry(String contry) {
this.contry = contry; this.contry = contry;
} }
public String getFirstName() { public String getFirstName() {
return firstName; return firstName;
} }
public void setFirstName(String firstName) { public void setFirstName(String firstName) {
this.firstName = firstName; this.firstName = firstName;
} }
public String getLastName() { public String getLastName() {
return lastName; return lastName;
} }
public void setLastName(String lastName) { public void setLastName(String lastName) {
this.lastName = lastName; this.lastName = lastName;
} }
public String getEmail() { public String getEmail() {
return email; return email;
} }
public void setEmail(String email) { public void setEmail(String email) {
this.email = email; this.email = email;
} }
public String getPhone() { public String getPhone() {
return phone; return phone;
} }
public void setPhone(String phone) { public void setPhone(String phone) {
this.phone = phone; this.phone = phone;
} }
public String getCaptcha() { public String getCaptcha() {
return captcha; return captcha;
} }
public void setCaptcha(String captcha) { public void setCaptcha(String captcha) {
this.captcha = captcha; this.captcha = captcha;
} }
} }

View File

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

View File

@ -24,9 +24,9 @@ public class ValidReservationValidator implements ConstraintValidator<ValidReser
} }
return (reservation.getBegin() return (reservation.getBegin()
.isAfter(LocalDate.now()) .isAfter(LocalDate.now())
&& reservation.getBegin() && reservation.getBegin()
.isBefore(reservation.getEnd()) .isBefore(reservation.getEnd())
&& reservation.getRoom() > 0); && reservation.getRoom() > 0);
} }
} }