Add actual resources

Author: cbetta

build.gradle

@@ -75,6 +75,6 @@ javadoc {
 
 cobertura {
     coverageFormats = ['html', 'xml']
-    coverageIgnores = [ 'java.io.UnsupportedEncodingException' ]
+    coverageIgnores = [ 'java.io.UnsupportedEncodingException', 'com.amadeus.resources.*' ]
     coverageIgnoreTrivial = true
 }

src/main/java/com/amadeus/Response.java

@@ -6,7 +6,7 @@
 import com.amadeus.exceptions.ParserException;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.exceptions.ServerException;
-import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import java.io.BufferedReader;
@@ -39,7 +39,7 @@ public class Response {
   /**
    * The data extracted from the JSON data - if the body contained JSON.
    */
-  private @Getter JsonArray data;
+  private @Getter JsonElement data;
   /**
    * The raw body received from the API.
    */
@@ -97,7 +97,12 @@ private void parseData(HTTPClient client) {
     this.result = parseJson(client);
     this.parsed = this.result != null;
     if (parsed && result.has("data")) {
-      this.data = result.get("data").getAsJsonArray();
+      if (result.get("data").isJsonArray()) {
+        this.data = result.get("data").getAsJsonArray();
+      }
+      if (result.get("data").isJsonObject()) {
+        this.data = result.get("data").getAsJsonObject();
+      }
     }
   }
 

src/main/java/com/amadeus/referenceData/Location.java

@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.referenceData.locations.Airports;
+import com.google.gson.Gson;
 
 /**
  * <p>
@@ -47,16 +48,17 @@ public Location(Amadeus client, String locationId) {
    * @return an API response object
    * @throws ResponseException when an exception occurs
    */
-  public Response get(Params params) throws ResponseException {
+  public com.amadeus.resources.Location get(Params params) throws ResponseException {
     String path = String.format("/v1/reference-data/locations/%s", locationId);
-    return client.get(path, params);
+    Response response = client.get(path, params);
+    return new Gson().fromJson(response.getData(), com.amadeus.resources.Location.class);
   }
 
   /**
    * Convenience method for calling <code>get</code> without any parameters.
    * @see Airports#get()
    */
-  public Response get() throws ResponseException {
+  public com.amadeus.resources.Location get() throws ResponseException {
     return get(null);
   }
 }

src/main/java/com/amadeus/referenceData/Locations.java

@@ -5,7 +5,8 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.referenceData.locations.Airports;
-import com.amadeus.referenceData.urls.CheckinLinks;
+import com.amadeus.resources.Location;
+import com.google.gson.Gson;
 
 /**
  * <p>
@@ -61,15 +62,16 @@ public Locations(Amadeus client) {
    * @return an API response object
    * @throws ResponseException when an exception occurs
    */
-  public Response get(Params params) throws ResponseException {
-    return client.get("/v1/reference-data/locations", params);
+  public Location[] get(Params params) throws ResponseException {
+    Response response = client.get("/v1/reference-data/locations", params);
+    return new Gson().fromJson(response.getData(), Location[].class);
   }
 
   /**
    * Convenience method for calling <code>get</code> without any parameters.
    * @see Airports#get()
    */
-  public Response get() throws ResponseException {
+  public Location[] get() throws ResponseException {
     return get(null);
   }
 }

src/main/java/com/amadeus/referenceData/locations/Airports.java

@@ -4,6 +4,8 @@
 import com.amadeus.Params;
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
+import com.amadeus.resources.Location;
+import com.google.gson.Gson;
 
 /**
  * <p>
@@ -44,15 +46,16 @@ public Airports(Amadeus client) {
    * @return an API response object
    * @throws ResponseException when an exception occurs
    */
-  public Response get(Params params) throws ResponseException {
-    return client.get("/v1/reference-data/locations/airports", params);
+  public Location[] get(Params params) throws ResponseException {
+    Response response = client.get("/v1/reference-data/locations/airports", params);
+    return new Gson().fromJson(response.getData(), Location[].class);
   }
 
   /**
    * Convenience method for calling <code>get</code> without any parameters.
    * @see Airports#get()
    */
-  public Response get() throws ResponseException {
+  public Location[] get() throws ResponseException {
     return get(null);
   }
 }

src/main/java/com/amadeus/referenceData/urls/CheckinLinks.java

@@ -4,6 +4,8 @@
 import com.amadeus.Params;
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
+import com.amadeus.resources.CheckinLink;
+import com.google.gson.Gson;
 
 /**
  * <p>
@@ -40,18 +42,19 @@ public CheckinLinks(Amadeus client) {
    * amadeus.referenceData.urls.checkinLinks.get(Params.with("airline", "1X"));</pre>
    *
    * @param params the parameters to send to the API
-   * @return an API response object
+   * @return an API resource
    * @throws ResponseException when an exception occurs
    */
-  public Response get(Params params) throws ResponseException {
-    return client.get("/v2/reference-data/urls/checkin-links", params);
+  public CheckinLink[] get(Params params) throws ResponseException {
+    Response response = client.get("/v2/reference-data/urls/checkin-links", params);
+    return new Gson().fromJson(response.getData(), CheckinLink[].class);
   }
 
   /**
    * Convenience method for calling <code>get</code> without any parameters.
    * @see CheckinLinks#get()
    */
-  public Response get() throws ResponseException {
+  public CheckinLink[] get() throws ResponseException {
     return get(null);
   }
 }

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

@@ -0,0 +1,28 @@
+package com.amadeus.resources;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@ToString
+public class AirTraffic extends Resource {
+  private @Getter String type;
+  private @Getter String subType;
+  private @Getter String destination;
+  private @Getter Analytics analytics;
+
+  @ToString
+  private class Analytics {
+    private @Getter Flights flights;
+    private @Getter Travellers travellers;
+
+    @ToString
+    private class Flights {
+      private @Getter Double score;
+    }
+
+    @ToString
+    private class Travellers {
+      private @Getter Double score;
+    }
+  }
+}

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

@@ -0,0 +1,12 @@
+package com.amadeus.resources;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@ToString
+public class CheckinLink extends Resource {
+  private @Getter String type;
+  private @Getter String id;
+  private @Getter String href;
+  private @Getter String channel;
+}

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

@@ -0,0 +1,21 @@
+package com.amadeus.resources;
+
+import java.util.HashMap;
+import lombok.Getter;
+import lombok.ToString;
+
+@ToString
+public class FareSearch extends Resource {
+  private @Getter String type;
+  private @Getter String period;
+  private @Getter String origin;
+  private @Getter String sourceCountry;
+  private @Getter NumberOfSearches numberOfSearches;
+
+  @ToString
+  private class NumberOfSearches {
+    private @Getter HashMap<String, String> perDestination;
+    private @Getter HashMap<String, Integer> perTripDuration;
+    private @Getter HashMap<String, Integer> perDaysInAdvance;
+  }
+}

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

@@ -0,0 +1,20 @@
+package com.amadeus.resources;
+
+import java.util.Date;
+import lombok.Getter;
+import lombok.ToString;
+
+@ToString
+public class FlightDate extends Resource {
+  private @Getter String type;
+  private @Getter String origin;
+  private @Getter String destination;
+  private @Getter Date departureDate;
+  private @Getter Date returnDate;
+  private @Getter Price price;
+
+  @ToString
+  private class Price {
+    private @Getter double total;
+  }
+}