Merge pull request #20 from anthonyroux/hotel_v2

Migration from the hotel v1 to hotel v2

Author: anthonyroux

.gitignore

@@ -6,4 +6,5 @@ build
 .classpath
 .idea
 out
-.DS_Store
+.DS_Store
+amadeus-java.iml

README.md

@@ -131,10 +131,10 @@ amadeus.referenceData.urls.checkinLinks.get(Params.with("airlineCode", "BA"));
 
 Similarly, to select a resource by ID, you can pass in the ID to the **singular** path.
 
-For example,  `GET /v1/shopping/hotel/ABC123/offers/DEF234` would be:
+For example,  `GET /v2/shopping/hotel-offers/XXX` would be:
 
 ```java
-amadeus.hotel("ABC123").offer("DEF234").get(...);
+amadeus.hotelOffer("XXX").get(...);
 ```
 
 You can make any arbitrary API call as well directly with the `.get` method.
@@ -281,13 +281,10 @@ Period[] busiestPeriods = amadeus.travel.analytics.airTraffic.busiestPeriod.get(
 HotelOffer[] offers = amadeus.shopping.hotelOffers.get(Params
   .with("cityCode", "MAD"));
 // Get list of offers for a specific hotel
+HotelOffer hotelOffer = amadeus.shopping.hotelOffersByHotel.get(Params.with("hotelId", "BGLONBGB");
+// Confirm the availability of a specific offer
 HotelOffer offer = amadeus.shopping
-  .hotel("SMPARCOL")
-  .hotelOffers.get();
-// Confirm the availability of a specific offer for a specific hotel
-Offer offer = amadeus.shopping
-  .hotel("SMPARCOL")
-  .offer("4BA070CE929E135B3268A9F2D0C51E9D4A6CF318BA10485322FA2C7E78C7852E").get();
+  .hotelOffer("4BA070CE929E135B3268A9F2D0C51E9D4A6CF318BA10485322FA2C7E78C7852E").get();
 ```
 
 ## Development & Contributing

src/main/java/com/amadeus/Shopping.java

@@ -3,8 +3,9 @@
 import com.amadeus.shopping.FlightDates;
 import com.amadeus.shopping.FlightDestinations;
 import com.amadeus.shopping.FlightOffers;
-import com.amadeus.shopping.Hotel;
+import com.amadeus.shopping.HotelOffer;
 import com.amadeus.shopping.HotelOffers;
+import com.amadeus.shopping.HotelOffersByHotel;
 
 /**
  * <p>
@@ -52,11 +53,19 @@ public class Shopping {
   /**
    * <p>
    *   A namespaced client for the
-   *   <code>/v1/shopping/hotel-offers</code> endpoints.
+   *   <code>/v2/shopping/hotel-offers</code> endpoints.
    * </p>
    */
   public HotelOffers hotelOffers;
 
+  /**
+   * <p>
+   *   A namespaced client for the
+   *   <code>/v2/shopping/hotel-offers/by-hotel</code> endpoints.
+   * </p>
+   */
+  public HotelOffersByHotel hotelOffersByHotel;
+
   /**
    * Constructor.
    * @hide
@@ -67,6 +76,7 @@ public Shopping(Amadeus client) {
     this.flightDestinations = new FlightDestinations(client);
     this.flightOffers = new FlightOffers(client);
     this.hotelOffers = new HotelOffers(client);
+    this.hotelOffersByHotel = new HotelOffersByHotel(client);
   }
 
   /**
@@ -75,7 +85,7 @@ public Shopping(Amadeus client) {
    *   <code>/v1/shopping/hotel/:hotel_id</code> endpoints.
    * </p>
    */
-  public Hotel hotel(String hotelId) {
-    return new Hotel(client, hotelId);
+  public HotelOffer hotelOffer(String hotelId) {
+    return new HotelOffer(client, hotelId);
   }
 }

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

@@ -37,6 +37,7 @@ protected Hotel() {}
     private @Getter String cityCode;
     private @Getter double latitude;
     private @Getter double longitude;
+    private @Getter HotelDistance hotelDistance;
     private @Getter AddressType address;
     private @Getter HotelContact contact;
   }
@@ -52,7 +53,6 @@ protected Offer() {}
     private @Getter String type;
     private @Getter String id;
     private @Getter Integer roomQuantity;
-    private @Getter String bookingCode;
     private @Getter String rateCode;
     private @Getter RateFamily rateFamilyEstimated;
     private @Getter String category;
@@ -65,6 +65,19 @@ protected Offer() {}
     private @Getter PolicyDetails policies;
   }
 
+  /**
+   * An HotelOffer-related object as returned by the HotelOffers API.
+   * @see com.amadeus.shopping.HotelOffers#get()
+   */
+  @ToString
+  public class HotelDistance {
+    protected HotelDistance() {}
+
+    private @Getter String description;
+    private @Getter double distance;
+    private @Getter String distanceUnit;
+  }
+
   /**
    * An HotelOffer-related object as returned by the HotelOffers API.
    * @see com.amadeus.shopping.HotelOffers#get()
@@ -220,6 +233,7 @@ public class MediaURI {
     protected MediaURI() {}
 
     private @Getter String uri;
+    private @Getter String category;
   }
 
   /**
@@ -262,6 +276,22 @@ protected PolicyDetails() {}
     private @Getter GuaranteePolicy prepay;
     private @Getter GuaranteePolicy holdTime;
     private @Getter CancellationPolicy cancellation;
+    private @Getter CheckInOutPolicy checkInOut;
+  }
+
+  /**
+   * An HotelOffer-related object as returned by the HotelOffers API.
+   * @see com.amadeus.shopping.HotelOffers#get()
+   */
+  @ToString
+  public class CheckInOutPolicy {
+
+    protected CheckInOutPolicy() {}
+
+    private @Getter String checkIn;
+    private @Getter TextWithLanguageType checkInDescription;
+    private @Getter String checkOut;
+    private @Getter TextWithLanguageType checkOutDescription;
   }
 
   /**

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

@@ -0,0 +1,64 @@
+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.Resource;
+
+/**
+ * <p>
+ *   A namespaced client for the
+ *   <code>/v2/shopping/hotel-offers/:offer_id</code> endpoints.
+ * </p>
+ *
+ * <p>
+ *   Access via the Amadeus client object
+ * </p>
+ *
+ * <pre>
+ * Amadeus amadeus = Amadeus.builder(API_KEY, API_SECRET).build();
+ * amadeus.shopping.HotelOffer(offerId);</pre>
+ *
+ * @hide
+ */
+public class HotelOffer {
+  private Amadeus client;
+  private String offerId;
+
+  /**
+   * Constructor.
+   * @hide
+   */
+  public HotelOffer(Amadeus client, String offerId) {
+    this.offerId = offerId;
+    this.client = client;
+  }
+
+  /**
+   * <p>
+   *   Returns details for a specific offer.
+   * </p>
+   *
+   * <pre>
+   * amadeus.shopping.HotelOffer("XXX").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.HotelOffer get(Params params) throws ResponseException {
+    String path = String.format("/v2/shopping/hotel-offers/%s", offerId);
+    Response response = client.get(path, params);
+    return (com.amadeus.resources.HotelOffer) Resource.fromObject(
+        response, com.amadeus.resources.HotelOffer.class);
+  }
+
+  /**
+   * Convenience method for calling <code>get</code> without any parameters.
+   * @see com.amadeus.resources.HotelOffer#get()
+   */
+  public com.amadeus.resources.HotelOffer get() throws ResponseException {
+    return get(null);
+  }
+}

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

@@ -47,7 +47,7 @@ public HotelOffers(Amadeus client) {
    * @throws ResponseException when an exception occurs
    */
   public HotelOffer[] get(Params params) throws ResponseException {
-    Response response = client.get("/v1/shopping/hotel-offers", params);
+    Response response = client.get("/v2/shopping/hotel-offers", params);
     return (HotelOffer[]) Resource.fromArray(response, HotelOffer[].class);
   }
 

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

@@ -1,17 +1,16 @@
-package com.amadeus.shopping.hotel;
+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.HotelOffer;
 import com.amadeus.resources.Resource;
-import com.google.gson.Gson;
 
 /**
  * <p>
  *   A namespaced client for the
- *   <code>/v1/shopping/hotels/:hotel_id/hotel-offers</code> endpoints.
+ *   <code>/v2/shopping/hotel-offers/by-hotel</code> endpoints.
  * </p>
  *
  * <p>
@@ -20,42 +19,40 @@
  *
  * <pre>
  * Amadeus amadeus = Amadeus.builder("clientId", "secret").build();
- * amadeus.shopping.hotel(hotelId).hotelOffers;</pre>
+ * amadeus.shopping.HotelOffersByHotel;</pre>
  */
-public class HotelOffers {
+public class HotelOffersByHotel {
   private Amadeus client;
-  private String hotelId;
 
   /**
    * Constructor.
    * @hide
    */
-  public HotelOffers(Amadeus client, String hotelId) {
+  public HotelOffersByHotel(Amadeus client) {
     this.client = client;
-    this.hotelId = hotelId;
   }
 
   /**
    * <p>
-   *   Get one hotel and its available offers.
+   *   Get all offers for a dedicated hotel.
    * </p>
    *
    * <pre>
-   * amadeus.shopping.hotel("SMPARCOL").hotelOffers.get();</pre>
+   * amadeus.shopping.HotelOffersByHotel.get(Params
+   *   .with("hotelId", "XKPARC12"));</pre>
    *
    * @param params the parameters to send to the API
    * @return an API response object
    * @throws ResponseException when an exception occurs
    */
   public HotelOffer get(Params params) throws ResponseException {
-    String path = String.format("/v1/shopping/hotels/%s/hotel-offers", hotelId);
-    Response response = client.get(path, params);
+    Response response = client.get("/v2/shopping/hotel-offers/by-hotel", params);
     return (HotelOffer) Resource.fromObject(response, HotelOffer.class);
   }
 
   /**
    * Convenience method for calling <code>get</code> without any parameters.
-   * @see HotelOffers#get()
+   * @see HotelOffersByHotel#get()
    */
   public HotelOffer get() throws ResponseException {
     return get(null);