From a75c9c428165f47ea290f23a602e543a8064bedf Mon Sep 17 00:00:00 2001 From: Sukhminder Arora Date: Sun, 9 Feb 2025 15:54:21 +0530 Subject: [PATCH] fix: Add constant and improvement in PetClinic Signed-off-by: Sukhminder Arora Signed-off-by: Sukhminder Arora --- .../samples/petclinic/model/Person.java | 4 +- .../petclinic/owner/OwnerController.java | 5 +- .../templates/fragments/inputField.html | 49 +++++++++---------- 3 files changed, 28 insertions(+), 30 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..f2e54a622 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 is required") private String firstName; @Column(name = "last_name") - @NotBlank + @NotBlank(message = "Last name is required") private String lastName; public String getFirstName() { 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 fa3506456..d2ecb3491 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java @@ -47,6 +47,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; class OwnerController { private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm"; + public static final String REDIRECT_OWNERS = "redirect:/owners/"; private final OwnerRepository owners; @@ -81,7 +82,7 @@ class OwnerController { this.owners.save(owner); redirectAttributes.addFlashAttribute("message", "New Owner Created"); - return "redirect:/owners/" + owner.getId(); + return REDIRECT_OWNERS + owner.getId(); } @GetMapping("/owners/find") @@ -108,7 +109,7 @@ class OwnerController { if (ownersResults.getTotalElements() == 1) { // 1 owner found owner = ownersResults.iterator().next(); - return "redirect:/owners/" + owner.getId(); + return REDIRECT_OWNERS + owner.getId(); } // multiple owners found diff --git a/src/main/resources/templates/fragments/inputField.html b/src/main/resources/templates/fragments/inputField.html index 5aeebc9fb..4164277da 100644 --- a/src/main/resources/templates/fragments/inputField.html +++ b/src/main/resources/templates/fragments/inputField.html @@ -1,28 +1,25 @@ - - -
- -
- -
-
- - -
- - - - Error - -
+ + + +
+ +
+
+ + + + +
- - - + + + + + + Error + +
+
+