Skip to content

Commit 2742e67

Browse files
author
ennoeller
committed
Retrofit response body mapper fix
1 parent de0127c commit 2742e67

1 file changed

Lines changed: 9 additions & 14 deletions

File tree

src/main/java/ee/bitweb/core/retrofit/logging/mappers/RetrofitResponseBodyMapper.java

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ protected String sanitizeBody(String body) {
6666
private String parseBody(Response response) throws IOException {
6767
var responseBody = response.body();
6868
var contentType = responseBody.contentType();
69-
var contentLength = responseBody.contentLength();
7069
var charset = contentType != null ? contentType.charset(UTF_8) : UTF_8;
7170

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

87-
if (contentLength != 0L) {
88-
var bodyString = buffer.clone().readString(charset);
89-
var bodyStringLength = bodyString.length();
90-
91-
if (bodyStringLength > maxLoggableResponseSize) {
92-
return "%s ... Content size: %s characters".formatted(
93-
bodyString.substring(0, maxLoggableResponseSize),
94-
bodyStringLength
95-
);
96-
} else {
97-
return sanitizeBody(bodyString);
98-
}
86+
var bodyString = buffer.clone().readString(charset);
87+
var bodyStringLength = bodyString.length();
88+
89+
if (bodyStringLength > maxLoggableResponseSize) {
90+
return "%s ... Content size: %s characters".formatted(
91+
bodyString.substring(0, maxLoggableResponseSize),
92+
bodyStringLength
93+
);
9994
} else {
100-
return "";
95+
return sanitizeBody(bodyString);
10196
}
10297
}
10398
}

0 commit comments

Comments
 (0)