log response body when netty passes in a ByteBuf instead of a HttpContent

logbook-netty/src/main/java/org/zalando/logbook/netty/Buffering.java

@@ -2,7 +2,6 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.handler.codec.http.HttpContent;
 import io.netty.handler.codec.http.HttpMessage;
 
 final class Buffering implements State {
@@ -19,12 +18,11 @@ public State without() {
     }
 
     @Override
-    public State buffer(final HttpMessage message, final HttpContent content) {
-        final ByteBuf source = content.content();
-        final int index = source.readerIndex();
-        buffer.ensureWritable(source.readableBytes());
-        source.readBytes(buffer, source.readableBytes());
-        source.readerIndex(index);
+    public State buffer(final HttpMessage message, final ByteBuf content) {
+        final int index = content.readerIndex();
+        buffer.ensureWritable(content.readableBytes());
+        content.readBytes(buffer, content.readableBytes());
+        content.readerIndex(index);
         return this;
     }
 

logbook-netty/src/main/java/org/zalando/logbook/netty/Ignoring.java

@@ -1,6 +1,6 @@
 package org.zalando.logbook.netty;
 
-import io.netty.handler.codec.http.HttpContent;
+import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.http.HttpMessage;
 import lombok.AllArgsConstructor;
 
@@ -15,7 +15,7 @@ public State with() {
     }
 
     @Override
-    public State buffer(final HttpMessage message, final HttpContent content) {
+    public State buffer(final HttpMessage message, final ByteBuf content) {
         buffering.buffer(message, content);
         return this;
     }

logbook-netty/src/main/java/org/zalando/logbook/netty/LogbookClientHandler.java

@@ -1,18 +1,17 @@
 package org.zalando.logbook.netty;
 
+import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
 import io.netty.handler.codec.http.HttpContent;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.LastHttpContent;
+import javax.annotation.concurrent.NotThreadSafe;
 import lombok.RequiredArgsConstructor;
 import org.apiguardian.api.API;
 import org.zalando.logbook.Logbook;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.zalando.fauxpas.FauxPas.throwingRunnable;
 import static org.zalando.logbook.Logbook.RequestWritingStage;
@@ -46,7 +45,8 @@ public void write(
             this.requestStage = logbook.process(request);
         });
 
-        runIf(message, HttpContent.class, request::buffer);
+        runIf(message, HttpContent.class, content -> request.buffer(content.content()));
+        runIf(message, ByteBuf.class, request::buffer);
 
         runIf(message, LastHttpContent.class, content ->
                 sequence.set(0, throwingRunnable(requestStage::write)));
@@ -64,7 +64,8 @@ public void channelRead(
             this.responseStage = requestStage.process(response);
         });
 
-        runIf(message, HttpContent.class, response::buffer);
+        runIf(message, HttpContent.class, content -> response.buffer(content.content()));
+        runIf(message, ByteBuf.class, response::buffer);
 
         runIf(message, LastHttpContent.class, content ->
                 sequence.set(1, throwingRunnable(responseStage::write)));

logbook-netty/src/main/java/org/zalando/logbook/netty/LogbookServerHandler.java

@@ -1,5 +1,6 @@
 package org.zalando.logbook.netty;
 
+import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
@@ -45,7 +46,8 @@ public void channelRead(
             this.requestStage = logbook.process(request);
         });
 
-        runIf(message, HttpContent.class, request::buffer);
+        runIf(message, HttpContent.class, content -> request.buffer(content.content()));
+        runIf(message, ByteBuf.class, request::buffer);
 
         runIf(message, LastHttpContent.class, content ->
                 sequence.set(0, throwingRunnable(requestStage::write)));
@@ -64,7 +66,10 @@ public void write(
             this.responseStage = requestStage.process(response);
         });
 
-        runIf(message, HttpContent.class, response::buffer);
+        runIf(message, HttpContent.class, content -> request.buffer(content.content()));
+
+        runIf(message, HttpContent.class, content -> response.buffer(content.content()));
+        runIf(message, ByteBuf.class, response::buffer);
 
         runIf(message, LastHttpContent.class, content ->
                 sequence.set(1, throwingRunnable(responseStage::write)));

logbook-netty/src/main/java/org/zalando/logbook/netty/Offering.java

@@ -1,10 +1,9 @@
 package org.zalando.logbook.netty;
 
-import io.netty.handler.codec.http.HttpContent;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.HttpMessage;
-
 import static io.netty.handler.codec.http.HttpUtil.getContentLength;
-import static io.netty.handler.codec.http.LastHttpContent.EMPTY_LAST_CONTENT;
 
 final class Offering implements State {
 
@@ -14,8 +13,8 @@ public State without() {
     }
 
     @Override
-    public State buffer(final HttpMessage message, final HttpContent content) {
-        if (content.equals(EMPTY_LAST_CONTENT)) {
+    public State buffer(final HttpMessage message, final ByteBuf content) {
+        if (content.equals(Unpooled.EMPTY_BUFFER)) {
             // saves us from allocating an unnecessary buffer
             return this;
         }

logbook-netty/src/main/java/org/zalando/logbook/netty/Request.java

@@ -1,19 +1,17 @@
 package org.zalando.logbook.netty;
 
+import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.HttpContent;
 import io.netty.handler.codec.http.HttpRequest;
-import lombok.AllArgsConstructor;
-import org.zalando.logbook.HttpHeaders;
-import org.zalando.logbook.Origin;
-
-import javax.annotation.Nullable;
 import java.net.URI;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
-
+import javax.annotation.Nullable;
+import lombok.AllArgsConstructor;
+import org.zalando.logbook.HttpHeaders;
+import org.zalando.logbook.Origin;
 import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
 import static io.netty.handler.codec.http.HttpHeaderNames.HOST;
 import static lombok.AccessLevel.PRIVATE;
@@ -112,7 +110,7 @@ public org.zalando.logbook.HttpRequest withoutBody() {
         return this;
     }
 
-    void buffer(final HttpContent content) {
+    void buffer(final ByteBuf content) {
         state.updateAndGet(state -> state.buffer(request, content));
     }
 

logbook-netty/src/main/java/org/zalando/logbook/netty/Response.java

@@ -1,16 +1,14 @@
 package org.zalando.logbook.netty;
 
-import io.netty.handler.codec.http.HttpContent;
+import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.http.HttpResponse;
-import lombok.AllArgsConstructor;
-import org.zalando.logbook.HttpHeaders;
-import org.zalando.logbook.Origin;
-
-import javax.annotation.Nullable;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.atomic.AtomicReference;
-
+import javax.annotation.Nullable;
+import lombok.AllArgsConstructor;
+import org.zalando.logbook.HttpHeaders;
+import org.zalando.logbook.Origin;
 import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
 
 @AllArgsConstructor
@@ -67,7 +65,7 @@ public org.zalando.logbook.HttpResponse withoutBody() {
         return this;
     }
 
-    void buffer(final HttpContent content) {
+    void buffer(final ByteBuf content) {
         state.updateAndGet(state -> state.buffer(response, content));
     }
 

logbook-netty/src/main/java/org/zalando/logbook/netty/State.java

@@ -1,6 +1,6 @@
 package org.zalando.logbook.netty;
 
-import io.netty.handler.codec.http.HttpContent;
+import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.http.HttpMessage;
 
 interface State {
@@ -14,7 +14,7 @@ default State without() {
     }
 
     default State buffer(
-            final HttpMessage message, final HttpContent content) {
+            final HttpMessage message, final ByteBuf content) {
         return this;
     }
 

logbook-netty/src/test/java/org/zalando/logbook/netty/IgnoringTest.java

@@ -1,13 +1,11 @@
 package org.zalando.logbook.netty;
 
-import io.netty.handler.codec.http.DefaultHttpContent;
+import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.http.DefaultHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
+import java.util.concurrent.atomic.AtomicReference;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.atomic.AtomicReference;
-
 import static io.netty.buffer.Unpooled.wrappedBuffer;
 import static io.netty.handler.codec.http.HttpMethod.GET;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
@@ -34,8 +32,8 @@ void shouldKeepBufferingWhenIgnoring() {
         Assertions.assertEquals("foobar", body);
     }
 
-    private DefaultHttpContent content(final String s) {
-        return new DefaultHttpContent(wrappedBuffer(s.getBytes(UTF_8)));
+    private ByteBuf content(final String s) {
+        return wrappedBuffer(s.getBytes(UTF_8));
     }
 
 }