diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/BaseEntity.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/BaseEntity.java index b059b70..8c561b5 100644 --- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/BaseEntity.java +++ b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/BaseEntity.java @@ -1,5 +1,9 @@ package guru.springframework.sfgpetclinic.model; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -7,16 +11,13 @@ import java.io.Serializable; @MappedSuperclass +@EqualsAndHashCode +@Getter +@Setter public abstract class BaseEntity implements Serializable { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } } diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Owner.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Owner.java index dbfb3dc..44c2c59 100644 --- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Owner.java +++ b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Owner.java @@ -1,5 +1,8 @@ package guru.springframework.sfgpetclinic.model; +import lombok.Getter; +import lombok.Setter; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.OneToMany; @@ -7,52 +10,23 @@ import java.util.Set; @Entity +@Getter +@Setter public class Owner extends Person { + private String address; + private String city; + private String telephone; + @OneToMany(cascade = CascadeType.ALL, mappedBy = "owner") private Set pets = new HashSet<>(); - public Owner() { - } - public Owner(String firstName, String lastName, String address, String city, String telephone) { super(firstName, lastName); this.address = address; this.city = city; this.telephone = telephone; } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getTelephone() { - return telephone; - } - - public void setTelephone(String telephone) { - this.telephone = telephone; - } - - public Set getPets() { - return pets; - } - - public void setPets(Set pets) { - this.pets = pets; - } } diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Person.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Person.java index b055fe1..7f31b76 100644 --- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Person.java +++ b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Person.java @@ -1,37 +1,27 @@ package guru.springframework.sfgpetclinic.model; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + import javax.persistence.Column; import javax.persistence.MappedSuperclass; @MappedSuperclass +@Getter +@Setter +@NoArgsConstructor public abstract class Person extends BaseEntity { + @Column(name = "first_name") private String firstName; @Column(name = "last_name") private String lastName; - protected Person() { - } - protected Person(String firstName, String lastName) { this.firstName = firstName; this.lastName = lastName; } - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } } diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Pet.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Pet.java index 063e96c..3454f9b 100644 --- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Pet.java +++ b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Pet.java @@ -1,5 +1,9 @@ package guru.springframework.sfgpetclinic.model; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -11,6 +15,9 @@ import java.util.Set; @Entity +@Getter +@Setter +@NoArgsConstructor public class Pet extends BaseEntity { private String name; @@ -29,43 +36,4 @@ public class Pet extends BaseEntity { @OneToMany(cascade = CascadeType.ALL, mappedBy = "pet") private Set visits = new HashSet<>(); - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public PetType getPetType() { - return petType; - } - - public void setPetType(PetType petType) { - this.petType = petType; - } - - public Owner getOwner() { - return owner; - } - - public void setOwner(Owner owner) { - this.owner = owner; - } - - public LocalDate getBirthDate() { - return birthDate; - } - - public void setBirthDate(LocalDate birthDate) { - this.birthDate = birthDate; - } - - public Set getVisits() { - return visits; - } - - public void setVisits(Set visits) { - this.visits = visits; - } } diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/PetType.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/PetType.java index d4d078f..2a1017d 100644 --- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/PetType.java +++ b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/PetType.java @@ -1,24 +1,21 @@ package guru.springframework.sfgpetclinic.model; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + import javax.persistence.Entity; @Entity +@Getter +@Setter +@NoArgsConstructor public class PetType extends BaseEntity { private String name; - public PetType() { - } - public PetType(String name) { this.name = name; } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } } diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Speciality.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Speciality.java index c381e42..cf97f61 100644 --- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Speciality.java +++ b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Speciality.java @@ -1,23 +1,21 @@ package guru.springframework.sfgpetclinic.model; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + import javax.persistence.Entity; @Entity +@Getter +@Setter +@NoArgsConstructor public class Speciality extends BaseEntity { - private String description; - public Speciality() { - } + private String description; public Speciality(String description) { this.description = description; } - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } } diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Vet.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Vet.java index 2bfdc47..89c3b76 100644 --- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Vet.java +++ b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Vet.java @@ -1,5 +1,9 @@ package guru.springframework.sfgpetclinic.model; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; @@ -9,23 +13,17 @@ import java.util.Set; @Entity +@Getter +@Setter +@NoArgsConstructor public class Vet extends Person { + @ManyToMany(fetch = FetchType.EAGER) @JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"), inverseJoinColumns = @JoinColumn(name = "speciality_id")) private Set specialities = new HashSet<>(); - public Vet() { - } - public Vet(String firstName, String lastName) { super(firstName, lastName); } - public Set getSpecialities() { - return specialities; - } - - public void setSpecialities(Set specialities) { - this.specialities = specialities; - } } diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Visit.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Visit.java index cde2df7..1279216 100644 --- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Visit.java +++ b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/model/Visit.java @@ -1,40 +1,26 @@ package guru.springframework.sfgpetclinic.model; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import java.time.LocalDate; @Entity +@Getter +@Setter +@NoArgsConstructor public class Visit extends BaseEntity { + private LocalDate date; + private String description; @ManyToOne @JoinColumn(name = "pet_id") private Pet pet; - public LocalDate getDate() { - return date; - } - - public void setDate(LocalDate date) { - this.date = date; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Pet getPet() { - return pet; - } - - public void setPet(Pet pet) { - this.pet = pet; - } } diff --git a/pet-clinic-web/pom.xml b/pet-clinic-web/pom.xml index 987e9f7..56dfac5 100644 --- a/pet-clinic-web/pom.xml +++ b/pet-clinic-web/pom.xml @@ -64,6 +64,12 @@ + + org.projectlombok + lombok + true + + org.springframework.boot spring-boot-devtools diff --git a/pet-clinic-web/src/main/java/guru/springframework/sfgpetclinic/controllers/CrashController.java b/pet-clinic-web/src/main/java/guru/springframework/sfgpetclinic/controllers/CrashController.java index 0290625..a15a0c6 100644 --- a/pet-clinic-web/src/main/java/guru/springframework/sfgpetclinic/controllers/CrashController.java +++ b/pet-clinic-web/src/main/java/guru/springframework/sfgpetclinic/controllers/CrashController.java @@ -1,13 +1,16 @@ package guru.springframework.sfgpetclinic.controllers; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @Controller +@Slf4j class CrashController { @GetMapping("/oups") public String triggerException() { + log.error("Error, but it's ok since it was done on purpose lololol"); throw new RuntimeException("Expected: controller used to showcase what happens when an exception is thrown"); } diff --git a/pom.xml b/pom.xml index 865897f..91a415f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,11 @@ - + org.springframework.boot spring-boot-starter-parent 2.2.0.RELEASE - + 4.0.0 pom @@ -26,8 +27,8 @@ scm:git:https://github.com/Celebes/spring-boot-pet-clinic.git - HEAD - + HEAD +