Merge pull request #18267 from Alexandru-Borza/log-all-requests

Log all requests

Author: ulisseslima

logging-modules/log-all-requests/src/main/java/com/baeldung/logallrequests/ResponseWrapper.java

@@ -1,26 +1,56 @@
 package com.baeldung.logallrequests;
 
-import java.io.CharArrayWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpServletResponseWrapper;
 
 public class ResponseWrapper extends HttpServletResponseWrapper {
 
-    private final CharArrayWriter charArrayWriter = new CharArrayWriter();
-    private final PrintWriter writer = new PrintWriter(charArrayWriter);
+    private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    private final PrintWriter writer = new PrintWriter(new OutputStreamWriter(outputStream));
 
     public ResponseWrapper(HttpServletResponse response) {
         super(response);
     }
 
+    @Override
+    public ServletOutputStream getOutputStream() {
+        return new ServletOutputStream() {
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+
+            @Override
+            public void setWriteListener(WriteListener writeListener) {
+            }
+
+            @Override
+            public void write(int b) {
+                outputStream.write(b);
+            }
+        };
+    }
+
     @Override
     public PrintWriter getWriter() {
         return writer;
     }
 
+    @Override
+    public void flushBuffer() throws IOException {
+        super.flushBuffer();
+        writer.flush();
+    }
+
     public String getBodyAsString() {
-        return charArrayWriter.toString();
+        writer.flush();
+        return outputStream.toString();
     }
 }

logging-modules/log-all-requests/src/test/java/com/baeldung/logallrequests/LoggingFilterIntegrationTest.java

@@ -28,6 +28,7 @@ public void whenRequestIsHandled_thenIncomingRequestIsLogged(CapturedOutput outp
           .andReturn();
 
         assertThat(output.getAll()).contains("Incoming Request: [GET] /api/hello");
+        assertThat(output.getAll()).contains("Response Body: Hello, World!");
     }
 
     @Test