Merge branch 'master' into seatmaps

Author: tsolakoua

README.md

@@ -238,6 +238,10 @@ FlightOfferSearch[] flightOffersSearches = amadeus.shopping.flightOffersSearch.g
 // body can be a String version of your JSON or a JsonObject
 FlightOfferSearch[] flightOffersSearches = amadeus.shopping.flightOffersSearch.post(body);
 
+// Flight Order Management
+// The flightOrderID comes from the Flight Create Orders (in test environment it's temporary)
+FlightOrder order = amadeus.booking.flightOrder("eJzTd9f3NjIJdzUGAAp%2fAiY=").get();
+
 // Flight Choice Prediction
 // Note that the example calls 2 APIs: Flight Low-fare Search & Flight Choice Prediction
 FlightOffer[] flightOffers = amadeus.shopping.flightOffers

src/main/java/com/amadeus/Amadeus.java

@@ -62,13 +62,21 @@ public class Amadeus extends HTTPClient {
    */
   public Airport airport;
 
+  /**
+   * <p>
+   * A namespaced client for the <code>/v1/booking</code> endpoints.
+   * </p>
+   */
+  public Booking booking;
+
   protected Amadeus(Configuration configuration) {
     super(configuration);
     this.referenceData = new ReferenceData(this);
     this.travel = new Travel(this);
     this.shopping = new Shopping(this);
     this.ereputation = new EReputation(this);
     this.airport = new Airport(this);
+    this.booking = new Booking(this);
   }
 
   /**

src/main/java/com/amadeus/Booking.java

@@ -0,0 +1,23 @@
+package com.amadeus;
+
+import com.amadeus.booking.FlightOrder;
+
+public class Booking {
+  private Amadeus client;
+
+  /**
+   * <p>
+   *   A namespaced client for the
+   *   <code>/v1/booking/flightOrder</code> endpoints.
+   * </p>
+   */
+  public FlightOrder flightOrder;
+
+  public Booking(Amadeus client) {
+    this.client = client;
+  }
+
+  public FlightOrder flightOrder(String flightOrderId) {
+    return new FlightOrder(client, flightOrderId);
+  }
+}

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

@@ -0,0 +1,66 @@
+package com.amadeus.booking;
+
+import com.amadeus.Amadeus;
+import com.amadeus.Params;
+import com.amadeus.Response;
+import com.amadeus.exceptions.ResponseException;
+import com.amadeus.resources.Resource;
+
+/**
+ * <p>
+ *   A namespaced client for the
+ *   <code>/v1/booking/flight-orders/:flightOrderId</code> endpoints.
+ * </p>
+ *
+ * <p>
+ *   Access via the Amadeus client object.
+ * </p>
+ *
+ * <pre>
+ * Amadeus amadeus = Amadeus.builder("clientId", "secret").build();
+ * amadeus.booking.flightOrder;</pre>
+ */
+public class FlightOrder {
+  private Amadeus client;
+  private String flightOfferId;
+
+  /**
+   * Constructor.
+   * @hide
+   */
+  public FlightOrder(Amadeus client, String flightOfferId) {
+    this.client = client;
+    this.flightOfferId = flightOfferId;
+  }
+
+  /**
+   * <p>
+   *   Allows you to manipulate a flight order. The flightOfferId
+   *   used is an example for educational purposes. In test enviromnent 
+   *   it's temporary.
+   * </p>
+   *
+   * <pre>
+   * FlightOrder order = amadeus.booking.flightOrder.(
+   * "eJzTd9f3NjIJdzUGAAp%2fAiY=").get();
+   * </pre>
+   * @param params the parameters to send to the API
+   * @return an API response object
+   * @throws ResponseException when an exception occurs
+   */
+
+  public com.amadeus.resources.FlightOrder get(Params params) throws ResponseException {
+    String path = String.format("/v1/booking/flight-orders/%s", flightOfferId);
+    Response response = client.get(path, params);
+    return (com.amadeus.resources.FlightOrder) Resource.fromObject(
+        response, com.amadeus.resources.FlightOrder.class);
+  }
+  
+  /**
+   * Convenience method for calling <code>get</code> without any parameters.
+   * @see com.amadeus.booking.FlightOrder#get()
+   */
+  public com.amadeus.resources.FlightOrder get() throws ResponseException {
+    return get(null);
+  }
+}

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

@@ -0,0 +1,85 @@
+package com.amadeus.resources;
+
+import java.util.Date;
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * An Airline object as returned by the Airline Code LookUp API.
+ * @see com.amadeus.booking.flightOrder#get()
+ */
+@ToString
+public class FlightOrder extends Resource {
+  protected FlightOrder() {}
+
+  private @Getter String type;
+  private @Getter String id;
+  private @Getter String queuingOfficeId;
+  private @Getter AssociatedRecord[] associatedRecords;
+  private @Getter Traveler[] travelers;
+  private @Getter FlightOfferSearch[] flightOffers;
+
+  @ToString
+  public class AssociatedRecord {
+    protected AssociatedRecord() {
+    }
+
+    private @Getter String reference;
+    private @Getter String creationDateTime;
+    private @Getter String originSystemCode;
+    private @Getter String flightOfferId;
+  }
+
+  @ToString
+  public class Traveler {
+    protected Traveler() {
+    }
+
+    private @Getter String id;
+    private @Getter Date dateOfBirth;
+    private @Getter Name name;
+    private @Getter Contact contact;
+    private @Getter Document[] documents;
+  }
+
+  @ToString
+  public class Name {
+    protected Name() {
+    }
+
+    private @Getter String firstName;
+    private @Getter String lastName;
+  }
+
+  @ToString
+  public class Contact {
+    protected Contact() {
+    }
+
+    private @Getter Phone[] phones;
+  }
+
+  @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;
+  }
+
+  @ToString
+  public class Phone {
+
+    protected Phone() {
+    }
+    
+    private @Getter String countryCallingCode;
+    private @Getter String number;
+  }
+
+}

src/test/java/com/amadeus/NamespaceTest.java

@@ -1,6 +1,7 @@
 package com.amadeus;
 
 import com.amadeus.airport.predictions.AirportOnTime;
+import com.amadeus.booking.FlightOrder;
 import com.amadeus.ereputation.HotelSentiments;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.referenceData.Airlines;
@@ -61,6 +62,7 @@ public void testAllNamespacesExist() {
     TestCase.assertNotNull(client.ereputation.hotelSentiments);
     TestCase.assertNotNull(client.shopping.hotelOffer("XXX"));
     TestCase.assertNotNull(client.airport.predictions.onTime);
+    TestCase.assertNotNull(client.booking.flightOrder("XXX"));
   }
 
   @Before
@@ -286,6 +288,15 @@ public void testGetMethods() throws ResponseException {
         .thenReturn(multiResponse);
     SeatMaps seatmap = new SeatMaps(client);
     TestCase.assertNotNull(seatmap.get(params));    
+    
+    // Test fetching a specific offer
+    Mockito.when(client.get("/v1/booking/flight-orders/XXX", null))
+        .thenReturn(singleResponse);
+    Mockito.when(client.get("/v1/booking/flight-orders/XXX", params))
+        .thenReturn(singleResponse);
+    FlightOrder flightOrder = new FlightOrder(client, "XXX");
+    TestCase.assertNotNull(flightOrder.get());
+    TestCase.assertNotNull(flightOrder.get(params));
   }
 
   @Test