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

Fixes chunking of empty bodies. #846

Merged
merged 1 commit into from
Sep 29, 2020
Merged

Fixes chunking of empty bodies. #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions logbook-core/src/main/java/org/zalando/logbook/ChunkingSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ public void write(final Correlation correlation, final HttpRequest request, fina
}

private Stream<String> chunk(final HttpMessage message) throws IOException {
if (message.getBodyAsString().isEmpty()) {
return Stream.of("");
}

return stream(new ChunkingSpliterator(message.getBodyAsString(), minChunkSize, maxChunkSize), false);
}

Expand Down
11 changes: 10 additions & 1 deletion logbook-core/src/test/java/org/zalando/logbook/ChunkingSinkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,19 @@ final class ChunkingSinkTest {
private final Sink unit = new ChunkingSink(delegate, 20);

@Test
void shouldDelegateActive() {
void delegatesActive() {
assertThat(unit.isActive(), is(false));
}

@Test
void ignoresEmptyBodies() throws IOException {
final List<String> strings = captureRequest("");

assertThat(strings, contains(
allOf(startsWith("Incoming Request"))
));
}

@Test
void shouldWriteSingleRequestIfLengthNotExceeded() throws IOException {
final List<String> chunks = captureRequest("HelloWorld");
Expand Down