From 0a0e40a8cf8a5812f784525b3c1f2f02771e8553 Mon Sep 17 00:00:00 2001 From: Aayush Kapur Date: Tue, 26 Sep 2023 14:59:09 +0530 Subject: [PATCH] added user friendly messages on blank fields --- .../samples/petclinic/model/Person.java | 4 ++-- .../springframework/samples/petclinic/owner/Owner.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/model/Person.java b/src/main/java/org/springframework/samples/petclinic/model/Person.java index 7c3d81a84..9ded89c1b 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/Person.java +++ b/src/main/java/org/springframework/samples/petclinic/model/Person.java @@ -28,11 +28,11 @@ import jakarta.validation.constraints.NotBlank; public class Person extends BaseEntity { @Column(name = "first_name") - @NotBlank + @NotBlank(message = "First Name cannot be blank") private String firstName; @Column(name = "last_name") - @NotBlank + @NotBlank(message = "Last Name cannot be blank") private String lastName; public String getFirstName() { diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java index c7394689a..dbf71708b 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java @@ -30,8 +30,8 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToMany; import jakarta.persistence.OrderBy; import jakarta.persistence.Table; -import jakarta.validation.constraints.Digits; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; /** * Simple JavaBean domain object representing an owner. @@ -47,16 +47,16 @@ import jakarta.validation.constraints.NotBlank; public class Owner extends Person { @Column(name = "address") - @NotBlank + @NotBlank(message = "Address cannot be blank") private String address; @Column(name = "city") - @NotBlank + @NotBlank(message = "City cannot be blank") private String city; @Column(name = "telephone") - @NotBlank - @Digits(fraction = 0, integer = 10) + @NotBlank(message = "Telephone cannot be blank") + @Pattern(regexp = "\\d{10}", message = "Telephone must be a 10-digit number") private String telephone; @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)