add object mapping for meta and dictionaries

README.md

@@ -403,6 +403,31 @@ Destination[] directDestinations = amadeus.airport.directDestinations.get(Params
 // body can be a String version of your JSON or a JsonObject
 FlightAvailability[] flightAvailabilities
   = amadeus.shopping.availability.flightAvailabilities.post(body);
+
+// Add objet mapping for meta and dictionaries
+// eg. for dictionaries - Take Flight Offers Search as an example
+FlightOfferSearch[] flightOffers = amadeus.shopping.flightOffers.post(body);
+Dictionary flightOffersDic = flightOffers[0].getDictionaries();
+// get locations in dictionaries 
+Map<String, Dictionary.LocationValue> locations = flightOffersDic.getLocations();
+// get cityCode in the location (same for CountryCode) 
+String cityCode = flightOffersDic.getLocations().get("MAD").getCityCode();
+// get aircraft in dictionaries
+Map<String, String> aircraft = flightOffersDic.getAircraft();
+// get currencies in dictionaries
+Map<String, String> currencies = flightOffersDic.getCurrencies();
+// get carriers in dictionaries
+Map<String, String> carriers = flightOffersDic.getCarriers();
+
+// eg. for meta - Take Airport Routes as an example
+Destination[] directDestinations = amadeus.airport.directDestinations.get(Params
+  .with("departureAirportCode","MAD")
+  .and("max","5"));
+CollectionMeta meta = directDestinations[0].getMeta();
+// get count in meta
+int metaCount = meta.getCount();
+// get links in meta
+String selfLink = meta.getLinks().getSelf();
 ```
 
 ## Development & Contributing

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.amadeus.resources.Dictionary;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -52,6 +53,14 @@ public class Response {
    * The actual Request object used to make this API call.
    */
   private @Getter Request request;
+  /**
+   * The meta extracted from the JSON data - if the body contained JSON.
+   */
+  private @Getter JsonElement meta;
+  /**
+   * The dictionaries extracted from the JSON data - if the body contained JSON.
+   */
+  private @Getter JsonElement dictionaries;
 
   protected Response(Request request) {
     this.request = request;
@@ -120,6 +129,22 @@ private void parseData(HTTPClient client) {
         this.warnings = result.get("warnings").getAsJsonObject();
       }
     }
+    if (parsed && result.has("meta")) {
+      if (result.get("meta").isJsonArray()) {
+        this.meta = result.get("meta").getAsJsonArray();
+      }
+      if (result.get("meta").isJsonObject()) {
+        this.meta = result.get("meta").getAsJsonObject();
+      }
+    }
+    if (parsed && result.has("dictionaries")) {
+      if (result.get("dictionaries").isJsonArray()) {
+        this.dictionaries = result.get("dictionaries").getAsJsonArray();
+      }
+      if (result.get("dictionaries").isJsonObject()) {
+        this.dictionaries = result.get("dictionaries").getAsJsonObject();
+      }
+    }
   }
 
   // Tries to read the body.

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

@@ -0,0 +1,29 @@
+package com.amadeus.resources;
+
+import com.amadeus.Response;
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * A CollectionMeta Object Mapping.
+ * @see Response#getMeta()
+ */
+@ToString
+public class CollectionMeta extends Resource {
+  protected CollectionMeta() {}
+
+  private @Getter int count;
+  private @Getter CollectionLinks links;
+
+  @ToString
+  public class CollectionLinks {
+    protected CollectionLinks() {}
+
+    private @Getter String self;
+    private @Getter String next;
+    private @Getter String previous;
+    private @Getter String last;
+    private @Getter String first;
+    private @Getter String up;
+  }
+}

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

@@ -0,0 +1,28 @@
+package com.amadeus.resources;
+
+import com.amadeus.Response;
+import java.util.Map;
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * A Dictionary Object which is mapping.
+ * @see Response#getDictionaries()
+ */
+@ToString
+public class Dictionary extends Resource {
+  protected Dictionary() {}
+
+  private @Getter Map<String, LocationValue> locations;
+  private @Getter Map<String, String> aircraft;
+  private @Getter Map<String, String> currencies;
+  private @Getter Map<String, String> carriers;
+
+  @ToString
+  public class LocationValue {
+    protected LocationValue() {}
+
+    private @Getter String cityCode;
+    private @Getter String countryCode;
+  }
+}

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

@@ -20,6 +20,14 @@ protected Resource() {}
    * @hide as only used internally
    */
   private transient @Getter Class deSerializationClass;
+  /**
+   * The original meta that this object is populated from.
+   */
+  private transient @Getter CollectionMeta meta;
+  /**
+   * The original dictionaries that this object is populated from.
+   */
+  private transient @Getter Dictionary dictionaries;
 
   /**
    * Turns a response into a Gson deserialized array of resources,
@@ -32,6 +40,8 @@ public static Resource[] fromArray(Response response, Class klass) {
     for (Resource resource : resources) {
       resource.response = response;
       resource.deSerializationClass = klass;
+      resource.meta = gson.fromJson(response.getMeta(), CollectionMeta.class);
+      resource.dictionaries = gson.fromJson(response.getDictionaries(), Dictionary.class);
     }
     return resources;
   }
@@ -46,6 +56,8 @@ public static Resource fromObject(Response response, Class klass) {
     Resource resource = (Resource) gson.fromJson(response.getData(), klass);
     resource.response = response;
     resource.deSerializationClass = klass;
+    resource.meta = gson.fromJson(response.getMeta(), CollectionMeta.class);
+    resource.dictionaries = gson.fromJson(response.getDictionaries(), Dictionary.class);
     return resource;
   }
 }

src/test/java/com/amadeus/ResponseTest.java

@@ -46,35 +46,45 @@ public class ResponseTest {
     when(connection.getResponseCode()).thenReturn(200);
     when(connection.getHeaderField("Content-Type")).thenReturn(
             "application/json");
-    when(connection.getInputStream()).thenReturn(
-            new ByteArrayInputStream("{ \"data\": []}".getBytes()));
+    when(connection.getInputStream()).thenReturn(new ByteArrayInputStream(
+            "{ \"meta\":{},\"data\": [], \"dictionaries\":{}}".getBytes()));
 
     response.parse(client);
 
     assertEquals(response.getStatusCode(), 200);
-    assertEquals(response.getBody(), "{ \"data\": []}");
+    assertEquals(response.getBody(), "{ \"meta\":{},\"data\": [], \"dictionaries\":{}}");
     assertTrue(response.isParsed());
     assertNotNull(response.getResult());
     assertNotNull(response.getData());
+    assertNotNull(response.getMeta());
+    assertNotNull(response.getDictionaries());
   }
 
   @Test public void testParseObjectData() throws IOException {
     when(connection.getResponseCode()).thenReturn(200);
     when(connection.getHeaderField("Content-Type")).thenReturn(
             "application/json");
-    when(connection.getInputStream()).thenReturn(
-            new ByteArrayInputStream("{ \"data\": { \"foo\": \"bar\"}}".getBytes()));
+    when(connection.getInputStream()).thenReturn(new ByteArrayInputStream(
+            ("{ \"meta\": { \"count\": 1}, "
+            + "\"data\": { \"foo\": \"bar\"}, "
+            + "\"dictionaries\": { "
+            + "\"locations\": { \"city\" : { \"code\": \"xxx\"}}}}").getBytes()));
 
     response.parse(client);
 
     assertEquals(response.getStatusCode(), 200);
-    assertEquals(response.getBody(), "{ \"data\": { \"foo\": \"bar\"}}");
+    assertEquals(response.getBody(),
+        "{ \"meta\": { \"count\": 1}, "
+        + "\"data\": { \"foo\": \"bar\"}, "
+        + "\"dictionaries\": { "
+        + "\"locations\": { \"city\" : { \"code\": \"xxx\"}}}}");
     assertTrue(response.isParsed());
     assertNotNull(response.getResult());
     assertNotNull(response.getData());
+    assertNotNull(response.getMeta());
+    assertNotNull(response.getDictionaries());
   }
 
-
   @Test public void testNoData() throws IOException {
     when(connection.getResponseCode()).thenReturn(200);
     when(connection.getHeaderField("Content-Type")).thenReturn(
@@ -89,6 +99,8 @@ public class ResponseTest {
     assertTrue(response.isParsed());
     assertNotNull(response.getResult());
     assertNull(response.getData());
+    assertNull(response.getMeta());
+    assertNull(response.getDictionaries());
   }
 
   @Test public void testEmptyBody() throws IOException {
@@ -105,6 +117,8 @@ public class ResponseTest {
     assertFalse(response.isParsed());
     assertNull(response.getResult());
     assertNull(response.getData());
+    assertNull(response.getMeta());
+    assertNull(response.getDictionaries());
   }
 
   @Test public void testNoContent() throws IOException {
@@ -121,6 +135,8 @@ public class ResponseTest {
     assertFalse(response.isParsed());
     assertNull(response.getResult());
     assertNull(response.getData());
+    assertNull(response.getMeta());
+    assertNull(response.getDictionaries());
   }
 
   @Test public void testEmptyConnection() throws IOException {
@@ -136,6 +152,8 @@ public class ResponseTest {
     assertFalse(response.isParsed());
     assertNull(response.getResult());
     assertNull(response.getData());
+    assertNull(response.getMeta());
+    assertNull(response.getDictionaries());
   }
 
   @Test public void testEmptyConnectionWithStatusCode() throws IOException {
@@ -154,23 +172,27 @@ public class ResponseTest {
     assertFalse(response.isParsed());
     assertNull(response.getResult());
     assertNull(response.getData());
+    assertNull(response.getMeta());
+    assertNull(response.getDictionaries());
   }
 
   @Test public void testErrorResponse() throws IOException {
     when(connection.getResponseCode()).thenReturn(400);
     when(connection.getHeaderField("Content-Type")).thenReturn(
             "application/json");
     when(connection.getInputStream()).thenThrow(new IOException());
-    when(connection.getErrorStream()).thenReturn(
-            new ByteArrayInputStream("{ \"data\": []}".getBytes()));
+    when(connection.getErrorStream()).thenReturn(new ByteArrayInputStream(
+            "{ \"meta\": {}, \"data\": [], \"dictionaries\": {}}".getBytes()));
 
     response.parse(client);
 
     assertEquals(response.getStatusCode(), 400);
-    assertEquals(response.getBody(), "{ \"data\": []}");
+    assertEquals(response.getBody(), "{ \"meta\": {}, \"data\": [], \"dictionaries\": {}}");
     assertTrue(response.isParsed());
     assertNotNull(response.getResult());
     assertNotNull(response.getData());
+    assertNotNull(response.getMeta());
+    assertNotNull(response.getDictionaries());
   }
 
   @Test (expected = ServerException.class)