Skip to content

Commit cbcf537

Browse files
baywetbaywet
committed
- flattens the arrow ;-)
1 parent bb2ad90 commit cbcf537

File tree

2 files changed

+89
-88
lines changed

2 files changed

+89
-88
lines changed

‎src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -164,18 +164,19 @@ private String getHeaderValuesAsString(final List<String> list) {
164164
}
165165

166166
private JsonObject requestBodyToJSONObject(final Request request) throws IOException, JsonParseException {
167-
if (request != null && request.body() != null) {
168-
final Request copy = request.newBuilder().build();
169-
final Buffer buffer = new Buffer();
170-
copy.body().writeTo(buffer);
171-
final String requestBody = buffer.readUtf8();
172-
if(requestBody != null && requestBody != "") {
173-
final JsonElement requestBodyElement = JsonParser.parseString(requestBody);
174-
if(requestBodyElement != null && requestBodyElement.isJsonObject())
175-
return requestBodyElement.getAsJsonObject();
176-
}
177-
}
178-
return null;
167+
if (request == null || request.body() == null)
168+
return null;
169+
final Request copy = request.newBuilder().build();
170+
final Buffer buffer = new Buffer();
171+
copy.body().writeTo(buffer);
172+
final String requestBody = buffer.readUtf8();
173+
if(requestBody == null || requestBody == "")
174+
return null;
175+
final JsonElement requestBodyElement = JsonParser.parseString(requestBody);
176+
if(requestBodyElement == null || !requestBodyElement.isJsonObject())
177+
return null;
178+
else
179+
return requestBodyElement.getAsJsonObject();
179180
}
180181

181182
}

‎src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -47,54 +47,54 @@ public Response getResponseById(final String requestId) {
4747
final JsonArray responses = batchResponseArray;
4848

4949
for (final JsonElement response : responses) {
50-
if(response.isJsonObject()) {
51-
final JsonObject jsonresponse = response.getAsJsonObject();
52-
final JsonElement idElement = jsonresponse.get("id");
53-
if (idElement != null && idElement.isJsonPrimitive()) {
54-
final String id = idElement.getAsString();
55-
if (id.compareTo(requestId) == 0) {
56-
final Response.Builder builder = new Response.Builder();
50+
if(!response.isJsonObject())
51+
continue;
52+
final JsonObject jsonresponse = response.getAsJsonObject();
53+
final JsonElement idElement = jsonresponse.get("id");
54+
if (idElement != null && idElement.isJsonPrimitive()) {
55+
final String id = idElement.getAsString();
56+
if (id.compareTo(requestId) == 0) {
57+
final Response.Builder builder = new Response.Builder();
5758

58-
// Put corresponding request into the constructed response
59-
builder.request(batchRequestsHashMap.get(requestId));
60-
// copy protocol and message same as of batch response
61-
builder.protocol(batchResponse.protocol());
62-
builder.message(batchResponse.message());
59+
// Put corresponding request into the constructed response
60+
builder.request(batchRequestsHashMap.get(requestId));
61+
// copy protocol and message same as of batch response
62+
builder.protocol(batchResponse.protocol());
63+
builder.message(batchResponse.message());
6364

64-
// Put status code of the corresponding request in JsonArray
65-
final JsonElement statusElement = jsonresponse.get("status");
66-
if (statusElement != null && statusElement.isJsonPrimitive()) {
67-
final Long status = statusElement.getAsLong();
68-
builder.code(status.intValue());
69-
}
65+
// Put status code of the corresponding request in JsonArray
66+
final JsonElement statusElement = jsonresponse.get("status");
67+
if (statusElement != null && statusElement.isJsonPrimitive()) {
68+
final Long status = statusElement.getAsLong();
69+
builder.code(status.intValue());
70+
}
7071

71-
// Put body from response array for corresponding id into constructing response
72-
final JsonElement jsonBodyElement = jsonresponse.get("body");
73-
if (jsonBodyElement != null && jsonBodyElement.isJsonObject()) {
74-
final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
75-
final String bodyAsString = JsonObject.toString();
76-
final ResponseBody responseBody = ResponseBody
77-
.create(MediaType.parse("application/json; charset=utf-8"), bodyAsString);
78-
builder.body(responseBody);
79-
}
72+
// Put body from response array for corresponding id into constructing response
73+
final JsonElement jsonBodyElement = jsonresponse.get("body");
74+
if (jsonBodyElement != null && jsonBodyElement.isJsonObject()) {
75+
final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
76+
final String bodyAsString = JsonObject.toString();
77+
final ResponseBody responseBody = ResponseBody
78+
.create(MediaType.parse("application/json; charset=utf-8"), bodyAsString);
79+
builder.body(responseBody);
80+
}
8081

81-
// Put headers from response array for corresponding id into constructing
82-
// response
83-
final JsonElement jsonheadersElement = jsonresponse.get("headers");
84-
if (jsonheadersElement != null && jsonheadersElement.isJsonObject()) {
85-
final JsonObject jsonheaders = jsonheadersElement.getAsJsonObject();
86-
for (final String key : jsonheaders.keySet()) {
87-
final JsonElement strValueElement = jsonheaders.get(key);
88-
if (strValueElement != null && strValueElement.isJsonPrimitive()) {
89-
final String strvalue = strValueElement.getAsString();
90-
for (final String value : strvalue.split(";")) {
91-
builder.header(key, value);
92-
}
82+
// Put headers from response array for corresponding id into constructing
83+
// response
84+
final JsonElement jsonheadersElement = jsonresponse.get("headers");
85+
if (jsonheadersElement != null && jsonheadersElement.isJsonObject()) {
86+
final JsonObject jsonheaders = jsonheadersElement.getAsJsonObject();
87+
for (final String key : jsonheaders.keySet()) {
88+
final JsonElement strValueElement = jsonheaders.get(key);
89+
if (strValueElement != null && strValueElement.isJsonPrimitive()) {
90+
final String strvalue = strValueElement.getAsString();
91+
for (final String value : strvalue.split(";")) {
92+
builder.header(key, value);
9393
}
9494
}
9595
}
96-
return builder.build();
9796
}
97+
return builder.build();
9898
}
9999
}
100100
}
@@ -180,47 +180,47 @@ private Map<String, Request> createBatchRequestsHashMap(final Response batchResp
180180
if (requestArrayElement != null && requestArrayElement.isJsonArray()) {
181181
final JsonArray requestArray = requestArrayElement.getAsJsonArray();
182182
for (final JsonElement item : requestArray) {
183-
if(item.isJsonObject()) {
184-
final JsonObject requestObject = item.getAsJsonObject();
183+
if(!item.isJsonObject())
184+
continue;
185+
final JsonObject requestObject = item.getAsJsonObject();
185186

186-
final Request.Builder builder = new Request.Builder();
187+
final Request.Builder builder = new Request.Builder();
187188

188-
final JsonElement urlElement = requestObject.get("url");
189-
if (urlElement != null && urlElement.isJsonPrimitive()) {
190-
final StringBuilder fullUrl = new StringBuilder(
191-
batchResponse.request().url().toString().replace("$batch", ""));
192-
fullUrl.append(urlElement.getAsString());
193-
builder.url(fullUrl.toString());
194-
}
195-
final JsonElement jsonHeadersElement = requestObject.get("headers");
196-
if (jsonHeadersElement != null && jsonHeadersElement.isJsonObject()) {
197-
final JsonObject jsonheaders = jsonHeadersElement.getAsJsonObject();
198-
for (final String key : jsonheaders.keySet()) {
199-
final JsonElement strvalueElement = jsonheaders.get(key);
200-
if (strvalueElement != null && strvalueElement.isJsonPrimitive()) {
201-
final String strvalue = strvalueElement.getAsString();
202-
for (final String value : strvalue.split("; ")) {
203-
builder.header(key, value);
204-
}
189+
final JsonElement urlElement = requestObject.get("url");
190+
if (urlElement != null && urlElement.isJsonPrimitive()) {
191+
final StringBuilder fullUrl = new StringBuilder(
192+
batchResponse.request().url().toString().replace("$batch", ""));
193+
fullUrl.append(urlElement.getAsString());
194+
builder.url(fullUrl.toString());
195+
}
196+
final JsonElement jsonHeadersElement = requestObject.get("headers");
197+
if (jsonHeadersElement != null && jsonHeadersElement.isJsonObject()) {
198+
final JsonObject jsonheaders = jsonHeadersElement.getAsJsonObject();
199+
for (final String key : jsonheaders.keySet()) {
200+
final JsonElement strvalueElement = jsonheaders.get(key);
201+
if (strvalueElement != null && strvalueElement.isJsonPrimitive()) {
202+
final String strvalue = strvalueElement.getAsString();
203+
for (final String value : strvalue.split("; ")) {
204+
builder.header(key, value);
205205
}
206206
}
207207
}
208-
final JsonElement jsonBodyElement = requestObject.get("body");
209-
final JsonElement jsonMethodElement = requestObject.get("method");
210-
if (jsonBodyElement != null && jsonMethodElement != null
211-
&& jsonBodyElement.isJsonObject() && jsonMethodElement.isJsonPrimitive()) {
212-
final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
213-
final String bodyAsString = JsonObject.toString();
214-
final RequestBody requestBody = RequestBody
215-
.create(MediaType.parse("application/json; charset=utf-8"), bodyAsString);
216-
builder.method(jsonMethodElement.getAsString(), requestBody);
217-
} else if (jsonMethodElement != null) {
218-
builder.method(jsonMethodElement.getAsString(), null);
219-
}
220-
final JsonElement jsonIdElement = requestObject.get("id");
221-
if (jsonIdElement != null && jsonIdElement.isJsonPrimitive()) {
222-
batchRequestsHashMap.put(jsonIdElement.getAsString(), builder.build());
223-
}
208+
}
209+
final JsonElement jsonBodyElement = requestObject.get("body");
210+
final JsonElement jsonMethodElement = requestObject.get("method");
211+
if (jsonBodyElement != null && jsonMethodElement != null
212+
&& jsonBodyElement.isJsonObject() && jsonMethodElement.isJsonPrimitive()) {
213+
final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
214+
final String bodyAsString = JsonObject.toString();
215+
final RequestBody requestBody = RequestBody
216+
.create(MediaType.parse("application/json; charset=utf-8"), bodyAsString);
217+
builder.method(jsonMethodElement.getAsString(), requestBody);
218+
} else if (jsonMethodElement != null) {
219+
builder.method(jsonMethodElement.getAsString(), null);
220+
}
221+
final JsonElement jsonIdElement = requestObject.get("id");
222+
if (jsonIdElement != null && jsonIdElement.isJsonPrimitive()) {
223+
batchRequestsHashMap.put(jsonIdElement.getAsString(), builder.build());
224224
}
225225
}
226226
}

0 commit comments

Comments
 (0)