Skip to content
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

fix: Fix Java NPE in case of null body (box/box-codegen#645) #149

Merged
merged 2 commits into from
Jan 16, 2025
Merged

fix: Fix Java NPE in case of null body (box/box-codegen#645) #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92226fd
chore: Update .codegen.json with commit hash of codegen and openapi spec
box-sdk-build Jan 16, 2025
9142549
fix: Fix Java `NPE` in case of null body (box/box-codegen#645)
box-sdk-build Jan 16, 2025
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
2 changes: 1 addition & 1 deletion .codegen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "engineHash": "b2c3124", "specHash": "0a89b2b", "version": "0.3.0" }
{ "engineHash": "458e7a8", "specHash": "0a89b2b", "version": "0.3.0" }
15 changes: 9 additions & 6 deletions src/main/java/com/box/sdkgen/box/errors/BoxAPIError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.box.sdkgen.box.errors;

import static java.lang.String.format;

import com.box.sdkgen.networking.fetchresponse.FetchResponse;
import com.fasterxml.jackson.databind.JsonNode;
import java.time.LocalDateTime;
import java.util.Optional;
import okhttp3.Request;

public class BoxAPIError extends BoxSDKError {
Expand All @@ -21,12 +21,15 @@ public BoxAPIError(String message, RequestInfo requestInfo, ResponseInfo respons
public static BoxAPIError fromAPICall(Request request, FetchResponse fetchResponse) {
RequestInfo requestInfo = RequestInfo.fromRequest(request);
ResponseInfo responseInfo = ResponseInfo.fromResponse(fetchResponse);

String requestId =
responseInfo.getBody().get("request_id") != null
? responseInfo.getBody().get("request_id").asText()
: "";
Optional.ofNullable(responseInfo.getBody())
.map(body -> body.get("request_id"))
.map(JsonNode::asText)
.orElse("");

return new BoxAPIError.BoxAPIErrorBuilder(
format("Status %d; Request ID: %s", responseInfo.getStatusCode(), requestId),
String.format("Status %d; Request ID: %s", responseInfo.getStatusCode(), requestId),
requestInfo,
responseInfo)
.timestamp(LocalDateTime.now().toString())
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/box/sdkgen/box/errors/ResponseInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ public ResponseInfo build() {

public static ResponseInfo fromResponse(FetchResponse fetchResponse) {
JsonNode body = fetchResponse.getData();
if (body == null) {
return new ResponseInfo(fetchResponse.getStatus(), fetchResponse.getHeaders());
}
String rawBody = body.asText();

return new ResponseInfo.ResponseInfoBuilder(
Expand Down