Flight offers price update (#58)

* introduce flight pricing api

* populate README for pricing request

* Adding other methods for Price API. Fixing the POST version with query params on going

* fix typo and add example

* fix typo

Co-authored-by: Sealsoft <[email protected]>
Co-authored-by: Anna Tsolakou <[email protected]>

Author: 3 people

README.md

@@ -241,6 +241,12 @@ FlightOfferSearch[] flightOffersSearches = amadeus.shopping.flightOffersSearch.p
 // The flightOrderID comes from the Flight Create Orders (in test environment it's temporary)
 FlightOrder order = amadeus.booking.flightOrder("eJzTd9f3NjIJdzUGAAp%2fAiY=").get();
 
+// Flight Offer price
+FlightPrice[] flightPricing = amadeus.shopping.flightOffersSearch.pricing.post(
+                    body,
+                    Params.with("include", "other-services")
+                          .and("forceClass", "false"));
+
 // 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/HTTPClient.java

@@ -154,6 +154,54 @@ public Response post(String path, JsonObject body) throws ResponseException {
     return request(Constants.POST, path, null, body.toString());
   }
 
+  /**
+   * <p>
+   *   A helper module for making generic POST requests calls. It is used by
+   *   every namespaced API POST method.
+   * </p>
+   *
+   * <p>
+   *   It can be used to make any generic API call that is automatically
+   *   authenticated using your API credentials:
+   * </p>
+   *
+   * <pre>
+   *    amadeus.post("/v1/foo/bar", Params.with("airline", "1X"), { "foo" : "bar" })
+   * </pre>
+   *
+   * @param path The full path for the API call
+   * @param params The optional POST params to pass to the API
+   * @param body The POST JsonObject body to pass to the API
+   * @return a Response object containing the status code, body, and parsed data.
+   */
+  public Response post(String path, Params params, JsonObject body) throws ResponseException {
+    return request(Constants.POST, path, params, body.toString());
+  }
+
+  /**
+   * <p>
+   *   A helper module for making generic POST requests calls. It is used by
+   *   every namespaced API POST method.
+   * </p>
+   *
+   * <p>
+   *   It can be used to make any generic API call that is automatically
+   *   authenticated using your API credentials:
+   * </p>
+   *
+   * <pre>
+   *    amadeus.post("/v1/foo/bar", Params.with("airline", "1X"), { "foo" : "bar" })
+   * </pre>
+   *
+   * @param path The full path for the API call
+   * @param params The optional POST params to pass to the API
+   * @param body The POST String object body to pass to the API
+   * @return a Response object containing the status code, body, and parsed data.
+   */
+  public Response post(String path, Params params, String body) throws ResponseException {
+    return request(Constants.POST, path, params, body.toString());
+  }
+
   /**
    * A generic method for making any authenticated or unauthenticated request,
    * passing in the bearer token explicitly. Used primarily by the
@@ -292,15 +340,32 @@ private Request fetch(Request request) throws NetworkException {
   // Writes the parameters to the request.
   private void write(Request request) throws IOException {
 
+    // POST with access token + body + URL parameters
+    if (request.getVerb() == Constants.POST && request.getParams() != null
+            && request.getBearerToken() != null) {
+      OutputStream os = request.getConnection().getOutputStream();
+      BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os, "UTF-8"));
+      // writer.write(request.getParams().toQueryString());
+      if (request.getBody() != null) {
+        writer.write(request.getBody());
+      }
+      writer.flush();
+      writer.close();
+      os.close();
+    }
 
-    if (request.getVerb() == Constants.POST && request.getParams() != null) {
+    // POST with access without token (authentication call)
+    if (request.getVerb() == Constants.POST && request.getParams() != null
+            && request.getBearerToken() == null) {
       OutputStream os = request.getConnection().getOutputStream();
       BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os, "UTF-8"));
       writer.write(request.getParams().toQueryString());
       writer.flush();
       writer.close();
       os.close();
     }
+
+    // POST with access token + body
     if (request.getVerb() == Constants.POST && request.getParams() == null) {
       OutputStream os = request.getConnection().getOutputStream();
       BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os, "UTF-8"));

src/main/java/com/amadeus/Request.java

@@ -157,7 +157,7 @@ private String buildUserAgent() {
 
   // Gets the serialized params, only if this is a Get call
   private String getQueryParams() {
-    if (verb == Constants.GET && params != null) {
+    if (params != null) {
       return params.toQueryString();
     } else {
       return "";

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

@@ -0,0 +1,17 @@
+package com.amadeus.resources;
+
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * An FlightPayment object as returned by the Flight Offers Price API.
+ * @see amadeus.shopping.flightOffersSearch.pricing#post()
+ */
+@ToString
+public class FlightPayment extends Resource {
+  protected FlightPayment() {}
+
+  private @Getter String brand;
+  private @Getter Integer binNumber;
+  private @Getter String[] flightOfferIds;
+}

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

@@ -0,0 +1,43 @@
+package com.amadeus.resources;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@ToString
+public class FlightPrice extends Resource {
+  protected FlightPrice() {}
+
+  private @Getter String type;
+  private @Getter FlightOfferSearch[] flightOffers;
+  private @Getter BookingRequirements bookingRequirements;
+
+  @ToString
+  public class BookingRequirements {
+    protected BookingRequirements() {}
+
+    private @Getter Boolean invoiceAddressRequired;
+    private @Getter Boolean mailingAddressRequired;
+    private @Getter Boolean emailAddressRequired;
+    private @Getter Boolean phoneCountryCodeRequired;
+    private @Getter Boolean mobilePhoneNumberRequired;
+    private @Getter Boolean phoneNumberRequired;
+    private @Getter Boolean postalCodeRequired;
+    private @Getter PassengerConditions[] travelerRequirements;
+  }
+
+  @ToString
+  public class PassengerConditions {
+    protected PassengerConditions(){}
+
+    private @Getter String travelerId;
+    private @Getter Boolean genderRequired;
+    private @Getter Boolean documentRequired;
+    private @Getter Boolean documentIssuanceCityRequired;
+    private @Getter Boolean dateOfBirthRequired;
+    private @Getter Boolean redressRequiredIfAny;
+    private @Getter Boolean airFranceDiscountRequired;
+    private @Getter Boolean spanishResidentDiscountRequired;
+    private @Getter Boolean residenceRequired;
+  }
+
+}

src/main/java/com/amadeus/shopping/FlightOffersSearch.java

@@ -6,6 +6,7 @@
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.FlightOfferSearch;
 import com.amadeus.resources.Resource;
+import com.amadeus.shopping.flightOffers.Pricing;
 import com.google.gson.JsonObject;
 
 /**
@@ -24,6 +25,7 @@
  */
 public class FlightOffersSearch {
   private Amadeus client;
+  public Pricing pricing;
 
   /**
    * Constructor.
@@ -32,6 +34,7 @@ public class FlightOffersSearch {
    */
   public FlightOffersSearch(Amadeus client) {
     this.client = client;
+    this.pricing = new Pricing(client);
   }
 
   /**