From 2cfd0966601a7b12117c6eccf6c90edc12ae5b50 Mon Sep 17 00:00:00 2001 From: vincentRamiere Date: Wed, 9 Jul 2025 19:27:35 +0200 Subject: [PATCH] Lombok et buider sur les derniers models --- .../models/Restaurant.java | 197 +++++------------- .../models/TypeRestau.java | 70 ++----- 2 files changed, 71 insertions(+), 196 deletions(-) diff --git a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Restaurant.java b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Restaurant.java index ff6c8c7..6c5c62b 100644 --- a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Restaurant.java +++ b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Restaurant.java @@ -1,164 +1,69 @@ package fr.vincent.ramiere.mangerautourdesimplonback.models; +import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; +import lombok.*; + import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; -import com.fasterxml.jackson.annotation.JsonIgnore; - -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.JoinTable; -import jakarta.persistence.ManyToMany; -import jakarta.persistence.OneToMany; - @Entity +@Table(name = "restaurant") +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder public class Restaurant implements Serializable { private static final long serialVersionUID = 1L; - - private int id; - private String nom; - private String adresse; - private String telephone; - private Boolean aEmporter; - private Boolean surPlace; - private Integer prix; - private Boolean accesPMR; - private String latitude; - private String longitude; - private String website; - private Collection typerestaus = new ArrayList<>(); - private Collection preference = new ArrayList<>(); - - public Restaurant() { - super(); - } - - public Restaurant(String nom, String adresse, String telephone, Boolean aEmporter, Boolean surPlace, int prix, - Boolean accesPMR, String latitude, String longitude, String website, Collection typerestaus) { - super(); - this.nom = nom; - this.adresse = adresse; - this.telephone = telephone; - this.aEmporter = aEmporter; - this.surPlace = surPlace; - this.prix = prix; - this.accesPMR = accesPMR; - this.latitude = latitude; - this.longitude = longitude; - this.website = website; - this.typerestaus = typerestaus; - } @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_restau") - public int getId() { - return id; - } - public void setId(int id) { - this.id = id; - } + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_restau") + private int id; - @Column(nullable = false) - public String getNom() { - return nom; - } - public void setNom(String nom) { - this.nom = nom; - } - @Column(nullable = false) - public String getAdresse() { - return adresse; - } - public void setAdresse(String adresse) { - this.adresse = adresse; - } - @Column(nullable = true) - public String getTelephone() { - return telephone; - } - public void setTelephone(String telephone) { - this.telephone = telephone; - } - @Column(nullable = true) - public Boolean isaEmporter() { - return aEmporter; - } - public void setaEmporter(Boolean aEmporter) { - this.aEmporter = aEmporter; - } - @Column(nullable = true) - public Boolean isSurPlace() { - return surPlace; - } - public void setSurPlace(Boolean surPlace) { - this.surPlace = surPlace; - } - @Column(nullable = true) - public Integer getPrix() { - return prix; - } - public void setPrix(Integer prix) { - this.prix = prix; - } - @Column(nullable = true) - public Boolean isAccesPMR() { - return accesPMR; - } - public void setAccesPMR(Boolean accesPMR) { - this.accesPMR = accesPMR; - } - @Column(nullable = false) - public String getLatitude() { - return latitude; - } - public void setLatitude(String latitude) { - this.latitude = latitude; - } - @Column(nullable = false) - public String getLongitude() { - return longitude; - } - public void setLongitude(String longitude) { - this.longitude = longitude; - } - @Column(nullable = true) - public String getWebsite() { - return website; - } - public void setWebsite(String website) { - this.website = website; - } + @Column(nullable = false) + private String nom; + + @Column(nullable = false) + private String adresse; + + @Column + private String telephone; + + @Column(name = "a_emporter") + private Boolean aEmporter; + + @Column(name = "sur_place") + private Boolean surPlace; + + @Column + private Integer prix; + + @Column(name = "accespmr") + private Boolean accesPMR; + + @Column(nullable = false) + private String latitude; + + @Column(nullable = false) + private String longitude; + + @Column + private String website; @ManyToMany - @JoinTable(name="type_restau", - joinColumns = @JoinColumn(name = "id_restau"/*classe en cours*/,referencedColumnName = "id_restau" /*classe reliée*/) , - inverseJoinColumns = @JoinColumn(name = "id_type",referencedColumnName = "id_type")) - public Collection getTyperestaus() { - return typerestaus; - } - public void setTyperestaus(Collection typerestaus) { - this.typerestaus = typerestaus; - } + @JoinTable( + name = "type_restau", + joinColumns = @JoinColumn(name = "id_restau", referencedColumnName = "id_restau"), + inverseJoinColumns = @JoinColumn(name = "id_type", referencedColumnName = "id_type") + ) + @Builder.Default + private Collection typerestaus = new ArrayList<>(); @OneToMany(mappedBy = "preferencePK.restau", cascade = CascadeType.REMOVE) - @JsonIgnore - public Collection getPreference() { - return preference; - } - - - public void setPreference(Collection preference) { - this.preference = preference; - } - - - + @JsonIgnore + @Builder.Default + private Collection preference = new ArrayList<>(); } diff --git a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/TypeRestau.java b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/TypeRestau.java index c2781d0..aad2c86 100644 --- a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/TypeRestau.java +++ b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/TypeRestau.java @@ -1,63 +1,33 @@ package fr.vincent.ramiere.mangerautourdesimplonback.models; +import com.fasterxml.jackson.annotation.JsonBackReference; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; import java.io.Serializable; import java.util.List; -import com.fasterxml.jackson.annotation.JsonBackReference; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.ManyToMany; -import jakarta.persistence.Table; - @Entity -@Table(name="type") +@Table(name = "type") +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder public class TypeRestau implements Serializable { - + private static final long serialVersionUID = 1L; - private int id; - private String libelle; - private List restaurants; - - public TypeRestau() { - super(); - } - - public TypeRestau(int id, String libelle) { - super(); - this.id = id; - this.libelle = libelle; - } - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id_type") - public int getId() { - return id; - } - public void setId(int id) { - this.id = id; - } + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id_type") + private int id; + @Column(nullable = false) - public String getLibelle() { - return libelle; - } - public void setLibelle(String libelle) { - this.libelle = libelle; - } - - @ManyToMany(mappedBy="typerestaus") - @JsonBackReference("restaurants") - public List getRestaurants() { - return restaurants; - } - - public void setRestaurants(List restaurants) { - this.restaurants = restaurants; - } + private String libelle; + @ManyToMany(mappedBy = "typerestaus") + @JsonBackReference("restaurants") + @Builder.Default + private List restaurants = new ArrayList<>(); }