Skip to content

Added Iterator and map responses over BatchResponse #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 24, 2019
Merged

Added Iterator and map responses over BatchResponse #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b5ea78
Added Iterator and map response over BatchResponse and update with Ba…
NakulSabharwal Apr 23, 2019
71c1f93
edited nextLink updation
NakulSabharwal Apr 23, 2019
78d94c9
Edited responses iterator
Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 63 additions & 30 deletions src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import org.json.simple.JSONArray;
Expand All @@ -18,33 +19,17 @@

public class MSBatchResponseContent {

private JSONObject batchResponseObj;
private Response batchResponse;
private Map<String, Request> batchRequestsHashMap;
private JSONArray batchResponseArray;
private String nextLink;

/*
* @param batchResponse OkHttp batch response on execution of batch requests
*/
public MSBatchResponseContent(Response batchResponse) {
if(batchResponse == null)
throw new IllegalArgumentException("Batch Response cannot be null");

this.batchRequestsHashMap = createBatchRequestsHashMap(batchResponse);
this.batchResponse = batchResponse;
if(batchResponse.body() != null) {
try {
String batchResponseData = batchResponse.body().string();
if(batchResponseData != null) {
batchResponseObj = stringToJSONObject(batchResponseData);
if(batchResponseObj != null) {
batchResponseArray = (JSONArray)batchResponseObj.get("responses");
}
}
} catch (IOException e) {
e.printStackTrace();
}
}
update(batchResponse);
}

/*
Expand All @@ -54,12 +39,9 @@ public MSBatchResponseContent(Response batchResponse) {
* @return OkHttp Response corresponding to requestId
*/
public Response getResponseById(String requestId) {
if(batchResponseObj == null)
return null;
if(batchResponseArray == null) return null;

JSONArray responses = (JSONArray)batchResponseObj.get("responses");
if(responses == null)
return null;
JSONArray responses = batchResponseArray;

for(Object response : responses) {
JSONObject jsonresponse = (JSONObject)response;
Expand Down Expand Up @@ -104,20 +86,71 @@ public Response getResponseById(String requestId) {
return null;
}

/*
* @return responses as a string
/**
* Get map of id and responses
*
* @return responses in Map of id and response
*/
public String getResponses() {
return batchResponseArray != null ? batchResponseArray.toJSONString() : null;
public Map<String, Response> getResponses() {
if(batchResponseArray == null)
return null;
Map<String, Response> responsesMap = new HashMap<>();
for(String id : batchRequestsHashMap.keySet()) {
responsesMap.put(id, getResponseById(id));
}
return responsesMap;
}

/**
* Get iterator over the responses
*
* @return iterator for responses
*/
public Iterator<Map.Entry<String, Response>> getResponsesIterator() {
Map<String, Response> responsesMap = getResponses();
return responsesMap != null ? responsesMap.entrySet().iterator() : null;
}

public void update(Response batchResponse) {
if(batchResponse == null)
throw new IllegalArgumentException("Batch Response cannot be null");

Map<String, Request> requestMap = createBatchRequestsHashMap(batchResponse);
if(batchRequestsHashMap == null)
batchRequestsHashMap = new HashMap<>();
if(requestMap != null)
batchRequestsHashMap.putAll(requestMap);

if(batchResponse.body() != null) {
try {
String batchResponseData = batchResponse.body().string();
if(batchResponseData != null) {
JSONObject batchResponseObj = stringToJSONObject(batchResponseData);
if(batchResponseObj != null) {

JSONObject nextLinkObject = (JSONObject) batchResponseObj.get("@odata.nextLink");
if(nextLinkObject!=null)
nextLink = nextLinkObject.toString();

if(batchResponseArray == null)
batchResponseArray = new JSONArray();

JSONArray responseArray = (JSONArray)batchResponseObj.get("responses");
if(responseArray!=null)
batchResponseArray.addAll(responseArray);
}
}
} catch (IOException e) {
e.printStackTrace();
}
}
}

/*
* @return nextLink of batch response
*/
public String nextLink() {
if(batchResponseObj == null) return null;
Object nextLinkObject = batchResponseObj.get("nextLink");
return nextLinkObject != null ? ((JSONObject)nextLinkObject).toString() : null;
return nextLink;
}

private Map<String, Request> createBatchRequestsHashMap(Response batchResponse) {
Expand Down
Loading