Add response to each resource

cbetta · cbetta · commit eb2d65281654 · 2018-05-05T15:05:47.000+01:00
diff --git a/src/main/java/com/amadeus/Response.java b/src/main/java/com/amadeus/Response.java
@@ -6,6 +6,7 @@
 import com.amadeus.exceptions.ParserException;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.exceptions.ServerException;
+import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
diff --git a/src/main/java/com/amadeus/referenceData/Location.java b/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.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -51,7 +52,8 @@ public Location(Amadeus client, String locationId) {
   public com.amadeus.resources.Location get(Params params) throws ResponseException {
     String path = String.format("/v1/reference-data/locations/%s", locationId);
     Response response = client.get(path, params);
-    return new Gson().fromJson(response.getData(), com.amadeus.resources.Location.class);
+    return (com.amadeus.resources.Location)
+            Resource.fromObject(response, com.amadeus.resources.Location.class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/referenceData/Locations.java b/src/main/java/com/amadeus/referenceData/Locations.java
@@ -6,6 +6,7 @@
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.referenceData.locations.Airports;
 import com.amadeus.resources.Location;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -64,7 +65,7 @@ public Locations(Amadeus client) {
    */
   public Location[] get(Params params) throws ResponseException {
     Response response = client.get("/v1/reference-data/locations", params);
-    return new Gson().fromJson(response.getData(), Location[].class);
+    return (Location[]) Resource.fromArray(response, Location[].class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/referenceData/locations/Airports.java b/src/main/java/com/amadeus/referenceData/locations/Airports.java
@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.Location;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -48,7 +49,7 @@ public Airports(Amadeus client) {
    */
   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);
+    return (Location[]) Resource.fromArray(response, Location[].class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/referenceData/urls/CheckinLinks.java b/src/main/java/com/amadeus/referenceData/urls/CheckinLinks.java
@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.CheckinLink;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -47,7 +48,7 @@ public CheckinLinks(Amadeus client) {
    */
   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);
+    return (CheckinLink[]) Resource.fromArray(response, CheckinLink[].class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/resources/Resource.java b/src/main/java/com/amadeus/resources/Resource.java
@@ -1,4 +1,36 @@
 package com.amadeus.resources;
 
+import com.amadeus.Response;
+import com.google.gson.Gson;
+import lombok.Getter;
+
 public class Resource {
+  /**
+   * The original response that this object is populated from.
+   */
+  private @Getter Response response;
+
+  /**
+   * Turns a response into a Gson deserialized array of resources,
+   * attaching the response to each resource.
+   * @hide as only used internally
+   */
+  public static Resource[] fromArray(Response response, Class klass) {
+    Resource[] resources = (Resource[]) new Gson().fromJson(response.getData(), klass);
+    for (Resource resource : resources) {
+      resource.response = response;
+    }
+    return resources;
+  }
+
+  /**
+   * Turns a response into a Gson deserialized resource,
+   * attaching the response to the resource.
+   * @hide as only used internally
+   */
+  public static Resource fromObject(Response response, Class klass) {
+    Resource resource = (Resource) new Gson().fromJson(response.getData(), klass);
+    resource.response = response;
+    return resource;
+  }
 }
diff --git a/src/main/java/com/amadeus/shopping/FlightDates.java b/src/main/java/com/amadeus/shopping/FlightDates.java
@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.FlightDate;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -49,7 +50,7 @@ public FlightDates(Amadeus client) {
    */
   public FlightDate[] get(Params params) throws ResponseException {
     Response response = client.get("/v1/shopping/flight-dates", params);
-    return new Gson().fromJson(response.getData(), FlightDate[].class);
+    return (FlightDate[]) Resource.fromArray(response, FlightDate[].class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/shopping/FlightDestinations.java b/src/main/java/com/amadeus/shopping/FlightDestinations.java
@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.FlightDestination;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -48,7 +49,7 @@ public FlightDestinations(Amadeus client) {
    */
   public FlightDestination[] get(Params params) throws ResponseException {
     Response response = client.get("/v1/shopping/flight-destinations", params);
-    return new Gson().fromJson(response.getData(), FlightDestination[].class);
+    return (FlightDestination[]) Resource.fromArray(response, FlightDestination[].class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/shopping/FlightOffers.java b/src/main/java/com/amadeus/shopping/FlightOffers.java
@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.FlightOffer;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -49,7 +50,7 @@ public FlightOffers(Amadeus client) {
    */
   public FlightOffer[] get(Params params) throws ResponseException {
     Response response = client.get("/v1/shopping/flight-offers", params);
-    return new Gson().fromJson(response.getData(), FlightOffer[].class);
+    return (FlightOffer[]) Resource.fromArray(response, FlightOffer[].class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/shopping/HotelOffers.java b/src/main/java/com/amadeus/shopping/HotelOffers.java
@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.HotelOffer;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -47,7 +48,7 @@ public HotelOffers(Amadeus client) {
    */
   public HotelOffer[] get(Params params) throws ResponseException {
     Response response = client.get("/v1/shopping/hotel-offers", params);
-    return new Gson().fromJson(response.getData(), HotelOffer[].class);
+    return (HotelOffer[]) Resource.fromArray(response, HotelOffer[].class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/shopping/hotel/HotelOffers.java b/src/main/java/com/amadeus/shopping/hotel/HotelOffers.java
@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.HotelOffer;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -49,7 +50,7 @@ public HotelOffers(Amadeus client, String hotelId) {
   public HotelOffer get(Params params) throws ResponseException {
     String path = String.format("/v1/shopping/hotels/%s/hotel-offers", hotelId);
     Response response = client.get(path, params);
-    return new Gson().fromJson(response.getData(), HotelOffer.class);
+    return (HotelOffer) Resource.fromObject(response, HotelOffer.class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/shopping/hotel/Offer.java b/src/main/java/com/amadeus/shopping/hotel/Offer.java
@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.HotelOffer;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -53,7 +54,7 @@ public Offer(Amadeus client, String hotelId, String offerId) {
   public HotelOffer.Offer get(Params params) throws ResponseException {
     String path = String.format("/v1/shopping/hotels/%s/offers/%s", hotelId, offerId);
     Response response = client.get(path, params);
-    return new Gson().fromJson(response.getData(), HotelOffer.Offer.class);
+    return (HotelOffer.Offer) Resource.fromObject(response, HotelOffer.Offer.class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/travel/analytics/FareSearches.java b/src/main/java/com/amadeus/travel/analytics/FareSearches.java
@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.FareSearch;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -51,7 +52,7 @@ public FareSearches(Amadeus client) {
    */
   public FareSearch[] get(Params params) throws ResponseException {
     Response response = client.get("/v1/travel/analytics/fare-searches", params);
-    return new Gson().fromJson(response.getData(), FareSearch[].class);
+    return (FareSearch[]) Resource.fromArray(response, FareSearch[].class);
   }
 
   /**
diff --git a/src/main/java/com/amadeus/travel/analytics/airTraffic/Traveled.java b/src/main/java/com/amadeus/travel/analytics/airTraffic/Traveled.java
@@ -5,6 +5,7 @@
 import com.amadeus.Response;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.AirTraffic;
+import com.amadeus.resources.Resource;
 import com.google.gson.Gson;
 
 /**
@@ -48,7 +49,7 @@ public Traveled(Amadeus client) {
    */
   public AirTraffic[] get(Params params) throws ResponseException {
     Response response = client.get("/v1/travel/analytics/air-traffic/traveled", params);
-    return new Gson().fromJson(response.getData(), AirTraffic[].class);
+    return (AirTraffic[]) Resource.fromArray(response, AirTraffic[].class);
   }
 
   /**
diff --git a/src/test/java/com/amadeus/ResponseTest.java b/src/test/java/com/amadeus/ResponseTest.java
@@ -66,7 +66,7 @@ public class ResponseTest {
             new ByteArrayInputStream("{ \"data\": { \"foo\": \"bar\"}}".getBytes()));
 
     response.parse(client);
-    
+
     assertEquals(response.getStatusCode(), 200);
     assertEquals(response.getBody(), "{ \"data\": { \"foo\": \"bar\"}}");
     assertTrue(response.isParsed());
