Merge branch 'dev' into Vincent

OK

.gitignore

@@ -5,6 +5,9 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 
+application.properties
+
+
 ### STS ###
 .apt_generated
 .classpath
@@ -35,5 +38,3 @@ out/
 
 ### VS Code ###
 .vscode/
-
-application.properties

build.gradle

@@ -17,6 +17,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	runtimeOnly 'mysql:mysql-connector-java'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 }
 
 test {

src/main/java/fr/cardon/simpleat/model/Restaurant.java

@@ -144,7 +144,6 @@ public class Restaurant {
 	@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"))
-	@JsonBackReference("typerestaus")
 	public Collection<TypeRestau> getTyperestaus() {
 		return typerestaus;
 	}

src/main/java/fr/cardon/simpleat/model/TypeRestau.java

@@ -10,6 +10,7 @@ import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 
@@ -49,7 +50,7 @@ public class TypeRestau {
 	}
 
 	@ManyToMany(mappedBy="typerestaus")
-	@JsonIgnoreProperties("typerestaus")
+	@JsonBackReference("restaurants")
 	public List<Restaurant> getRestaurants() {
 		return restaurants;
 	}