diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml new file mode 100644 index 0000000..7ed7a3d --- /dev/null +++ b/.idea/dataSources.local.xml @@ -0,0 +1,15 @@ + + + + + + #@ + ` + + + master_key + bade + bade: + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..a3eda13 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,19 @@ + + + + + mysql + true + com.mysql.jdbc.Driver + jdbc:mysql://192.168.0.28:3306/bade + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/etunicorn/controller/PersonneController.java b/src/main/java/etunicorn/controller/PersonneController.java index 8680602..72592f3 100644 --- a/src/main/java/etunicorn/controller/PersonneController.java +++ b/src/main/java/etunicorn/controller/PersonneController.java @@ -17,7 +17,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.math.BigDecimal; -import java.util.Date; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.LinkedHashMap; import java.util.List; @@ -42,8 +43,13 @@ public class PersonneController extends BaseController implements etunicorn.gene } private ResponseEntity mergePersonne(Personne personne, UpdatePersonneRequest updatePersonneRequest) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); if (updatePersonneRequest.getNaissance() != null) { - personne.setNaissance(new Date(updatePersonneRequest.getNaissance())); + try { + personne.setNaissance(format.parse(updatePersonneRequest.getNaissance())); + } catch (ParseException e) { + e.printStackTrace(); + } } if (updatePersonneRequest.getCarte() != null) { personne.setCarte(updatePersonneRequest.getCarte()); -- libgit2 0.21.2