From ac49a57dd3facec7635a063613b0fb767fcb0d01 Mon Sep 17 00:00:00 2001 From: St ef Date: Tue, 1 Jun 2021 20:15:36 +0200 Subject: [PATCH] Revert "Revert "Revert "Build successfull""" This reverts commit 8ceb14f39c94093b53a6577383784b1bc8313464. --- pom.xml | 8 -------- .../springframework/samples/petclinic/model/Person.java | 2 ++ .../springframework/samples/petclinic/owner/Owner.java | 4 ++++ .../samples/petclinic/owner/OwnerController.java | 4 ++-- .../samples/petclinic/owner/PetController.java | 4 ++-- .../samples/petclinic/owner/VisitController.java | 2 +- .../springframework/samples/petclinic/visit/Visit.java | 1 + 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index e6de39cc9..12f131028 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,6 @@ 5.0.1 1.12.1 3.6.0 - 2.0.1.Final 1.10.0 0.8.7 @@ -109,13 +108,6 @@ spring-boot-devtools true - - - javax.validation - validation-api - ${webjars-validation-api.version} - - 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 4ef177805..15fabacc3 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/Person.java +++ b/src/main/java/org/springframework/samples/petclinic/model/Person.java @@ -28,9 +28,11 @@ import javax.validation.constraints.NotEmpty; public class Person extends BaseEntity { @Column(name = "first_name") + @NotEmpty private String firstName; @Column(name = "last_name") + @NotEmpty 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 113ced8d3..61083bc8d 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java @@ -47,12 +47,16 @@ import org.springframework.samples.petclinic.model.Person; public class Owner extends Person { @Column(name = "address") + @NotEmpty private String address; @Column(name = "city") + @NotEmpty private String city; @Column(name = "telephone") + @NotEmpty + @Digits(fraction = 0, integer = 10) private String telephone; @OneToMany(cascade = CascadeType.ALL, mappedBy = "owner") diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java index dd68121f6..79aa4cd9b 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java @@ -63,7 +63,7 @@ class OwnerController { } @PostMapping("/owners/new") - public String processCreationForm(Owner owner, BindingResult result) { + public String processCreationForm(@Valid Owner owner, BindingResult result) { if (result.hasErrors()) { return VIEWS_OWNER_CREATE_OR_UPDATE_FORM; } @@ -114,7 +114,7 @@ class OwnerController { } @PostMapping("/owners/{ownerId}/edit") - public String processUpdateOwnerForm(Owner owner, BindingResult result, + public String processUpdateOwnerForm(@Valid Owner owner, BindingResult result, @PathVariable("ownerId") int ownerId) { if (result.hasErrors()) { return VIEWS_OWNER_CREATE_OR_UPDATE_FORM; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java index 19848150f..a55e599af 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java @@ -74,7 +74,7 @@ class PetController { } @PostMapping("/pets/new") - public String processCreationForm(Owner owner, Pet pet, BindingResult result, ModelMap model) { + public String processCreationForm(Owner owner, @Valid Pet pet, BindingResult result, ModelMap model) { if (StringUtils.hasLength(pet.getName()) && pet.isNew() && owner.getPet(pet.getName(), true) != null) { result.rejectValue("name", "duplicate", "already exists"); } @@ -97,7 +97,7 @@ class PetController { } @PostMapping("/pets/{petId}/edit") - public String processUpdateForm(Pet pet, BindingResult result, Owner owner, ModelMap model) { + public String processUpdateForm(@Valid Pet pet, BindingResult result, Owner owner, ModelMap model) { if (result.hasErrors()) { pet.setOwner(owner); model.put("pet", pet); diff --git a/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java b/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java index 9091cb6a1..375980312 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java @@ -79,7 +79,7 @@ class VisitController { // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is called @PostMapping("/owners/{ownerId}/pets/{petId}/visits/new") - public String processNewVisitForm(Visit visit, BindingResult result) { + public String processNewVisitForm(@Valid Visit visit, BindingResult result) { if (result.hasErrors()) { return "pets/createOrUpdateVisitForm"; } diff --git a/src/main/java/org/springframework/samples/petclinic/visit/Visit.java b/src/main/java/org/springframework/samples/petclinic/visit/Visit.java index caf650efe..df9f25fe0 100755 --- a/src/main/java/org/springframework/samples/petclinic/visit/Visit.java +++ b/src/main/java/org/springframework/samples/petclinic/visit/Visit.java @@ -39,6 +39,7 @@ public class Visit extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate date; + @NotEmpty @Column(name = "description") private String description;