Merge pull request #449 from zalando/feature/chunking

Chunking is now limited to the body itself

README.md

@@ -401,14 +401,11 @@ Logbook logbook = Logbook.builder()
 
 ##### Chunking
 
-The `ChunkingHttpLogWriter` will split long messages into smaller chunks and will write them individually while delegating to another writer:
+The `ChunkingSink` will split long messages into smaller chunks and will write them individually while delegating to another sink:
 
 ```java
 Logbook logbook = Logbook.builder()
-    .sink(new DefaultSink(
-            new DefaultHttpFormatter(),
-            new ChunkingHttpLogWriter(1000, new DefaultHttpLogWriter())
-    ))
+    .sink(new ChunkingSink(sink, 1000))
     .build();
 
 ```

logbook-api/src/main/java/org/zalando/logbook/Sink.java

@@ -11,6 +11,10 @@ default boolean isActive() {
     void write(Precorrelation precorrelation, HttpRequest request) throws IOException;
     void write(Correlation correlation, HttpRequest request, HttpResponse response) throws IOException;
 
-    void writeBoth(Correlation correlation, HttpRequest request, HttpResponse response) throws IOException;
+    default void writeBoth(final Correlation correlation, final HttpRequest request, final HttpResponse response)
+            throws IOException {
+        write(correlation, request);
+        write(correlation, request, response);
+    }
 
 }

logbook-api/src/test/java/org/zalando/logbook/SinkTest.java

@@ -3,16 +3,38 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.invocation.InvocationOnMock;
 
+import java.io.IOException;
+
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 class SinkTest {
 
+    private final Correlation correlation = mock(Correlation.class);
+    private final HttpRequest request = mock(HttpRequest.class);
+    private final HttpResponse response = mock(HttpResponse.class);
+
+    private final Sink unit = mock(Sink.class);
+
     @Test
     void shouldBeActiveByDefault() {
-        final Sink unit = mock(Sink.class, InvocationOnMock::callRealMethod);
+        when(unit.isActive()).thenCallRealMethod();
 
         assertTrue(unit.isActive());
     }
 
+    @Test
+    void shouldDelegateToWriteRequestAndWriteResponseByDefault() throws IOException {
+        doCallRealMethod().when(unit).writeBoth(any(), any(), any());
+
+        unit.writeBoth(correlation, request, response);
+
+        verify(unit).write(correlation, request);
+        verify(unit).write(correlation, request, response);
+    }
+
 }

logbook-core/src/main/java/org/zalando/logbook/BodyReplacementHttpRequest.java

@@ -17,18 +17,6 @@ public HttpRequest delegate() {
         return request;
     }
 
-    @Override
-    public HttpRequest withBody() {
-        request.withoutBody();
-        return this;
-    }
-
-    @Override
-    public HttpRequest withoutBody() {
-        // TODO set replacement to empty string?!
-        return this;
-    }
-
     @Override
     public byte[] getBody() {
         return replacement.getBytes(UTF_8);

logbook-core/src/main/java/org/zalando/logbook/BodyReplacementHttpResponse.java

@@ -27,16 +27,4 @@ public String getBodyAsString() {
         return replacement;
     }
 
-    @Override
-    public HttpResponse withBody() {
-        response.withoutBody();
-        return this;
-    }
-
-    @Override
-    public HttpResponse withoutBody() {
-        // TODO set body to empty string?
-        return this;
-    }
-
 }

logbook-core/src/main/java/org/zalando/logbook/ChunkingSink.java

@@ -0,0 +1,54 @@
+package org.zalando.logbook;
+
+import org.apiguardian.api.API;
+
+import java.io.IOException;
+import java.util.stream.Stream;
+
+import static java.util.stream.StreamSupport.stream;
+import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.zalando.fauxpas.FauxPas.throwingConsumer;
+
+@API(status = EXPERIMENTAL)
+public final class ChunkingSink implements Sink {
+
+    private static final int MIN_MAX_DELTA = 16;
+
+    private final Sink delegate;
+    private final int minChunkSize;
+    private final int maxChunkSize;
+
+    public ChunkingSink(final Sink delegate, final int size) {
+        this.delegate = delegate;
+
+        if (size <= 0) {
+            throw new IllegalArgumentException("size is expected to be greater than zero");
+        }
+        this.minChunkSize = size > MIN_MAX_DELTA ? size - MIN_MAX_DELTA : size;
+        this.maxChunkSize = size;
+    }
+
+    @Override
+    public boolean isActive() {
+        return delegate.isActive();
+    }
+
+    @Override
+    public void write(final Precorrelation precorrelation, final HttpRequest original) throws IOException {
+        chunk(original)
+                .map(chunk -> new BodyReplacementHttpRequest(original, chunk))
+                .forEach(throwingConsumer(replaced -> delegate.write(precorrelation, replaced)));
+    }
+
+    @Override
+    public void write(final Correlation correlation, final HttpRequest request, final HttpResponse original) throws IOException {
+        chunk(original)
+                .map(chunk -> new BodyReplacementHttpResponse(original, chunk))
+                .forEach(throwingConsumer(replaced -> delegate.write(correlation, request, replaced)));
+    }
+
+    private Stream<String> chunk(final HttpMessage message) throws IOException {
+        return stream(new ChunkingSpliterator(message.getBodyAsString(), minChunkSize, maxChunkSize), false);
+    }
+
+}

logbook-core/src/main/java/org/zalando/logbook/DefaultSink.java

@@ -26,10 +26,4 @@ public void write(final Correlation correlation, final HttpRequest request, fina
         writer.write(correlation, formatter.format(correlation, response));
     }
 
-    @Override
-    public void writeBoth(final Correlation correlation, final HttpRequest request, final HttpResponse response) throws IOException {
-        write(correlation, request);
-        write(correlation, request, response);
-    }
-
 }

logbook-core/src/main/java/org/zalando/logbook/RequestFilters.java

@@ -26,9 +26,10 @@ public static RequestFilter defaultValue() {
     public static RequestFilter replaceBody(final BodyReplacer<HttpRequest> replacer) {
         return request -> {
             @Nullable final String replacement = replacer.replace(request);
-            return replacement == null ?
-                    request :
-                    new BodyReplacementHttpRequest(request, replacement);
+            if (replacement == null) {
+                return request;
+            }
+            return new BodyReplacementHttpRequest(request.withoutBody(), replacement);
         };
     }
 

logbook-core/src/main/java/org/zalando/logbook/ResponseFilters.java

@@ -26,9 +26,10 @@ public static ResponseFilter defaultValue() {
     public static ResponseFilter replaceBody(final BodyReplacer<HttpResponse> replacer) {
         return response -> {
             @Nullable final String replacement = replacer.replace(response);
-            return replacement == null ?
-                    response :
-                    new BodyReplacementHttpResponse(response, replacement);
+            if (replacement == null) {
+                return response;
+            }
+            return new BodyReplacementHttpResponse(response.withoutBody(), replacement);
         };
     }