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

Sucessfull build, javax.validation correctly imported

Browse source
This commit is contained in:
St ef 2021-06-01 20:32:38 +02:00
commit 43fe219714
6 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pom.xml
View file

@ -25,10 +25,9 @@
<webjars-bootstrap.version>5.0.1</webjars-bootstrap.version> <webjars-bootstrap.version>5.0.1</webjars-bootstrap.version>
<webjars-jquery-ui.version>1.12.1</webjars-jquery-ui.version> <webjars-jquery-ui.version>1.12.1</webjars-jquery-ui.version>
<webjars-jquery.version>3.6.0</webjars-jquery.version> <webjars-jquery.version>3.6.0</webjars-jquery.version>
<wro4j.version>1.10.0</wro4j.version>
<webjars-validation-api.version>2.0.1.Final</webjars-validation-api.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> <jacoco.version>0.8.7</jacoco.version>
</properties> </properties>
<dependencies> <dependencies>

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

@ -28,11 +28,9 @@ import javax.validation.constraints.NotEmpty;
public class Person extends BaseEntity { public class Person extends BaseEntity {
@Column(name = "first_name") @Column(name = "first_name")
@NotEmpty
private String firstName; private String firstName;
@Column(name = "last_name") @Column(name = "last_name")
@NotEmpty
private String lastName; private String lastName;
public String getFirstName() { public String getFirstName() {

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

@ -47,16 +47,12 @@ import org.springframework.samples.petclinic.model.Person;
public class Owner extends Person { public class Owner extends Person {
@Column(name = "address") @Column(name = "address")
@NotEmpty
private String address; private String address;
@Column(name = "city") @Column(name = "city")
@NotEmpty
private String city; private String city;
@Column(name = "telephone") @Column(name = "telephone")
@NotEmpty
@Digits(fraction = 0, integer = 10)
private String telephone; private String telephone;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "owner") @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") @PostMapping("/owners/new")
public String processCreationForm(@Valid Owner owner, BindingResult result) { public String processCreationForm(Owner owner, BindingResult result) {
if (result.hasErrors()) { if (result.hasErrors()) {
return VIEWS_OWNER_CREATE_OR_UPDATE_FORM; return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
} }
@ -114,7 +114,7 @@ class OwnerController {
} }
@PostMapping("/owners/{ownerId}/edit") @PostMapping("/owners/{ownerId}/edit")
public String processUpdateOwnerForm(@Valid Owner owner, BindingResult result, public String processUpdateOwnerForm(Owner owner, BindingResult result,
@PathVariable("ownerId") int ownerId) { @PathVariable("ownerId") int ownerId) {
if (result.hasErrors()) { if (result.hasErrors()) {
return VIEWS_OWNER_CREATE_OR_UPDATE_FORM; 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") @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) { if (StringUtils.hasLength(pet.getName()) && pet.isNew() && owner.getPet(pet.getName(), true) != null) {
result.rejectValue("name", "duplicate", "already exists"); result.rejectValue("name", "duplicate", "already exists");
} }
@ -97,7 +97,7 @@ class PetController {
} }
@PostMapping("/pets/{petId}/edit") @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()) { if (result.hasErrors()) {
pet.setOwner(owner); pet.setOwner(owner);
model.put("pet", pet); model.put("pet", pet);

1
src/main/less/petclinic.less
View file

@ -222,6 +222,7 @@ table td.action-column {
.label-success { .label-success {
text-color: @spring-green; text-color: @spring-green;
} }
.deployment-status-deployed { .deployment-status-deployed {
.label-success; .label-success;
} }