JAVA-37598 | fixed implementation and test

Author: GaetanoPiazzolla

spring-boot-test-kotlin/src/test/kotlin/com/baeldung/validation/UserControllerUnitTest.kt

@@ -25,8 +25,7 @@ class UserControllerUnitTest(@Autowired val mockMvc: MockMvc) {
         ).andExpect(status().isOk)
     }
 
-    //@Test
-    //Todo: temporarily disabled it due to failure
+    @Test
     fun whenPostRequestWithInvalidUserJson_thenReturnsStatus400() {
         mockMvc.perform(
             post("/users")
@@ -60,8 +59,7 @@ class UserControllerUnitTest(@Autowired val mockMvc: MockMvc) {
         ).andExpect(status().isOk)
     }
 
-    //@Test
-    //Todo: temporarily disabled it due to failure
+    @Test
     fun whenPostRequestWithInvalidUserAddressJson_thenReturnsStatus400() {
         mockMvc.perform(
             post("/users/address")

spring-reactive-kotlin/src/main/kotlin/com/baeldung/logfilter/HttpHeadersExtension.kt

@@ -12,5 +12,5 @@ fun HttpHeaders.asString(): String {
                 entry.value
             ) + "]"
         }
-        .collect(Collectors.joining("\n"))
+        .collect(Collectors.joining(","))
 }

spring-reactive-kotlin/src/main/kotlin/com/baeldung/logfilter/decorator/LoggingRequestDecorator.kt

@@ -21,19 +21,22 @@ class LoggingRequestDecorator internal constructor(log: Logger, delegate: Server
     }
 
     init {
-        //if (log.isDebugEnabled) {
+        if (log.isDebugEnabled) {
             val path = delegate.uri.path
             val query = delegate.uri.query
             val method = Optional.ofNullable(delegate.method).orElse(HttpMethod.GET).name()
             val headers = delegate.headers.asString()
             log.debug(
-                "{} {}\n {}", method, path + (if (StringUtils.hasText(query)) "?$query" else ""), headers
+                "{} {} {}", method, path + (if (StringUtils.hasText(query)) "?$query" else ""), headers
             )
             body = super.getBody().doOnNext { buffer: DataBuffer ->
                 val bodyStream = ByteArrayOutputStream()
                 Channels.newChannel(bodyStream).write(buffer.asByteBuffer().asReadOnlyBuffer())
                 log.debug("{}: {}", "request", String(bodyStream.toByteArray()))
             }
-
+        }
+        else {
+            body = super.getBody()
+        }
     }
 }

spring-reactive-kotlin/src/main/kotlin/com/baeldung/logfilter/decorator/LoggingResponseDecorator.kt

@@ -10,17 +10,39 @@ import reactor.core.publisher.Flux
 import reactor.core.publisher.Mono
 import java.io.ByteArrayOutputStream
 import java.nio.channels.Channels
+import java.nio.charset.StandardCharsets
 
 class LoggingResponseDecorator internal constructor(val log: Logger, delegate: ServerHttpResponse) : ServerHttpResponseDecorator(delegate) {
 
     override fun writeWith(body: Publisher<out DataBuffer>): Mono<Void> {
-        return super.writeWith(Flux.from(body)
-            .doOnNext { buffer: DataBuffer ->
-                if (log.isDebugEnabled) {
-                    val bodyStream = ByteArrayOutputStream()
-                    Channels.newChannel(bodyStream).write(buffer.asByteBuffer().asReadOnlyBuffer())
-                    log.debug("{}: {} - {} : {}", "response", String(bodyStream.toByteArray()), "header", delegate.headers.asString())
-               }
-            })
+        if(!log.isDebugEnabled){
+            return super.writeWith(body);
+        }
+
+        val responseBody = StringBuilder()
+
+        return super.writeWith(
+            Flux.from(body)
+                .doOnNext { buffer: DataBuffer ->
+                        try {
+                            val bodyStream = ByteArrayOutputStream()
+                            Channels.newChannel(bodyStream).write(buffer.asByteBuffer().asReadOnlyBuffer())
+                            responseBody.append(String(bodyStream.toByteArray(), StandardCharsets.UTF_8))
+                        } catch (e: Exception) {
+                            log.error("Error while processing response body", e)
+                        }
+
+                }
+                .doOnComplete {
+                        log.debug(
+                            "{}: {} - {} : {}",
+                            "response",
+                            responseBody.toString().trim(),
+                            "header",
+                            delegate.headers.asString()
+                        )
+                }
+                .then(Mono.fromRunnable {})
+        )
     }
 }

spring-reactive-kotlin/src/main/resources/logback.xml

@@ -10,4 +10,5 @@
     <root level="INFO">
         <appender-ref ref="STDOUT" />
     </root>
+
 </configuration>

spring-reactive-kotlin/src/test/kotlin/com/baeldung/logfilter/LogFilterUnitTest.kt

@@ -25,8 +25,7 @@ open class LogFilterUnitTest {
         `when`(log.isDebugEnabled).thenReturn(true)
     }
 
-    //@Test
-    //Todo: temporarily disabled it due to failure
+    @Test
     fun whenGet_thenLogResponseBody() {
         client.get()
             .uri("/get")
@@ -35,8 +34,7 @@ open class LogFilterUnitTest {
         verify(log).debug("{}: {} - {} : {}", "response", "[1,2,3]", "header", " Content-Type: [application/json]")
     }
 
-    //@Test
-    //Todo: temporarily disabled it due to failure
+    @Test
     fun whenPost_thenLogRequestAndResponseBody() {
         client.post()
             .uri("/post")