Introduce flight offer v2 request (#33)

Add the support for Flight Offers Search (Get) to the SDK

Author: spirosbatzio

README.md

@@ -225,6 +225,16 @@ FlightOffer[] flightOffers = amadeus.shopping.flightOffers.get(Params
   .and("destination", "MAD")
   .and("departureDate", "2019-08-01"));
 
+// Flight Offer Search v2
+FlightOfferSearch[] flightOffersSearches = amadeus.shopping.flightOffersSearch.get(
+              Params.with("originLocationCode", "SYD")
+                      .and("destinationLocationCode", "BKK")
+                      .and("departureDate", "2020-01-01")
+                      .and("returnDate", "2020-01-05")
+                      .and("adults", 2)
+                      .and("max", 3)
+      );
+
 // 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/Shopping.java

@@ -3,6 +3,7 @@
 import com.amadeus.shopping.FlightDates;
 import com.amadeus.shopping.FlightDestinations;
 import com.amadeus.shopping.FlightOffers;
+import com.amadeus.shopping.FlightOffersSearch;
 import com.amadeus.shopping.HotelOffer;
 import com.amadeus.shopping.HotelOffers;
 import com.amadeus.shopping.HotelOffersByHotel;
@@ -50,6 +51,14 @@ public class Shopping {
    */
   public FlightOffers flightOffers;
 
+  /**
+   * <p>
+   *   A namespaced client for the
+   *   <code>/v2/shopping/flight-offers</code> endpoints.
+   * </p>
+   */
+  public FlightOffersSearch flightOffersSearch;
+
   /**
    * <p>
    *   A namespaced client for the
@@ -77,6 +86,7 @@ public Shopping(Amadeus client) {
     this.flightOffers = new FlightOffers(client);
     this.hotelOffers = new HotelOffers(client);
     this.hotelOffersByHotel = new HotelOffersByHotel(client);
+    this.flightOffersSearch = new FlightOffersSearch(client);
   }
 
   /**

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

@@ -0,0 +1,133 @@
+package com.amadeus.resources;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.ToString;
+
+
+@ToString
+public class FlightOfferSearch extends Resource {
+  protected FlightOfferSearch() {}
+
+  private @Getter String type;
+  private @Getter String id;
+  private @Getter String source;
+  private @Getter boolean instantTicketingRequired;
+  private @Getter boolean nonHomogeneous;
+  private @Getter boolean oneWay;
+  private @Getter Date lastTicketingDate;
+  private @Getter int numberOfBookableSeats;
+  private @Getter Itinerary[] itineraries;
+  private @Getter SearchPrice price;
+  private @Getter PricingOptions pricingOptions;
+  private @Getter String[] validatingAirlineCodes;
+  private @Getter TravelerPricing[] travelerPricings;
+
+
+
+  @ToString
+  public class Itinerary {
+    protected Itinerary() {
+    }
+
+    private @Getter String duration;
+    private @Getter SearchSegment[] segments;
+
+  }
+
+  @ToString
+  public class SearchSegment {
+    protected SearchSegment() {
+    }
+
+    private @Getter AirportInfo departure;
+    private @Getter AirportInfo arrival;
+    private @Getter String carrierCode;
+    private @Getter String number;
+    private @Getter Aircraft aircraft;
+    private @Getter String duration;
+    private @Getter String id;
+    private @Getter int numberOfStops;
+    private @Getter boolean blacklistedInEU;
+  }
+
+  @ToString
+  public class AirportInfo {
+    protected AirportInfo() {
+    }
+
+    private @Getter String iataCode;
+    private @Getter String terminal;
+    private @Getter String at;
+  }
+
+  @ToString
+  public class Aircraft {
+    protected Aircraft() {
+    }
+
+    private @Getter String code;
+  }
+
+  @ToString
+  public class SearchPrice {
+    protected SearchPrice() {
+    }
+
+    private @Getter String currency;
+    private @Getter double total;
+    private @Getter double base;
+    private @Getter Fee[] fees;
+    private @Getter double grandTotal;
+  }
+
+  @ToString
+  public class Fee {
+    protected Fee() {
+    }
+
+    private @Getter double amount;
+    private @Getter String type;
+  }
+
+  @ToString
+  public class PricingOptions {
+    private @Getter boolean includedCheckedBagsOnly;
+  }
+
+  @ToString
+  public class TravelerPricing {
+    protected TravelerPricing() {
+    }
+
+    private @Getter String travelerId;
+    private @Getter String fareOption;
+    private @Getter String travelerType;
+    private @Getter SearchPrice price;
+    private @Getter FareDetailsBySegment[] fareDetailsBySegment;
+  }
+
+  @ToString
+  public class FareDetailsBySegment {
+    protected FareDetailsBySegment() {
+    }
+
+    private @Getter String segmentId;
+    private @Getter String cabin;
+    private @Getter String fareBasis;
+    @SerializedName("class")
+    private @Getter String segmentClass;
+    private @Getter IncludedCheckedBags includedCheckedBags;
+
+  }
+
+  @ToString
+  public class IncludedCheckedBags {
+    protected IncludedCheckedBags() {
+    }
+
+    private @Getter double weight;
+    private @Getter String weightUnit;
+  }
+}

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

@@ -0,0 +1,21 @@
+package com.amadeus.shopping;
+
+import com.amadeus.Amadeus;
+import com.amadeus.Params;
+import com.amadeus.Response;
+import com.amadeus.exceptions.ResponseException;
+import com.amadeus.resources.FlightOfferSearch;
+import com.amadeus.resources.Resource;
+
+public class FlightOffersSearch {
+  private Amadeus client;
+
+  public FlightOffersSearch(Amadeus client) {
+    this.client = client;
+  }
+
+  public FlightOfferSearch[] get(Params params) throws ResponseException {
+    Response response = client.get("/v2/shopping/flight-offers", params);
+    return (FlightOfferSearch[]) Resource.fromArray(response, FlightOfferSearch[].class);
+  }
+}

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

@@ -11,6 +11,7 @@
 import com.amadeus.shopping.FlightDates;
 import com.amadeus.shopping.FlightDestinations;
 import com.amadeus.shopping.FlightOffers;
+import com.amadeus.shopping.FlightOffersSearch;
 import com.amadeus.shopping.HotelOffer;
 import com.amadeus.shopping.HotelOffers;
 import com.amadeus.shopping.HotelOffersByHotel;
@@ -51,6 +52,7 @@ public void testAllNamespacesExist() {
     TestCase.assertNotNull(client.shopping.flightDates);
     TestCase.assertNotNull(client.shopping.flightDestinations);
     TestCase.assertNotNull(client.shopping.flightOffers);
+    TestCase.assertNotNull(client.shopping.flightOffersSearch);
     TestCase.assertNotNull(client.shopping.flightOffers.prediction);
     TestCase.assertNotNull(client.shopping.hotelOffers);
     TestCase.assertNotNull(client.shopping.hotelOffersByHotel);
@@ -257,6 +259,15 @@ public void testGetMethods() throws ResponseException {
     HotelOffer hotelOffer = new HotelOffer(client, "XXX");
     TestCase.assertNotNull(hotelOffer.get());
     TestCase.assertNotNull(hotelOffer.get(params));
+
+    // Test flight offer search v2
+    Mockito.when(client.get("/v2/shopping/flight-offers", null))
+        .thenReturn(multiResponse);
+    Mockito.when(client.get("/v2/shopping/flight-offers", params))
+        .thenReturn(multiResponse);
+    FlightOffersSearch flightOfferSearch = new FlightOffersSearch(client);
+    TestCase.assertNotNull(flightOfferSearch.get(params));
+
   }
 
   @Test