DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-29 02:15:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Revert "Revert "Build successfull"""

Browse source 
This reverts commit 8ceb14f39c.
This commit is contained in:
St ef 2021-06-01 20:15:36 +02:00
parent 8ceb14f39c
commit ac49a57dd3
7 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pom.xml
View file

@ -25,7 +25,6 @@
<webjars-bootstrap.version>5.0.1</webjars-bootstrap.version>
<webjars-jquery-ui.version>1.12.1</webjars-jquery-ui.version>
<webjars-jquery.version>3.6.0</webjars-jquery.version>
<webjars-validation-api.version>2.0.1.Final</webjars-validation-api.version>
<wro4j.version>1.10.0</wro4j.version>
<jacoco.version>0.8.7</jacoco.version>
@ -109,13 +108,6 @@
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${webjars-validation-api.version}</version>
</dependency>
</dependencies>
<build>

2
src/main/java/org/springframework/samples/petclinic/model/Person.java
View file

@ -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() {

4
src/main/java/org/springframework/samples/petclinic/owner/Owner.java
View file

@ -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")

4
src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
View file

@ -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;

4
src/main/java/org/springframework/samples/petclinic/owner/PetController.java
View file

@ -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);

2
src/main/java/org/springframework/samples/petclinic/owner/VisitController.java
View file

@ -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";
}

1
src/main/java/org/springframework/samples/petclinic/visit/Visit.java
View file

@ -39,6 +39,7 @@ public class Visit extends BaseEntity {
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate date;
@NotEmpty
@Column(name = "description")
private String description;