diff --git a/pom.xml b/pom.xml
index 48ab4773b..1620190f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,9 @@
5.0.1
1.12.1
3.6.0
- 1.10.0
2.0.1.Final
+ 1.10.0
0.8.7
-
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 15fabacc3..4ef177805 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,9 @@ 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 61083bc8d..113ced8d3 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
+++ b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
@@ -47,16 +47,12 @@ 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 79aa4cd9b..dd68121f6 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(@Valid Owner owner, BindingResult result) {
+ public String processCreationForm(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(@Valid Owner owner, BindingResult result,
+ public String processUpdateOwnerForm(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 a55e599af..19848150f 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, @Valid Pet pet, BindingResult result, ModelMap model) {
+ public String processCreationForm(Owner owner, 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(@Valid Pet pet, BindingResult result, Owner owner, ModelMap model) {
+ public String processUpdateForm(Pet pet, BindingResult result, Owner owner, ModelMap model) {
if (result.hasErrors()) {
pet.setOwner(owner);
model.put("pet", pet);
diff --git a/src/main/less/petclinic.less b/src/main/less/petclinic.less
index 1432e82c8..77def4c91 100644
--- a/src/main/less/petclinic.less
+++ b/src/main/less/petclinic.less
@@ -222,6 +222,7 @@ table td.action-column {
.label-success {
text-color: @spring-green;
}
+
.deployment-status-deployed {
.label-success;
}