diff --git a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Personne.java b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Personne.java index 1b86f1c..88539c4 100644 --- a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Personne.java +++ b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Personne.java @@ -23,7 +23,7 @@ public class Personne { private String prenom; private String email; private String password; - private Collection preference = new ArrayList(); + private Collection preference = new ArrayList<>(); private List roleList; public Personne() { diff --git a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/PreferencePK.java b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/PreferencePK.java index 1590ced..42530c2 100644 --- a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/PreferencePK.java +++ b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/PreferencePK.java @@ -15,7 +15,6 @@ public class PreferencePK implements Serializable { public PreferencePK() { super(); - // TODO Auto-generated constructor stub } public PreferencePK(Personne personne, Restaurant restau) { @@ -35,7 +34,7 @@ public class PreferencePK implements Serializable { this.personne = personne; } - @ManyToOne // TODO mappedBy preferences dans restaurant + @ManyToOne @PrimaryKeyJoinColumn(name="id_restau",referencedColumnName ="id_restau" ) @JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) public Restaurant getRestau() { 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 fdd6390..31e9555 100644 --- a/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Restaurant.java +++ b/src/main/java/fr/vincent/ramiere/mangerautourdesimplonback/models/Restaurant.java @@ -30,12 +30,13 @@ public class Restaurant { private String latitude; private String longitude; private String website; - private Collection typerestaus = new ArrayList(); - private Collection preference = new ArrayList(); + private Collection typerestaus = new ArrayList<>(); + private Collection preference = new ArrayList<>(); + public Restaurant() { super(); - // TODO Auto-generated constructor stub } + 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();