Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/java/etunicorn/generated/TransactionController.java # src/main/java/etunicorn/generated/model/UpdateCreditRequest.java

Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/etunicorn/generated/TransactionController.java # src/main/java/etunicorn/generated/model/UpdateCreditRequest.java
Geoffrey PREUD'HOMME
2 parents 2f1f76a9 e0956603
Showing 6 changed files with 70 additions and 50 deletions Show diff stats
api.raml
src/main/java/etunicorn/generated/TransactionController.java
src/main/java/etunicorn/generated/model/UpdateCreditRequest.java
src/main/java/etunicorn/generated/model/UpdateEvenementByIdRequest.java
src/main/java/etunicorn/generated/model/UpdatePersonneByIdRequest.java
src/main/java/etunicorn/generated/model/UpdatePersonneRequest.java
@@ -115,8 +115,9 @@ version: v1
                           "maxLength": 14
                       },
                       "naissance": {
-                          "type": "date",
-                          "required": false
+                          "type": "string",
+                          "required": false,
+                          "format": "date"
                       },
                       "login": {
                         "type": "string",
@@ -158,8 +159,9 @@ version: v1
                       "maxLength": 14
                   },
                   "naissance": {
-                      "type": "date",
-                      "required": false
+                      "type": "string",
+                      "required": false,
+                      "format": "date"
                   },
                   "login": {
                     "type": "string",
@@ -335,8 +337,9 @@ version: v1
                     "required": true
                 },
                 "date": {
-                    "type": "date",
-                    "required": true
+                    "type": "string",
+                    "required": true,
+                    "format": "date"
                 }
             }
             }
@@ -370,8 +373,9 @@ version: v1
                       "required": false
                   },
                   "date": {
-                      "type": "date",
-                      "required": false
+                      "type": "string",
+                      "required": false,
+                      "format": "date"
                   }
               }
               }
@@ -26,54 +26,54 @@ public interface TransactionController {
      * 
      */
     @RequestMapping(value = "", method = RequestMethod.GET)
-    ResponseEntity<?> getTransaction();
+    public ResponseEntity<?> getTransaction();
     /**
      * Achat d'une consomation (id) par un participant à un acteur
      * 
      */
     @RequestMapping(value = "/consommation", method = RequestMethod.POST)
-    ResponseEntity<?> updateConsommation(
-            @javax.validation.Valid
-            @org.springframework.web.bind.annotation.RequestBody
-                    UpdateConsommationRequest updateConsommationRequest);
+    public ResponseEntity<?> updateConsommation(
+        @javax.validation.Valid
+        @org.springframework.web.bind.annotation.RequestBody
+        UpdateConsommationRequest updateConsommationRequest);
     /**
      * No description
      * 
      */
     @RequestMapping(value = "/evenement", method = RequestMethod.POST)
-    ResponseEntity<?> updateEvenement(
-            @javax.validation.Valid
-            @org.springframework.web.bind.annotation.RequestBody
-                    UpdateEvenementRequest updateEvenementRequest);
+    public ResponseEntity<?> updateEvenement(
+        @javax.validation.Valid
+        @org.springframework.web.bind.annotation.RequestBody
+        UpdateEvenementRequest updateEvenementRequest);
     /**
      * Permet de recharger ou debiter un compte
      * 
      */
     @RequestMapping(value = "/credit", method = RequestMethod.POST)
-    ResponseEntity<?> updateCredit(
-            @javax.validation.Valid
-            @org.springframework.web.bind.annotation.RequestBody
-                    UpdateCreditRequest updateCreditRequest);
+    public ResponseEntity<?> updateCredit(
+        @javax.validation.Valid
+        @org.springframework.web.bind.annotation.RequestBody
+        UpdateCreditRequest updateCreditRequest);
     /**
      * Permet de recuperer la liste des transaction d'une personne
      * 
      */
     @RequestMapping(value = "/{idPersonne}", method = RequestMethod.GET)
-    ResponseEntity<?> getTransactionByIdPersonne(
-            @PathVariable
-                    Long idPersonne);
+    public ResponseEntity<?> getTransactionByIdPersonne(
+        @PathVariable
+        Long idPersonne);
     /**
      * Permet de recuperer la liste des transaction d'une personne
      * 
      */
     @RequestMapping(value = "/acteur/{idPersonne}", method = RequestMethod.GET)
-    ResponseEntity<?> getActeurByIdPersonne(
-            @PathVariable
-                    Long idPersonne);
+    public ResponseEntity<?> getActeurByIdPersonne(
+        @PathVariable
+        Long idPersonne);
 }
 package etunicorn.generated.model;
-import com.fasterxml.jackson.annotation.*;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
-import java.util.HashMap;
-import java.util.Map;
-
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-        "participant",
-        "prix"
+    "participant",
+    "prix"
 })
 public class UpdateCreditRequest {
     /**
+     * 
      * (Required)
+     * 
      */
     @JsonProperty("participant")
     private Object participant;
     /**
+     * 
      * (Required)
+     * 
      */
     @JsonProperty("prix")
     private Float prix;
@@ -30,9 +38,11 @@ public class UpdateCreditRequest {
     private Map<String, Object> additionalProperties = new HashMap<String, Object>();
     /**
+     * 
      * (Required)
-     *
-     * @return The participant
+     * 
+     * @return
+     *     The participant
      */
     @JsonProperty("participant")
     public Object getParticipant() {
@@ -40,9 +50,11 @@ public class UpdateCreditRequest {
     }
     /**
+     * 
      * (Required)
-     *
-     * @param participant The participant
+     * 
+     * @param participant
+     *     The participant
      */
     @JsonProperty("participant")
     public void setParticipant(Object participant) {
@@ -50,9 +62,11 @@ public class UpdateCreditRequest {
     }
     /**
+     * 
      * (Required)
-     *
-     * @return The prix
+     * 
+     * @return
+     *     The prix
      */
     @JsonProperty("prix")
     public Float getPrix() {
@@ -60,9 +74,11 @@ public class UpdateCreditRequest {
     }
     /**
+     * 
      * (Required)
-     *
-     * @param prix The prix
+     * 
+     * @param prix
+     *     The prix
      */
     @JsonProperty("prix")
     public void setPrix(Float prix) {
@@ -35,7 +35,7 @@ public class UpdateEvenementByIdRequest {
      * 
      */
     @JsonProperty("date")
-    private Object date;
+    private String date;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new HashMap<String, Object>();
@@ -85,7 +85,7 @@ public class UpdateEvenementByIdRequest {
      *     The date
      */
     @JsonProperty("date")
-    public Object getDate() {
+    public String getDate() {
         return date;
     }
@@ -95,7 +95,7 @@ public class UpdateEvenementByIdRequest {
      *     The date
      */
     @JsonProperty("date")
-    public void setDate(Object date) {
+    public void setDate(String date) {
         this.date = date;
     }
@@ -31,7 +31,7 @@ public class UpdatePersonneByIdRequest {
      * 
      */
     @JsonProperty("naissance")
-    private Object naissance;
+    private String naissance;
     /**
      * 
      */
@@ -71,7 +71,7 @@ public class UpdatePersonneByIdRequest {
      *     The naissance
      */
     @JsonProperty("naissance")
-    public Object getNaissance() {
+    public String getNaissance() {
         return naissance;
     }
@@ -81,7 +81,7 @@ public class UpdatePersonneByIdRequest {
      *     The naissance
      */
     @JsonProperty("naissance")
-    public void setNaissance(Object naissance) {
+    public void setNaissance(String naissance) {
         this.naissance = naissance;
     }
@@ -27,7 +27,7 @@ public class UpdatePersonneRequest {
      * 
      */
     @JsonProperty("naissance")
-    private Object naissance;
+    private String naissance;
     /**
      * 
      */
@@ -67,7 +67,7 @@ public class UpdatePersonneRequest {
      *     The naissance
      */
     @JsonProperty("naissance")
-    public Object getNaissance() {
+    public String getNaissance() {
         return naissance;
     }
@@ -77,7 +77,7 @@ public class UpdatePersonneRequest {
      *     The naissance
      */
     @JsonProperty("naissance")
-    public void setNaissance(Object naissance) {
+    public void setNaissance(String naissance) {
         this.naissance = naissance;
     }