Merge pull request #197 from amadeus4dev/fix-traveler-model

Update Traveler resource model

Author: tsolakoua

src/main/java/com/amadeus/booking/FlightOrders.java

@@ -5,9 +5,9 @@
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.FlightOfferSearch;
 import com.amadeus.resources.FlightOrder;
+import com.amadeus.resources.FlightOrder.Traveler;
 import com.amadeus.resources.FlightPrice;
 import com.amadeus.resources.Resource;
-import com.amadeus.resources.Traveler;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;

src/main/java/com/amadeus/resources/FlightOrder.java

@@ -1,7 +1,9 @@
 package com.amadeus.resources;
 
-import java.util.Date;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.ToString;
 
 /**
@@ -30,56 +32,56 @@ protected AssociatedRecord() {
     private @Getter String flightOfferId;
   }
 
+  @AllArgsConstructor
+  @NoArgsConstructor
   @ToString
-  public class Traveler {
-    protected Traveler() {
-    }
+  public static class Traveler {
 
-    private @Getter String id;
-    private @Getter Date dateOfBirth;
-    private @Getter Name name;
-    private @Getter Contact contact;
-    private @Getter Document[] documents;
+    private @Getter @Setter String id;
+    private @Getter @Setter String dateOfBirth;
+    private @Getter @Setter Name name;
+    private @Getter @Setter Contact contact;
+    private @Getter @Setter Document[] documents;
   }
 
+  @AllArgsConstructor
+  @NoArgsConstructor
   @ToString
-  public class Name {
-    protected Name() {
-    }
+  public static class Name {
 
-    private @Getter String firstName;
-    private @Getter String lastName;
+    private @Getter @Setter String firstName;
+    private @Getter @Setter String lastName;
   }
 
+  @AllArgsConstructor
+  @NoArgsConstructor
   @ToString
-  public class Contact {
-    protected Contact() {
-    }
+  public static class Contact {
 
-    private @Getter Phone[] phones;
+    private @Getter @Setter Phone[] phones;
+    private @Getter @Setter String deviceType;
   }
 
+  @AllArgsConstructor
+  @NoArgsConstructor
   @ToString
-  public class Document {
-    protected Document() {
-    }
-
-    private @Getter String documentType;
-    private @Getter String number;
-    private @Getter Date expiryDate;
-    private @Getter String issuanceCountry;
-    private @Getter String nationality;
-    private @Getter boolean holder;
+  public static class Document {
+
+    private @Getter @Setter String documentType;
+    private @Getter @Setter String number;
+    public @Getter @Setter String expiryDate;
+    private @Getter @Setter String issuanceCountry;
+    private @Getter @Setter String nationality;
+    private @Getter @Setter boolean holder;
   }
 
+  @AllArgsConstructor
+  @NoArgsConstructor
   @ToString
-  public class Phone {
+  public static class Phone {
 
-    protected Phone() {
-    }
-    
-    private @Getter String countryCallingCode;
-    private @Getter String number;
+    private @Getter @Setter String countryCallingCode;
+    private @Getter @Setter String number;
   }
 
 }

src/main/java/com/amadeus/resources/Traveler.java

@@ -9,8 +9,12 @@
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.FlightOfferSearch;
 import com.amadeus.resources.FlightOrder;
+import com.amadeus.resources.FlightOrder.Contact;
+import com.amadeus.resources.FlightOrder.Document;
+import com.amadeus.resources.FlightOrder.Name;
+import com.amadeus.resources.FlightOrder.Phone;
+import com.amadeus.resources.FlightOrder.Traveler;
 import com.amadeus.resources.FlightPrice;
-import com.amadeus.resources.Traveler;
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -103,20 +107,19 @@ private Traveler[] getTravelerData() {
 
     traveler.setId("1");
     traveler.setDateOfBirth("2000-04-14");
-    traveler.setName(traveler.new Name("JORGE", "GONZALES"));
+    traveler.setName(new Name("JORGE", "GONZALES"));
 
-    Traveler.Phone[] phone = new Traveler.Phone[1];
-    phone[0] = traveler.new Phone();
+    Phone[] phone = new Phone[1];
+    phone[0] = new Phone();
     phone[0].setCountryCallingCode("33");
     phone[0].setNumber("675426222");
-    phone[0].setDeviceType("MOBILE");
 
-    Traveler.Contact contact = traveler.new Contact();
+    Contact contact = new Contact();
     contact.setPhones(phone);
     traveler.setContact(contact);
 
-    Traveler.Document[] document = new Traveler.Document[1];
-    document[0] = traveler.new Document();
+    Document[] document = new Document[1];
+    document[0] = new Document();
     document[0].setDocumentType("PASSPORT");
     document[0].setNumber("480080076");
     document[0].setExpiryDate("2022-10-11");