Merge pull request #210 from gustavo-bertoldi/master

Fix pagination and tests

Author: tsolakoua

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

@@ -422,9 +422,10 @@ private void write(Request request) throws IOException {
   protected Response page(String pageName, Response response) throws ResponseException {
     try {
       String[] parts = response.getResult().get("meta").getAsJsonObject()
-              .get("links").getAsJsonObject().get(pageName).getAsString().split("=");
+              .get("links").getAsJsonObject().get(pageName).getAsString()
+              .split("page%5Boffset%5D=");
 
-      String pageNumber = parts[parts.length - 1];
+      String pageNumber = parts[1].split("&")[0];
 
       Request request = response.getRequest();
       Params params = (Params) request.getParams().clone();

src/test/java/com/amadeus/HTTPClientTest.java

@@ -348,7 +348,7 @@ public class HTTPClientTest {
     Request request = mock(Request.class);
 
     JsonObject jsonObject = new JsonParser().parse("{ \"meta\": { "
-            + "\"links\" : {\"next\": \"http://foobar.com?page=10\" } } }").getAsJsonObject();
+            + "\"links\" : {\"next\": \"http://foobar.com?page%5Boffset%5D=10\" } } }").getAsJsonObject();
 
     when(response.getResult()).thenReturn(jsonObject);
     when(response.getRequest()).thenReturn(request);