diff --git a/pom.xml b/pom.xml index 8576c22ba..5f370696a 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,11 @@ spring-boot-testcontainers test + + org.projectlombok + lombok + 1.18.32 + org.springframework.boot spring-boot-docker-compose diff --git a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java index 6babed56d..b523be720 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java +++ b/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java @@ -21,6 +21,9 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * Simple JavaBean domain object with an id property. Used as a base class for objects @@ -30,20 +33,15 @@ import jakarta.persistence.MappedSuperclass; * @author Juergen Hoeller */ @MappedSuperclass +@Getter +@Setter +@NoArgsConstructor public class BaseEntity implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - public boolean isNew() { return this.id == null; } diff --git a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java index d4be03e9e..56a66f2ff 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java +++ b/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java @@ -18,6 +18,9 @@ package org.springframework.samples.petclinic.model; import jakarta.persistence.Column; import jakarta.persistence.MappedSuperclass; import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * Simple JavaBean domain object adds a name property to BaseEntity. Used as @@ -28,20 +31,15 @@ import jakarta.validation.constraints.NotBlank; * @author Wick Dynex */ @MappedSuperclass +@Getter +@Setter +@NoArgsConstructor public class NamedEntity extends BaseEntity { @Column(name = "name") @NotBlank private String name; - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - @Override public String toString() { return this.getName(); 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 7ee1f0397..76b1ff9b5 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/Person.java +++ b/src/main/java/org/springframework/samples/petclinic/model/Person.java @@ -18,6 +18,9 @@ package org.springframework.samples.petclinic.model; import jakarta.persistence.Column; import jakarta.persistence.MappedSuperclass; import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * Simple JavaBean domain object representing an person. @@ -25,6 +28,9 @@ import jakarta.validation.constraints.NotBlank; * @author Ken Krebs */ @MappedSuperclass +@Getter +@Setter +@NoArgsConstructor public class Person extends BaseEntity { @Column(name = "first_name") @@ -35,20 +41,4 @@ public class Person extends BaseEntity { @NotBlank private String lastName; - public String getFirstName() { - return this.firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return this.lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - } 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 63e3acc7a..9f8b29899 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java @@ -31,6 +31,8 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.OrderBy; import jakarta.persistence.Table; import jakarta.validation.constraints.Pattern; +import lombok.Getter; +import lombok.Setter; import jakarta.validation.constraints.NotBlank; /** @@ -45,6 +47,8 @@ import jakarta.validation.constraints.NotBlank; */ @Entity @Table(name = "owners") +@Getter +@Setter public class Owner extends Person { @Column(name = "address") @@ -65,34 +69,6 @@ public class Owner extends Person { @OrderBy("name") private final List pets = new ArrayList<>(); - public String getAddress() { - return this.address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCity() { - return this.city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getTelephone() { - return this.telephone; - } - - public void setTelephone(String telephone) { - this.telephone = telephone; - } - - public List getPets() { - return this.pets; - } - public void addPet(Pet pet) { if (pet.isNew()) { getPets().add(pet); diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java b/src/main/java/org/springframework/samples/petclinic/owner/Pet.java index 1945f9b67..0c4e4fd6f 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/Pet.java @@ -32,6 +32,8 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.OrderBy; import jakarta.persistence.Table; +import lombok.Getter; +import lombok.Setter; /** * Simple business object representing a pet. @@ -43,6 +45,8 @@ import jakarta.persistence.Table; */ @Entity @Table(name = "pets") +@Getter +@Setter public class Pet extends NamedEntity { @Column(name = "birth_date") @@ -58,22 +62,6 @@ public class Pet extends NamedEntity { @OrderBy("date ASC") private final Set visits = new LinkedHashSet<>(); - public void setBirthDate(LocalDate birthDate) { - this.birthDate = birthDate; - } - - public LocalDate getBirthDate() { - return this.birthDate; - } - - public PetType getType() { - return this.type; - } - - public void setType(PetType type) { - this.type = type; - } - public Collection getVisits() { return this.visits; } diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetType.java b/src/main/java/org/springframework/samples/petclinic/owner/PetType.java index e7d63d1aa..56aaed675 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetType.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/PetType.java @@ -19,12 +19,14 @@ import org.springframework.samples.petclinic.model.NamedEntity; import jakarta.persistence.Entity; import jakarta.persistence.Table; +import lombok.NoArgsConstructor; /** * @author Juergen Hoeller Can be Cat, Dog, Hamster... */ @Entity @Table(name = "types") +@NoArgsConstructor public class PetType extends NamedEntity { } diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Visit.java b/src/main/java/org/springframework/samples/petclinic/owner/Visit.java index 085cd2849..1681653e7 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Visit.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/Visit.java @@ -24,6 +24,8 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Table; import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; /** * Simple JavaBean domain object representing a visit. @@ -33,6 +35,8 @@ import jakarta.validation.constraints.NotBlank; */ @Entity @Table(name = "visits") +@Getter +@Setter public class Visit extends BaseEntity { @Column(name = "visit_date") @@ -49,20 +53,4 @@ public class Visit extends BaseEntity { this.date = LocalDate.now(); } - public LocalDate getDate() { - return this.date; - } - - public void setDate(LocalDate date) { - this.date = date; - } - - public String getDescription() { - return this.description; - } - - public void setDescription(String description) { - this.description = description; - } - } diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java index fb2bd71ee..6ebefae83 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java +++ b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java @@ -31,6 +31,9 @@ import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToMany; import jakarta.persistence.Table; import jakarta.xml.bind.annotation.XmlElement; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * Simple JavaBean domain object representing a veterinarian. @@ -42,6 +45,9 @@ import jakarta.xml.bind.annotation.XmlElement; */ @Entity @Table(name = "vets") +@Getter +@Setter +@NoArgsConstructor public class Vet extends Person { @ManyToMany(fetch = FetchType.EAGER)