Merge branch 'eugenp:master' into master

Author: sIvanovKonstantyn

apache-httpclient-2/pom.xml

@@ -66,6 +66,15 @@
                     <target>11</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <mockserver.logLevel>ERROR</mockserver.logLevel>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

apache-httpclient/pom.xml

@@ -82,6 +82,16 @@
                     <target>11</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <mockserver.logLevel>ERROR</mockserver.logLevel>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
         </plugins>
         <resources>
             <resource>
@@ -92,7 +102,7 @@
     </build>
 
     <properties>
-        <mockserver.version>5.6.1</mockserver.version>
+        <mockserver.version>5.11.2</mockserver.version>
         <wiremock.version>3.9.1</wiremock.version>
         <!-- http client & core 5 -->
         <httpcore5.version>5.2.5</httpcore5.version>

apache-httpclient/src/test/java/com/baeldung/httpclient/readresponsebodystring/HttpClientUnitTest.java

@@ -2,6 +2,8 @@
 
 
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.URI;
@@ -10,6 +12,7 @@
 import java.net.http.HttpResponse;
 
 class HttpClientUnitTest {
+    private final Logger logger = LoggerFactory.getLogger(getClass());
     public static final String DUMMY_URL = "https://postman-echo.com/get";
 
     @Test
@@ -19,12 +22,12 @@ void whenUseHttpClient_thenCorrect() throws IOException, InterruptedException {
 
         // synchronous response
         HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-        System.out.println(response.body());
+        logger.debug(response.body());
 
         // asynchronous response
         client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
             .thenApply(HttpResponse::body)
-            .thenAccept(System.out::println)
+            .thenAccept(logger::debug)
             .join();
     }
 }

apache-httpclient/src/test/java/com/baeldung/httpclient/readresponsebodystring/HttpUrlConnectionUnitTest.java

@@ -2,6 +2,8 @@
 
 
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -14,7 +16,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class HttpUrlConnectionUnitTest {
-
+    private final Logger logger = LoggerFactory.getLogger(getClass());
     public static final String DUMMY_URL = "https://postman-echo.com/get";
 
     @Test
@@ -32,6 +34,6 @@ void whenUseHttpUrlConnection_thenCorrect() throws IOException, URISyntaxExcepti
 
         in.close();
         assertNotNull(response.toString());
-        System.out.println("Response -> " + response.toString());
+        logger.debug("Response -> {}", response.toString());
     }
 }

apache-httpclient/src/test/java/com/baeldung/httpclient/readresponsebodystring/SpringRestTemplateUnitTest.java

@@ -1,17 +1,19 @@
 package com.baeldung.httpclient.readresponsebodystring;
 
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.client.RestTemplate;
 
 public class SpringRestTemplateUnitTest {
-
+    private final Logger logger = LoggerFactory.getLogger(getClass());
     public static final String DUMMY_URL = "https://postman-echo.com/get";
 
     @Test
     public void whenUseRestTemplate_thenCorrect() {
         RestTemplate restTemplate = new RestTemplate();
         String response = restTemplate.getForObject(DUMMY_URL, String.class);
-        System.out.println(response);
+        logger.debug(response);
     }
 
 }

apache-httpclient/src/test/java/com/baeldung/httpclient/readresponsebodystring/SpringWebClientUnitTest.java

@@ -1,17 +1,20 @@
 package com.baeldung.httpclient.readresponsebodystring;
 
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
 public class SpringWebClientUnitTest {
+    private final Logger logger = LoggerFactory.getLogger(getClass());
     public static final String DUMMY_URL = "https://postman-echo.com/get";
 
     @Test
     void whenUseWebClientRetrieve_thenCorrect() {
         WebClient webClient = WebClient.create(DUMMY_URL);
         Mono<String> body = webClient.get().retrieve().bodyToMono(String.class);
         String s = body.block();
-        System.out.println(s);
+        logger.debug(s);
     }
 }

apache-httpclient4/pom.xml

@@ -192,6 +192,17 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <mockserver.logLevel>ERROR</mockserver.logLevel>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>

apache-httpclient4/src/test/resources/mockserver.properties

@@ -0,0 +1 @@
+mockserver.logLevel=OFF

apache-kafka-2/pom.xml

@@ -119,6 +119,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <logback.configurationFile>src/test/resources/logback.xml</logback.configurationFile>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <jna.version>5.7.0</jna.version>
         <kafka.version>3.9.0</kafka.version>

apache-kafka-2/src/test/resources/logback.xml

@@ -4,6 +4,8 @@
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
+    <logger name="org.apache.flink" level="ERROR"/>
+    <logger name="org.apache.kafka" level="ERROR"/>
 
     <root level="INFO">
         <appender-ref ref="STDOUT" />