Merge branch 'master' into add-assertions

Author: tsolakoua

src/main/java/com/amadeus/Amadeus.java

@@ -69,13 +69,6 @@ public class Amadeus extends HTTPClient {
    */
   public Booking booking;
 
-  /**
-   * <p>
-   * A namespaced client for the <code>/v2/media</code> endpoints.
-   * </p>
-   */
-  public Media media;
-
   /**
    * <p>
    * A namespaced client for the <code>/v1/safety</code> endpoints.
@@ -126,7 +119,6 @@ protected Amadeus(Configuration configuration) {
     this.ereputation = new EReputation(this);
     this.airport = new Airport(this);
     this.booking = new Booking(this);
-    this.media = new Media(this);
     this.safety = new Safety(this);
     this.schedule = new Schedule(this);
     this.analytics = new Analytics(this);

src/main/java/com/amadeus/DutyOfCare.java

@@ -19,8 +19,6 @@
  * @hide
  */
 public class DutyOfCare {
-  private Amadeus client;
-
   /**
    * <p>
    *   A namespaced client for the
@@ -34,7 +32,6 @@ public class DutyOfCare {
    * @hide
    */
   public DutyOfCare(Amadeus client) {
-    this.client = client;
     this.diseases = new Diseases(client);
   }
 }

src/main/java/com/amadeus/EReputation.java

@@ -3,8 +3,6 @@
 import com.amadeus.ereputation.HotelSentiments;
 
 public class EReputation {
-  private Amadeus client;
-
   /**
    * <p>
    *   A namespaced client for the
@@ -14,7 +12,6 @@ public class EReputation {
   public HotelSentiments hotelSentiments;
 
   public EReputation(Amadeus client) {
-    this.client = client;
     this.hotelSentiments = new HotelSentiments(client);
   }
 }

src/main/java/com/amadeus/HTTPClient.java

@@ -5,6 +5,7 @@
 import com.amadeus.exceptions.NetworkException;
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.Resource;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -420,23 +421,25 @@ private void write(Request request) throws IOException {
    * @hide as ony used internally
    */
   protected Response page(String pageName, Response response) throws ResponseException {
-    try {
-      String[] parts = response.getResult().get("meta").getAsJsonObject()
-              .get("links").getAsJsonObject().get(pageName).getAsString()
-              .split("page%5Boffset%5D=");
-
-      String pageNumber = parts[1].split("&")[0];
+    JsonObject metaLinks = response.getResult().get("meta")
+        .getAsJsonObject().get("links").getAsJsonObject();
+    JsonElement pageElement = metaLinks.get(pageName);
 
-      Request request = response.getRequest();
-      Params params = (Params) request.getParams().clone();
-      params.put("page[offset]", pageNumber);
-
-      return request(request.getVerb(), request.getPath(), params, "emptyBody");
-    } catch (NullPointerException e) {
+    if (pageElement == null) {
       return null;
     }
+
+    String[] parts = pageElement.getAsString().split("page%5Boffset%5D=");
+    String pageNumber = parts[1].split("&")[0];
+
+    Request request = response.getRequest();
+    Params params = (Params) request.getParams().clone();
+    params.put("page[offset]", pageNumber);
+
+    return request(request.getVerb(), request.getPath(), params, "emptyBody");
   }
 
+
   /**
    * Fetches the response for another page.
    * @hide as ony used internally

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

@@ -19,8 +19,6 @@
  * @hide
  */
 public class Location {
-  private Amadeus client;
-
   /**
    * <p>
    *   A namespaced client for the
@@ -34,7 +32,6 @@ public class Location {
    * @hide
    */
   public Location(Amadeus client) {
-    this.client = client;
     this.analytics = new Analytics(client);
   }
 }

src/main/java/com/amadeus/Media.java

@@ -4,6 +4,8 @@
 import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import lombok.NonNull;
 
 /**
@@ -64,7 +66,8 @@ protected String toQueryString() {
         query.append("=");
         query.append(URLEncoder.encode(entry.getValue(), encoding));
       } catch (UnsupportedEncodingException e) {
-        // no need to anything
+        Logger logger = Logger.getLogger(getClass().getName());
+        logger.log(Level.WARNING, "Exception while encoding the query string", e);
       }
     }
 

src/main/java/com/amadeus/Params.java

@@ -61,7 +61,7 @@ protected Response(Request request) {
   protected void parse(HTTPClient client) {
     parseStatusCode();
     if (this.statusCode != 204) {
-      parseData(client);
+      parseData();
     }
   }
 
@@ -99,10 +99,10 @@ private void parseStatusCode() {
   }
 
   // Tries to parse the data
-  private void parseData(HTTPClient client) {
+  private void parseData() {
     this.parsed = false;
     this.body = readBody();
-    this.result = parseJson(client);
+    this.result = parseJson();
     this.parsed = this.result != null;
     if (parsed && result.has("data")) {
       if (result.get("data").isJsonArray()) {
@@ -154,7 +154,7 @@ private String readBody() {
   }
 
   // Ties to parse the response body into a JSON Object
-  private JsonObject parseJson(HTTPClient client) {
+  private JsonObject parseJson() {
     if (isJson()) {
       return new JsonParser().parse(getBody()).getAsJsonObject();
     }

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

@@ -184,8 +184,6 @@ public FlightOrder post(FlightPrice flightPrice,
     JsonObject typeObject = new JsonObject();
     typeObject.addProperty("type", "flight-order");
 
-    Gson gson = new GsonBuilder().create();
-
     JsonArray flightOffersArray = buildFlightOffersJSON(flightPrice.getFlightOffers());
     typeObject.add("flightOffers", flightOffersArray);