Skip to content

Retrofit response body mapper fix #44

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
ennoeller merged 3 commits into from
Apr 15, 2025
Merged

Retrofit response body mapper fix #44

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
de0127c
Retrofit response body mapper fix
Apr 14, 2025
2742e67
Retrofit response body mapper fix
Apr 14, 2025
1d047cb
Retrofit response body mapper fix
Apr 15, 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 build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
}

group 'ee.bitweb'
version '4.0.1'
version '4.0.2'
java {
sourceCompatibility = '17'
}
Expand Down
19 changes: 8 additions & 11 deletions src/main/java/ee/bitweb/core/retrofit/logging/mappers/RetrofitResponseBodyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ protected String sanitizeBody(String body) {
private String parseBody(Response response) throws IOException {
var responseBody = response.body();
var contentType = responseBody.contentType();
var contentLength = responseBody.contentLength();
var charset = contentType != null ? contentType.charset(UTF_8) : UTF_8;

var source = responseBody.source();
Expand All @@ -84,18 +83,16 @@ private String parseBody(Response response) throws IOException {
return "(binary %s-byte body omitted)".formatted(buffer.size());
}

if (contentLength != 0L) {
var bodyString = buffer.clone().readString(charset);
if (contentLength > maxLoggableResponseSize) {
return "%s ... Content size: %s characters".formatted(
bodyString.substring(0, maxLoggableResponseSize),
contentLength
);
}
var bodyString = buffer.clone().readString(charset);
var bodyStringLength = bodyString != null ? bodyString.length() : 0;

return sanitizeBody(bodyString);
if (bodyStringLength > maxLoggableResponseSize) {
return "%s ... Content size: %s characters".formatted(
bodyString.substring(0, maxLoggableResponseSize),
bodyStringLength
);
} else {
return "";
return sanitizeBody(bodyString);
}
}
}