Skip to content

Commit 7a43d3d

Browse files
committed
add if-else
1 parent fa4bd82 commit 7a43d3d

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.amadeus.exceptions.NetworkException;
66
import com.amadeus.exceptions.ResponseException;
77
import com.amadeus.resources.Resource;
8+
import com.google.gson.JsonElement;
89
import com.google.gson.JsonObject;
910
import java.io.BufferedWriter;
1011
import java.io.IOException;
@@ -420,22 +421,23 @@ private void write(Request request) throws IOException {
420421
* @hide as ony used internally
421422
*/
422423
protected Response page(String pageName, Response response) throws ResponseException {
423-
try {
424-
String[] parts = response.getResult().get("meta").getAsJsonObject()
425-
.get("links").getAsJsonObject().get(pageName).getAsString()
426-
.split("page%5Boffset%5D=");
427-
428-
String pageNumber = parts[1].split("&")[0];
429-
430-
Request request = response.getRequest();
431-
Params params = (Params) request.getParams().clone();
432-
params.put("page[offset]", pageNumber);
424+
JsonObject metaLinks = response.getResult().get("meta").getAsJsonObject().get("links").getAsJsonObject();
425+
JsonElement pageElement = metaLinks.get(pageName);
433426

434-
return request(request.getVerb(), request.getPath(), params, "emptyBody");
435-
} catch (NullPointerException e) {
427+
if (pageElement == null) {
436428
return null;
437429
}
438-
}
430+
431+
String[] parts = pageElement.getAsString().split("page%5Boffset%5D=");
432+
String pageNumber = parts[1].split("&")[0];
433+
434+
Request request = response.getRequest();
435+
Params params = (Params) request.getParams().clone();
436+
params.put("page[offset]", pageNumber);
437+
438+
return request(request.getVerb(), request.getPath(), params, "emptyBody");
439+
}
440+
439441

440442
/**
441443
* Fetches the response for another page.

0 commit comments

Comments
 (0)