From 405cdc635b10770a2f5ed70be973cdf905cfa736 Mon Sep 17 00:00:00 2001 From: Pedro Chevallier Date: Wed, 20 Mar 2024 18:54:40 -0300 Subject: [PATCH] Add user friendly error message --- .../org/springframework/samples/petclinic/owner/Owner.java | 4 ++-- .../samples/petclinic/owner/OwnerControllerTests.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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..6a3f093d6 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java @@ -30,7 +30,7 @@ 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.Pattern; import jakarta.validation.constraints.NotBlank; /** @@ -56,7 +56,7 @@ public class Owner extends Person { @Column(name = "telephone") @NotBlank - @Digits(fraction = 0, integer = 10) + @Pattern(regexp = "\\d{10}", message = "Telephone must be a 10-digit number") private String telephone; @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java index 0ba224a63..fc22fb01a 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java @@ -117,7 +117,7 @@ class OwnerControllerTests { .param("lastName", "Bloggs") .param("address", "123 Caramel Street") .param("city", "London") - .param("telephone", "01316761638")) + .param("telephone", "1316761638")) .andExpect(status().is3xxRedirection()); } @@ -188,7 +188,7 @@ class OwnerControllerTests { .param("lastName", "Bloggs") .param("address", "123 Caramel Street") .param("city", "London") - .param("telephone", "01616291589")) + .param("telephone", "1616291589")) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/owners/{ownerId}")); }