update salary type

.gitignore

@@ -70,7 +70,6 @@ jmeter/src/main/resources/*-JMeter*.csv
 jmeter/src/main/resources/*ReportsDashboard*.csv
 jmeter/src/main/resources/dashboard/*ReportsDashboard*.csv
 jmeter/src/main/resources/*FileExtractionExample.csv
-jmeter/src/main/resources/*_Summary-Report.csv
 
 ninja/devDb.mv.db
 
@@ -121,10 +120,4 @@ libraries-2/src/test/resources/crawler4j/**
 devDb*.db
 
 #jaxb
-*.xjb
-
-#neo4j
-persistence-modules/neo4j/data/**
-/deep-shallow-copy/.mvn/wrapper
-/deep-shallow-copy/mvnw
-/deep-shallow-copy/mvnw.cmd
+*.xjb

algorithms-modules/algorithms-miscellaneous-3/README.md

@@ -8,8 +8,9 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
 - [Java Two Pointer Technique](https://www.baeldung.com/java-two-pointer-technique)
 - [Implementing Simple State Machines with Java Enums](https://www.baeldung.com/java-enum-simple-state-machine)
 - [Converting Between Roman and Arabic Numerals in Java](https://www.baeldung.com/java-convert-roman-arabic)
+- [Practical Java Examples of the Big O Notation](https://www.baeldung.com/java-algorithm-complexity)
 - [Checking If a List Is Sorted in Java](https://www.baeldung.com/java-check-if-list-sorted)
-- [Checking if a Java Graph Has a Cycle](https://www.baeldung.com/java-graph-has-a-cycle)
+- [Checking if a Java Graph has a Cycle](https://www.baeldung.com/java-graph-has-a-cycle)
 - [A Guide to the Folding Technique in Java](https://www.baeldung.com/folding-hashing-technique)
 - [Creating a Triangle with for Loops in Java](https://www.baeldung.com/java-print-triangle)
 - [The K-Means Clustering Algorithm in Java](https://www.baeldung.com/java-k-means-clustering-algorithm)

algorithms-modules/algorithms-miscellaneous-4/README.md

@@ -5,10 +5,10 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
 ### Relevant articles:
 
 - [Multi-Swarm Optimization Algorithm in Java](https://www.baeldung.com/java-multi-swarm-algorithm)
-- [Check if a String Contains All the Letters of the Alphabet With Java](https://www.baeldung.com/java-string-contains-all-letters)
+- [Check If a String Contains All The Letters of The Alphabet with Java](https://www.baeldung.com/java-string-contains-all-letters)
 - [Find the Middle Element of a Linked List in Java](https://www.baeldung.com/java-linked-list-middle-element)
 - [Find Substrings That Are Palindromes in Java](https://www.baeldung.com/java-palindrome-substrings)
-- [Find the Longest Substring Without Repeating Characters](https://www.baeldung.com/java-longest-substring-without-repeated-characters)
+- [Find the Longest Substring without Repeating Characters](https://www.baeldung.com/java-longest-substring-without-repeated-characters)
 - [Permutations of an Array in Java](https://www.baeldung.com/java-array-permutations)
 - [Find the Smallest Missing Integer in an Array](https://www.baeldung.com/java-smallest-missing-integer-in-array)
 - [Permutations of a String in Java](https://www.baeldung.com/java-string-permutations)

algorithms-modules/algorithms-miscellaneous-5/README.md

@@ -9,7 +9,7 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
 - [Reversing a Binary Tree in Java](https://www.baeldung.com/java-reversing-a-binary-tree)
 - [Find If Two Numbers Are Relatively Prime in Java](https://www.baeldung.com/java-two-relatively-prime-numbers)
 - [Knapsack Problem Implementation in Java](https://www.baeldung.com/java-knapsack)
-- [How to Determine if a Binary Tree Is Balanced in Java](https://www.baeldung.com/java-balanced-binary-tree)
+- [How to Determine if a Binary Tree is Balanced in Java](https://www.baeldung.com/java-balanced-binary-tree)
 - [Overview of Combinatorial Problems in Java](https://www.baeldung.com/java-combinatorial-algorithms)
 - [Prim’s Algorithm with a Java Implementation](https://www.baeldung.com/java-prim-algorithm)
 - [Maximum Subarray Problem in Java](https://www.baeldung.com/java-maximum-subarray)

algorithms-modules/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithm.java

@@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory;
 
 public class KadaneAlgorithm {
 
-    private Logger logger = LoggerFactory.getLogger(KadaneAlgorithm.class.getName());
+    private Logger logger = LoggerFactory.getLogger(BruteForceAlgorithm.class.getName());
 
     public int maxSubArraySum(int[] arr) {
 
@@ -14,15 +14,15 @@ public class KadaneAlgorithm {
         int end = 0;
 
         int maxSoFar = arr[0], maxEndingHere = arr[0];
-
         for (int i = 1; i < size; i++) {
-            maxEndingHere = maxEndingHere + arr[i];
-            if (arr[i] > maxEndingHere) {
+
+            if (arr[i] > maxEndingHere + arr[i]) {
+                start = i;
                 maxEndingHere = arr[i];
-                if (maxSoFar < maxEndingHere) {
-                    start = i;
-                }
+            } else {
+                maxEndingHere = maxEndingHere + arr[i];
             }
+
             if (maxSoFar < maxEndingHere) {
                 maxSoFar = maxEndingHere;
                 end = i;

algorithms-modules/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/maximumsubarray/KadaneAlgorithmUnitTest.java

@@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 class KadaneAlgorithmUnitTest {
 
     @Test
-    void givenArrayWithNegativeNumberWhenMaximumSubarrayThenReturnsExpectedResult() {
+    void givenArrayWithNegativeNumberWhenMaximumSubarrayThenReturns6() {
         //given
         int[] arr = new int[] { -3, 1, -8, 4, -1, 2, 1, -5, 5 };
         //when
@@ -27,7 +27,7 @@ class KadaneAlgorithmUnitTest {
         //then
         assertEquals(-1, maxSum);
     }
-
+    
     @Test
     void givenArrayWithAllPosiitveNumbersWhenMaximumSubarrayThenReturnsExpectedResult() {
         //given
@@ -39,15 +39,4 @@ class KadaneAlgorithmUnitTest {
         assertEquals(10, maxSum);
     }
 
-    @Test
-    void givenArrayToTestStartIndexWhenMaximumSubarrayThenReturnsExpectedResult() {
-        //given
-        int[] arr = new int[] { 1, 2, -1, 3, -6, -2 };
-        //when
-        KadaneAlgorithm algorithm = new KadaneAlgorithm();
-        int maxSum = algorithm.maxSubArraySum(arr);
-        //then
-        assertEquals(5, maxSum);
-    }
-
 }

algorithms-modules/algorithms-miscellaneous-7/README.md

@@ -3,5 +3,4 @@
 - [Algorithm to Identify and Validate a Credit Card Number](https://www.baeldung.com/java-validate-cc-number)
 - [Find the N Most Frequent Elements in a Java Array](https://www.baeldung.com/java-n-most-frequent-elements-array)
 - [Getting Pixel Array From Image in Java](https://www.baeldung.com/java-getting-pixel-array-from-image)
-- [Calculate Distance Between Two Coordinates in Java](https://www.baeldung.com/java-find-distance-between-points)
 - More articles: [[<-- prev]](/algorithms-miscellaneous-6)

algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/latlondistance/EquirectangularApproximation.java

@@ -1,19 +0,0 @@
-package com.baeldung.algorithms.latlondistance;
-
-public class EquirectangularApproximation {
-
-    private static final int EARTH_RADIUS = 6371; // Approx Earth radius in KM
-
-    public static double calculateDistance(double lat1, double lon1, double lat2, double lon2) {
-        double lat1Rad = Math.toRadians(lat1);
-        double lat2Rad = Math.toRadians(lat2);
-        double lon1Rad = Math.toRadians(lon1);
-        double lon2Rad = Math.toRadians(lon2);
-
-        double x = (lon2Rad - lon1Rad) * Math.cos((lat1Rad + lat2Rad) / 2);
-        double y = (lat2Rad - lat1Rad);
-        double distance = Math.sqrt(x * x + y * y) * EARTH_RADIUS;
-
-        return distance;
-    }
-}

algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/latlondistance/HaversineDistance.java

@@ -1,24 +0,0 @@
-package com.baeldung.algorithms.latlondistance;
-
-public class HaversineDistance {
-    private static final int EARTH_RADIUS = 6371; // Approx Earth radius in KM
-
-    public static double calculateDistance(double startLat, double startLong,
-                                           double endLat, double endLong) {
-
-        double dLat = Math.toRadians((endLat - startLat));
-        double dLong = Math.toRadians((endLong - startLong));
-
-        startLat = Math.toRadians(startLat);
-        endLat = Math.toRadians(endLat);
-
-        double a = haversine(dLat) + Math.cos(startLat) * Math.cos(endLat) * haversine(dLong);
-        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-
-        return EARTH_RADIUS * c;
-    }
-
-    public static double haversine(double val) {
-        return Math.pow(Math.sin(val / 2), 2);
-    }
-}

algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/latlondistance/VincentyDistance.java

@@ -1,53 +0,0 @@
-package com.baeldung.algorithms.latlondistance;
-
-public class VincentyDistance {
-
-    // Constants for WGS84 ellipsoid model of Earth
-    private static final double SEMI_MAJOR_AXIS_MT = 6378137;
-    private static final double SEMI_MINOR_AXIS_MT = 6356752.314245;
-    private static final double FLATTENING = 1 / 298.257223563;
-    private static final double ERROR_TOLERANCE = 1e-12;
-
-    public static double calculateDistance(double latitude1, double longitude1, double latitude2, double longitude2) {
-        double U1 = Math.atan((1 - FLATTENING) * Math.tan(Math.toRadians(latitude1)));
-        double U2 = Math.atan((1 - FLATTENING) * Math.tan(Math.toRadians(latitude2)));
-
-        double sinU1 = Math.sin(U1);
-        double cosU1 = Math.cos(U1);
-        double sinU2 = Math.sin(U2);
-        double cosU2 = Math.cos(U2);
-
-        double longitudeDifference = Math.toRadians(longitude2 - longitude1);
-        double previousLongitudeDifference;
-
-        double sinSigma, cosSigma, sigma, sinAlpha, cosSqAlpha, cos2SigmaM;
-
-        do {
-            sinSigma = Math.sqrt(Math.pow(cosU2 * Math.sin(longitudeDifference), 2) +
-                    Math.pow(cosU1 * sinU2 - sinU1 * cosU2 * Math.cos(longitudeDifference), 2));
-            cosSigma = sinU1 * sinU2 + cosU1 * cosU2 * Math.cos(longitudeDifference);
-            sigma = Math.atan2(sinSigma, cosSigma);
-            sinAlpha = cosU1 * cosU2 * Math.sin(longitudeDifference) / sinSigma;
-            cosSqAlpha = 1 - Math.pow(sinAlpha, 2);
-            cos2SigmaM = cosSigma - 2 * sinU1 * sinU2 / cosSqAlpha;
-            if (Double.isNaN(cos2SigmaM)) {
-                cos2SigmaM = 0;
-            }
-            previousLongitudeDifference = longitudeDifference;
-            double C = FLATTENING / 16 * cosSqAlpha * (4 + FLATTENING * (4 - 3 * cosSqAlpha));
-            longitudeDifference = Math.toRadians(longitude2 - longitude1) + (1 - C) * FLATTENING * sinAlpha *
-                    (sigma + C * sinSigma * (cos2SigmaM + C * cosSigma * (-1 + 2 * Math.pow(cos2SigmaM, 2))));
-        } while (Math.abs(longitudeDifference - previousLongitudeDifference) > ERROR_TOLERANCE);
-
-        double uSq = cosSqAlpha * (Math.pow(SEMI_MAJOR_AXIS_MT, 2) - Math.pow(SEMI_MINOR_AXIS_MT, 2)) / Math.pow(SEMI_MINOR_AXIS_MT, 2);
-
-        double A = 1 + uSq / 16384 * (4096 + uSq * (-768 + uSq * (320 - 175 * uSq)));
-        double B = uSq / 1024 * (256 + uSq * (-128 + uSq * (74 - 47 * uSq)));
-
-        double deltaSigma = B * sinSigma * (cos2SigmaM + B / 4 * (cosSigma * (-1 + 2 * Math.pow(cos2SigmaM, 2)) -
-                B / 6 * cos2SigmaM * (-3 + 4 * Math.pow(sinSigma, 2)) * (-3 + 4 * Math.pow(cos2SigmaM, 2))));
-
-        double distanceMt = SEMI_MINOR_AXIS_MT * A * (sigma - deltaSigma);
-        return distanceMt / 1000;
-    }
-}

algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/latlondistance/GeoDistanceUnitTest.java

@@ -1,26 +0,0 @@
-package com.baeldung.algorithms.latlondistance;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class GeoDistanceUnitTest {
-    @Test
-    public void testCalculateDistance() {
-        double lat1 = 40.714268; // New York
-        double lon1 = -74.005974;
-        double lat2 = 34.0522; // Los Angeles
-        double lon2 = -118.2437;
-
-        double equirectangularDistance = EquirectangularApproximation.calculateDistance(lat1, lon1, lat2, lon2);
-        double haversineDistance = HaversineDistance.calculateDistance(lat1, lon1, lat2, lon2);
-        double vincentyDistance = VincentyDistance.calculateDistance(lat1, lon1, lat2, lon2);
-
-        double expectedDistance = 3944;
-        assertTrue(Math.abs(equirectangularDistance - expectedDistance) < 100);
-        assertTrue(Math.abs(haversineDistance - expectedDistance) < 10);
-        assertTrue(Math.abs(vincentyDistance - expectedDistance) < 0.5);
-
-    }
-
-}

algorithms-modules/algorithms-searching/src/main/java/com/baeldung/algorithms/dfs/Graph.java

@@ -23,7 +23,7 @@ public class Graph {
         adjVertices.get(src).add(dest);
     }
 
-    public boolean[] dfsWithoutRecursion(int start) {
+    public void dfsWithoutRecursion(int start) {
         Stack<Integer> stack = new Stack<Integer>();
         boolean[] isVisited = new boolean[adjVertices.size()];
         stack.push(start);
@@ -38,22 +38,20 @@ public class Graph {
                 }
             }
         }
-        return isVisited;
     }
 
-    public boolean[] dfs(int start) {
+    public void dfs(int start) {
         boolean[] isVisited = new boolean[adjVertices.size()];
-        return dfsRecursive(start, isVisited);
+        dfsRecursive(start, isVisited);
     }
 
-    private boolean[] dfsRecursive(int current, boolean[] isVisited) {
+    private void dfsRecursive(int current, boolean[] isVisited) {
         isVisited[current] = true;
         visit(current);
         for (int dest : adjVertices.get(current)) {
             if (!isVisited[dest])
                 dfsRecursive(dest, isVisited);
         }
-        return isVisited;
     }
 
     public List<Integer> topologicalSort(int start) {

algorithms-modules/algorithms-searching/src/test/java/com/baeldung/algorithms/dfs/GraphUnitTest.java

@@ -1,9 +1,7 @@
 package com.baeldung.algorithms.dfs;
 
-import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 
 class GraphUnitTest {
@@ -11,12 +9,9 @@ class GraphUnitTest {
     @Test
     void givenDirectedGraph_whenDFS_thenPrintAllValues() {
         Graph graph = createDirectedGraph();
-        boolean[] visited;
-        visited = graph.dfs(0);
-        boolean[] expected = new boolean[]{true, true, true, true, true, true};
-        Assert.assertArrayEquals(expected, visited);
-        visited = graph.dfsWithoutRecursion(0);
-        Assert.assertArrayEquals(expected, visited);
+        graph.dfs(0);
+        System.out.println();
+        graph.dfsWithoutRecursion(0);
     }
 
     @Test
@@ -24,8 +19,6 @@ class GraphUnitTest {
         Graph graph = createDirectedGraph();
         List<Integer> list = graph.topologicalSort(0);
         System.out.println(list);
-        List<Integer> expected = Arrays.asList(0, 2, 1, 3, 4, 5);
-        Assert.assertEquals(expected, list);
     }
 
     private Graph createDirectedGraph() {

apache-cxf-modules/cxf-spring/pom.xml

@@ -43,19 +43,19 @@
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-ri</artifactId>
-            <version>${jaxws-ri.version}</version>
+            <version>2.3.3</version>
             <type>pom</type>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
+            <version>4.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <version>${jstl.version}</version>
+            <version>1.2</version>
         </dependency>
     </dependencies>
 
@@ -117,9 +117,7 @@
     <properties>
         <spring.version>5.3.25</spring.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
-        <jstl.version>1.2</jstl.version>
-        <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
-        <jaxws-ri.version>2.3.3</jaxws-ri.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>

apache-cxf-modules/sse-jaxrs/README.md

@@ -1,3 +1,3 @@
 ### Relevant Articles:
 
-- [Server-Sent Events (SSE) in JAX-RS](https://www.baeldung.com/java-ee-jax-rs-sse)
+- [Server-Sent Events (SSE) In JAX-RS](https://www.baeldung.com/java-ee-jax-rs-sse)

apache-httpclient-2/README.md

@@ -13,4 +13,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [How To Get Cookies From the Apache HttpClient Response](https://www.baeldung.com/java-apache-httpclient-cookies)
 - [Enabling Logging for Apache HttpClient](https://www.baeldung.com/apache-httpclient-enable-logging)
 - [Apache HttpClient vs. CloseableHttpClient](https://www.baeldung.com/apache-httpclient-vs-closeablehttpclient)
+- [Expand Shortened URLs with Apache HttpClient](https://www.baeldung.com/apache-httpclient-expand-url)
 - More articles: [[<-- prev]](../apache-httpclient)

apache-httpclient-2/src/main/java/com/baeldung/tlsversion/ClientTlsVersionExamples.java

@@ -1,43 +1,36 @@
 package com.baeldung.tlsversion;
 
-import java.io.IOException;
-
 import javax.net.ssl.SSLSocket;
 
-import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.config.TlsConfig;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
-import org.apache.hc.client5.http.io.HttpClientConnectionManager;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
-import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.io.entity.EntityUtils;
-import org.apache.hc.core5.http.ssl.TLS;
-import org.apache.hc.core5.ssl.SSLContexts;
-import org.apache.hc.core5.util.Timeout;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContexts;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
 
 public class ClientTlsVersionExamples {
-    public static CloseableHttpClient setViaSocketFactory() {
-        final HttpClientConnectionManager cm = PoolingHttpClientConnectionManagerBuilder.create()
-            .setDefaultTlsConfig(TlsConfig.custom()
-                .setHandshakeTimeout(Timeout.ofSeconds(30))
-                .setSupportedProtocols(TLS.V_1_2, TLS.V_1_3)
-                .build())
-            .build();
 
-        return HttpClients.custom()
-            .setConnectionManager(cm)
-            .build();
+    public static CloseableHttpClient setViaSocketFactory() {
+        SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
+          SSLContexts.createDefault(),
+          new String[] { "TLSv1.2", "TLSv1.3" },
+          null,
+          SSLConnectionSocketFactory.getDefaultHostnameVerifier());
+
+        return HttpClients.custom().setSSLSocketFactory(sslsf).build();
     }
 
     public static CloseableHttpClient setTlsVersionPerConnection() {
         SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(SSLContexts.createDefault()) {
+
             @Override
             protected void prepareSocket(SSLSocket socket) {
-                String hostname = socket.getInetAddress()
-                    .getHostName();
+                String hostname = socket.getInetAddress().getHostName();
                 if (hostname.endsWith("internal.system.com")) {
                     socket.setEnabledProtocols(new String[] { "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" });
                 } else {
@@ -46,14 +39,7 @@ public class ClientTlsVersionExamples {
             }
         };
 
-        HttpClientConnectionManager connManager = PoolingHttpClientConnectionManagerBuilder.create()
-            .setSSLSocketFactory(sslsf)
-            .build();
-
-        return HttpClients.custom()
-            .setConnectionManager(connManager)
-            .build();
-
+        return HttpClients.custom().setSSLSocketFactory(sslsf).build();
     }
 
     // To configure the TLS versions for the client, set the https.protocols system property during runtime.
@@ -61,11 +47,15 @@ public class ClientTlsVersionExamples {
     public static CloseableHttpClient setViaSystemProperties() {
         return HttpClients.createSystem();
         // Alternatively:
-        //return HttpClients.custom().useSystemProperties().build();
+        // return HttpClients.custom().useSystemProperties().build();
     }
 
     public static void main(String[] args) throws IOException {
-        try (CloseableHttpClient httpClient = setViaSocketFactory(); CloseableHttpResponse response = httpClient.execute(new HttpGet("https://httpbin.org/"))) {
+        // Alternatively:
+        // CloseableHttpClient httpClient = setTlsVersionPerConnection();
+        // CloseableHttpClient httpClient = setViaSystemProperties();
+        try (CloseableHttpClient httpClient = setViaSocketFactory();
+           CloseableHttpResponse response = httpClient.execute(new HttpGet("https://httpbin.org/"))) {
 
             HttpEntity entity = response.getEntity();
             EntityUtils.consume(entity);

apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ClientUtil.java

@@ -1,18 +0,0 @@
-package com.baeldung.httpclient.httpclient;
-
-import java.io.IOException;
-
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-
-public final class ClientUtil {
-
-    private ClientUtil(){}
-
-    public static void closeClient(CloseableHttpClient client) throws IOException {
-        if (client == null) {
-            return;
-        }
-
-        client.close();
-    }
-}

apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/HttpClientCookBookLiveTest.java

@@ -1,211 +0,0 @@
-package com.baeldung.httpclient.httpclient;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.emptyArray;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import org.apache.hc.client5.http.classic.methods.HttpPost;
-import org.apache.hc.client5.http.config.ConnectionConfig;
-import org.apache.hc.client5.http.config.RequestConfig;
-import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
-import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager;
-import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.io.entity.EntityUtils;
-import org.apache.hc.core5.http.message.BasicNameValuePair;
-import org.apache.hc.core5.util.Timeout;
-
-import java.io.IOException;
-import java.net.SocketTimeoutException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-class HttpClientCookBookLiveTest {
-
-    private static final String SAMPLE_GET_URL = "http://www.google.com";
-    private static final String SAMPLE_POST_URL = "http://www.github.com";
-
-    private CloseableHttpClient httpClient;
-
-    private CloseableHttpResponse response;
-
-    @BeforeEach
-    public final void before() {
-        httpClient = HttpClientBuilder.create().build();
-    }
-
-    @AfterEach
-    public final void after() throws IOException {
-       ClientUtil.closeClient(httpClient);
-    }
-
-    @Test
-    void givenGetRequestExecuted_thenCorrectStatusCode() throws IOException {
-        HttpGet httpGet = new HttpGet(SAMPLE_GET_URL);
-        httpClient.execute(httpGet,
-            response -> {
-                assertThat(response.getCode()).isEqualTo(200);
-                return response;
-            }
-        );
-    }
-
-    @Test
-    void givenGetRequestExecuted_thenCorrectContentMimeType() throws IOException {
-        HttpGet httpGet = new HttpGet(SAMPLE_GET_URL);
-        httpClient.execute(httpGet,
-            response -> {
-                final String contentMimeType = ContentType.parse(response.getEntity().getContentType()).getMimeType();
-                assertThat(contentMimeType).isEqualTo(ContentType.TEXT_HTML.getMimeType());
-                return response;
-            }
-        );
-    }
-
-    @Test
-    void  givenGetRequestExecuted_thenCorrectResponse() throws IOException {
-        HttpGet httpGet = new HttpGet(SAMPLE_GET_URL);
-        httpClient.execute(httpGet,
-            response -> {
-                String bodyAsString = EntityUtils.toString(response.getEntity());
-                assertThat(bodyAsString, notNullValue());
-                return response;
-            }
-        );
-    }
-
-    @Test
-    void whenConfigureTimeoutOnRequest_thenCorrectResponse() throws IOException {
-        RequestConfig requestConfig = RequestConfig.custom()
-            .setConnectionRequestTimeout(Timeout.ofMilliseconds(2000L))
-            .build();
-
-        CloseableHttpClient httpClient = HttpClientBuilder.create()
-            .setDefaultRequestConfig(requestConfig)
-            .build();
-
-        HttpGet request = new HttpGet(SAMPLE_GET_URL);
-        request.setConfig(requestConfig);
-
-        httpClient.execute(request,
-            response -> {
-                assertThat(response.getCode()).isEqualTo(200);
-                return response;
-            }
-        );
-    }
-
-    @Test
-    void givenLowSocketTimeOut_whenExecutingRequestWithTimeout_thenException() throws IOException {
-        ConnectionConfig connConfig = ConnectionConfig.custom()
-            .setConnectTimeout(1000, TimeUnit.MILLISECONDS)
-            .setSocketTimeout(20, TimeUnit.MILLISECONDS)
-            .build();
-
-        RequestConfig requestConfig = RequestConfig.custom()
-            .setConnectionRequestTimeout(Timeout.ofMilliseconds(2000L))
-            .build();
-
-        BasicHttpClientConnectionManager cm = new BasicHttpClientConnectionManager();
-        cm.setConnectionConfig(connConfig);
-
-        CloseableHttpClient httpClient = HttpClientBuilder.create()
-            .setDefaultRequestConfig(requestConfig)
-            .setConnectionManager(cm)
-            .build();
-
-        HttpGet request = new HttpGet(SAMPLE_GET_URL);
-
-        assertThrows(SocketTimeoutException.class, () -> {
-            httpClient.execute(request, resp -> resp);
-        });
-    }
-
-    @Test
-    void whenExecutingPostRequest_thenNoExceptions() throws IOException {
-        final HttpPost httpPost = new HttpPost(SAMPLE_POST_URL);
-        httpClient.execute(httpPost,
-            response -> {
-                assertThat(response.getCode()).isEqualTo(200);
-                return response;
-            }
-        );
-    }
-
-    @Test
-    void givenParametersAddedToRequest_thenCorrect() throws IOException {
-        final HttpPost httpPost = new HttpPost(SAMPLE_POST_URL);
-        final List<NameValuePair> params = new ArrayList<NameValuePair>();
-        params.add(new BasicNameValuePair("key1", "value1"));
-        params.add(new BasicNameValuePair("key2", "value2"));
-        httpPost.setEntity(new UrlEncodedFormEntity(params, Charset.defaultCharset()));
-
-        httpClient.execute(httpPost, response -> {
-            assertThat(response.getCode()).isEqualTo(200);
-            return response;
-        });
-    }
-
-    @Test
-    void givenRedirectsAreDisabled_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
-        CloseableHttpClient client = HttpClientBuilder.create()
-            .disableRedirectHandling()
-            .build();
-        client.execute(new HttpGet("http://t.co/I5YYd9tddw"), response -> {
-            assertThat(response.getCode()).isEqualTo(301);
-            return response;
-        });
-    }
-
-    @Test
-    void givenHeadersAddedToRequest_thenCorrect() throws IOException {
-        HttpGet request = new HttpGet(SAMPLE_GET_URL);
-        request.addHeader(HttpHeaders.ACCEPT, "application/xml");
-        httpClient.execute(request,
-            response -> {
-                assertThat(response.getCode()).isEqualTo(200);
-                return response;
-            }
-        );
-    }
-
-    @Test
-    void givenRequestWasSet_whenAnalyzingTheHeadersOfTheResponse_thenCorrect() throws IOException {
-        HttpGet httpGet = new HttpGet(SAMPLE_GET_URL);
-        httpClient.execute(httpGet,
-            response -> {
-                Header[] headers = response.getHeaders(HttpHeaders.CONTENT_TYPE);
-                assertThat(headers, not(emptyArray()));
-                return response;
-            }
-        );
-    }
-
-    @Test
-    void givenAutoClosableClient_thenCorrect() throws IOException {
-        HttpGet httpGet = new HttpGet(SAMPLE_GET_URL);
-        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            httpClient.execute(httpGet, resp -> {
-                assertThat(resp.getCode()).isEqualTo(200);
-                return resp;
-            });
-        }
-    }
-
-}

apache-httpclient/README.md

@@ -8,7 +8,7 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
 - [Apache HttpClient – Cancel Request](https://www.baeldung.com/httpclient-cancel-request)
-- [Apache HttpClient Cookbook](https://www.baeldung.com/apache-httpclient-cookbook)
+- [Apache HttpClient 4 Cookbook](https://www.baeldung.com/httpclient4)
 - [Apache HttpClient – Follow Redirects for POST](https://www.baeldung.com/httpclient-redirect-on-http-post)
 - [Multipart Upload with Apache HttpClient](https://www.baeldung.com/httpclient-multipart-upload)
 - [Apache HttpAsyncClient Tutorial](https://www.baeldung.com/httpasyncclient-tutorial)

apache-httpclient/pom.xml

@@ -90,12 +90,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-netty</artifactId>
-            <version>${mockserver.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
@@ -118,7 +112,6 @@
         <!-- util -->
         <httpasyncclient.version>4.1.4</httpasyncclient.version>
         <!-- testing -->
-        <mockserver.version>5.6.1</mockserver.version>
         <wiremock.version>2.5.1</wiremock.version>
         <httpclient.version>4.5.8</httpclient.version> <!-- 4.3.6 --> <!-- 4.4-beta1 -->
         <!-- http client & core 5 -->

apache-httpclient/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java

@@ -1,78 +0,0 @@
-package com.baeldung.httpclient;
-
-import static org.mockserver.integration.ClientAndServer.startClientAndServer;
-import static org.mockserver.matchers.Times.exactly;
-import static org.mockserver.model.HttpRequest.request;
-import static org.mockserver.model.HttpResponse.response;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-
-import org.apache.http.HttpStatus;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.mockserver.client.MockServerClient;
-import org.mockserver.integration.ClientAndServer;
-
-public class GetRequestMockServer {
-
-    public static ClientAndServer mockServer;
-
-    public static int serverPort;
-
-    public static final String SERVER_ADDRESS = "127.0.0.1";
-
-    public static final String SECURITY_PATH = "/spring-security-rest-basic-auth/api/foos/1";
-
-    public static final String UPLOAD_PATH = "/spring-mvc-java/stub/multipart";
-
-    @BeforeAll
-    static void startServer() throws IOException {
-        serverPort = getFreePort();
-        System.out.println("Free port " + serverPort);
-        mockServer = startClientAndServer(serverPort);
-        mockGetRequest();
-    }
-
-    @AfterAll
-    static void stopServer() {
-        mockServer.stop();
-    }
-
-    private static void mockGetRequest() {
-
-        MockServerClient client = new MockServerClient(SERVER_ADDRESS, serverPort);
-
-        client.when(
-                request()
-                  .withPath(SECURITY_PATH)
-                  .withMethod("GET"), 
-                exactly(1)
-              )
-              .respond(
-                response()
-                  .withStatusCode(HttpStatus.SC_OK)
-                  .withBody("{\"status\":\"ok\"}")
-              );
-
-        client.when(
-                request()
-                  .withPath(UPLOAD_PATH)
-                  .withMethod("POST"), 
-                exactly(4)
-              )
-              .respond(
-                response()
-                  .withStatusCode(HttpStatus.SC_OK)
-                  .withBody("{\"status\":\"ok\"}")
-                  .withHeader("Content-Type", "multipart/form-data")
-              );
-    }
-
-    private static int getFreePort() throws IOException {
-        try (ServerSocket serverSocket = new ServerSocket(0)) {
-            return serverSocket.getLocalPort();
-        }
-    }
-
-}

apache-httpclient/src/test/java/com/baeldung/httpclient/HttpAsyncClientLiveTest.java

@@ -1,7 +1,7 @@
 package com.baeldung.httpclient;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
@@ -9,35 +9,30 @@ import java.util.concurrent.Future;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
-import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
-import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder;
-import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.cookie.BasicCookieStore;
-import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
-import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
-import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
-import org.apache.hc.client5.http.impl.cookie.BasicClientCookie;
-import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
-import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
-import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner;
-import org.apache.hc.client5.http.protocol.HttpClientContext;
-import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
-import org.apache.hc.core5.http.protocol.BasicHttpContext;
-import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.ssl.SSLContexts;
-import org.apache.hc.core5.ssl.TrustStrategy;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.junit.jupiter.api.Test;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.cookie.BasicClientCookie;
+import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
+import org.apache.http.impl.nio.client.HttpAsyncClients;
+import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
+import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
+import org.apache.http.nio.reactor.ConnectingIOReactor;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.ssl.SSLContexts;
+import org.junit.Test;
 
-
-class HttpAsyncClientLiveTest extends GetRequestMockServer {
+public class HttpAsyncClientLiveTest {
 
     private static final String HOST = "http://www.google.com";
     private static final String HOST_WITH_SSL = "https://mms.nw.ru/";
@@ -53,31 +48,23 @@ class HttpAsyncClientLiveTest extends GetRequestMockServer {
     // tests
 
     @Test
-    void whenUseHttpAsyncClient_thenCorrect() throws InterruptedException, ExecutionException, IOException {
-        final SimpleHttpRequest request = SimpleRequestBuilder.get(HOST_WITH_COOKIE)
-            .build();
-        final CloseableHttpAsyncClient client = HttpAsyncClients.custom()
-            .build();
+    public void whenUseHttpAsyncClient_thenCorrect() throws InterruptedException, ExecutionException, IOException {
+        final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
         client.start();
+        final HttpGet request = new HttpGet(HOST);
 
-
-        final Future<SimpleHttpResponse> future = client.execute(request, null);
+        final Future<HttpResponse> future = client.execute(request, null);
         final HttpResponse response = future.get();
 
-        assertThat(response.getCode(), equalTo(200));
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
         client.close();
     }
 
     @Test
-    void whenUseMultipleHttpAsyncClient_thenCorrect() throws Exception {
-        final IOReactorConfig ioReactorConfig = IOReactorConfig
-            .custom()
-            .build();
-
-        final CloseableHttpAsyncClient client = HttpAsyncClients.custom()
-            .setIOReactorConfig(ioReactorConfig)
-            .build();
-
+    public void whenUseMultipleHttpAsyncClient_thenCorrect() throws Exception {
+        final ConnectingIOReactor ioReactor = new DefaultConnectingIOReactor();
+        final PoolingNHttpClientConnectionManager cm = new PoolingNHttpClientConnectionManager(ioReactor);
+        final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setConnectionManager(cm).build();
         client.start();
         final String[] toGet = { "http://www.google.com/", "http://www.apache.org/", "http://www.bing.com/" };
 
@@ -98,54 +85,36 @@ class HttpAsyncClientLiveTest extends GetRequestMockServer {
     }
 
     @Test
-    void whenUseProxyWithHttpClient_thenCorrect() throws Exception {
-        final HttpHost proxy = new HttpHost("127.0.0.1", GetRequestMockServer.serverPort);
-        DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxy);
-        final CloseableHttpAsyncClient client = HttpAsyncClients.custom()
-            .setRoutePlanner(routePlanner)
-            .build();
+    public void whenUseProxyWithHttpClient_thenCorrect() throws Exception {
+        final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
         client.start();
-
-        final SimpleHttpRequest request = new SimpleHttpRequest("GET" ,HOST_WITH_PROXY);
-        final Future<SimpleHttpResponse> future = client.execute(request, null);
-        final HttpResponse  response = future.get();
-        assertThat(response.getCode(), equalTo(200));
-        client.close();
-    }
-
-    @Test
-    void whenUseSSLWithHttpAsyncClient_thenCorrect() throws Exception {
-        final TrustStrategy acceptingTrustStrategy = (certificate, authType) -> true;
-
-        final SSLContext sslContext = SSLContexts.custom()
-            .loadTrustMaterial(null, acceptingTrustStrategy)
-            .build();
-
-        final TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create()
-            .setHostnameVerifier(SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER)
-            .setSslContext(sslContext)
-            .build();
-
-        final PoolingAsyncClientConnectionManager cm = PoolingAsyncClientConnectionManagerBuilder.create()
-            .setTlsStrategy(tlsStrategy)
-            .build();
-
-        final CloseableHttpAsyncClient client = HttpAsyncClients.custom()
-            .setConnectionManager(cm)
-            .build();
-
-        client.start();
-
-        final SimpleHttpRequest request = new SimpleHttpRequest("GET",HOST_WITH_SSL);
-        final Future<SimpleHttpResponse> future = client.execute(request, null);
-
+        final HttpHost proxy = new HttpHost("127.0.0.1", 8080);
+        final RequestConfig config = RequestConfig.custom().setProxy(proxy).build();
+        final HttpGet request = new HttpGet(HOST_WITH_PROXY);
+        request.setConfig(config);
+        final Future<HttpResponse> future = client.execute(request, null);
         final HttpResponse response = future.get();
-        assertThat(response.getCode(), equalTo(200));
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
         client.close();
     }
 
     @Test
-    void whenUseCookiesWithHttpAsyncClient_thenCorrect() throws Exception {
+    public void whenUseSSLWithHttpAsyncClient_thenCorrect() throws Exception {
+        final TrustStrategy acceptingTrustStrategy = (certificate, authType) -> true;
+        final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build();
+
+        final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE).setSSLContext(sslContext).build();
+
+        client.start();
+        final HttpGet request = new HttpGet(HOST_WITH_SSL);
+        final Future<HttpResponse> future = client.execute(request, null);
+        final HttpResponse response = future.get();
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+        client.close();
+    }
+
+    @Test
+    public void whenUseCookiesWithHttpAsyncClient_thenCorrect() throws Exception {
         final BasicCookieStore cookieStore = new BasicCookieStore();
         final BasicClientCookie cookie = new BasicClientCookie(COOKIE_NAME, "1234");
         cookie.setDomain(COOKIE_DOMAIN);
@@ -153,36 +122,29 @@ class HttpAsyncClientLiveTest extends GetRequestMockServer {
         cookieStore.addCookie(cookie);
         final CloseableHttpAsyncClient client = HttpAsyncClients.custom().build();
         client.start();
-        final SimpleHttpRequest request = new SimpleHttpRequest("GET" ,HOST_WITH_COOKIE);
+        final HttpGet request = new HttpGet(HOST_WITH_COOKIE);
 
         final HttpContext localContext = new BasicHttpContext();
         localContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore);
 
-        final Future<SimpleHttpResponse> future = client.execute(request, localContext, null);
-
+        final Future<HttpResponse> future = client.execute(request, localContext, null);
         final HttpResponse response = future.get();
-        assertThat(response.getCode(), equalTo(200));
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
         client.close();
     }
 
     @Test
-    void whenUseAuthenticationWithHttpAsyncClient_thenCorrect() throws Exception {
-        final BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
-        final UsernamePasswordCredentials credentials =
-            new UsernamePasswordCredentials(DEFAULT_USER, DEFAULT_PASS.toCharArray());
-        credsProvider.setCredentials(new AuthScope(URL_SECURED_BY_BASIC_AUTHENTICATION, 80) ,credentials);
-        final CloseableHttpAsyncClient client = HttpAsyncClients
-            .custom()
-            .setDefaultCredentialsProvider(credsProvider).build();
-
-        final SimpleHttpRequest request = new SimpleHttpRequest("GET" ,URL_SECURED_BY_BASIC_AUTHENTICATION);
+    public void whenUseAuthenticationWithHttpAsyncClient_thenCorrect() throws Exception {
+        final CredentialsProvider provider = new BasicCredentialsProvider();
+        final UsernamePasswordCredentials creds = new UsernamePasswordCredentials(DEFAULT_USER, DEFAULT_PASS);
+        provider.setCredentials(AuthScope.ANY, creds);
+        final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setDefaultCredentialsProvider(provider).build();
 
+        final HttpGet request = new HttpGet(URL_SECURED_BY_BASIC_AUTHENTICATION);
         client.start();
-
-        final Future<SimpleHttpResponse> future = client.execute(request, null);
-
+        final Future<HttpResponse> future = client.execute(request, null);
         final HttpResponse response = future.get();
-        assertThat(response.getCode(), equalTo(200));
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
         client.close();
     }
 
@@ -201,9 +163,9 @@ class HttpAsyncClientLiveTest extends GetRequestMockServer {
         @Override
         public void run() {
             try {
-                final Future<SimpleHttpResponse> future = client.execute(SimpleHttpRequest.copy(request), context, null);
+                final Future<HttpResponse> future = client.execute(request, context, null);
                 final HttpResponse response = future.get();
-                assertThat(response.getCode(), equalTo(200));
+                assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
             } catch (final Exception ex) {
                 System.out.println(ex.getLocalizedMessage());
             }

apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java

@@ -19,7 +19,7 @@ class HttpClientCancelRequestLiveTest {
     void whenRequestIsCanceled_thenCorrect() throws IOException {
         HttpGet request = new HttpGet(SAMPLE_URL);
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            httpClient.execute(request, response -> {
+                httpClient.execute(request, response -> {
                 HttpEntity entity = response.getEntity();
 
                 System.out.println("----------------------------------------");
@@ -28,12 +28,6 @@ class HttpClientCancelRequestLiveTest {
                     System.out.println("Response content length: " + entity.getContentLength());
                 }
                 System.out.println("----------------------------------------");
-
-                if (entity != null) {
-                    // Closes this stream and releases any system resources
-                    entity.close();
-                }
-
                 // Do not feel like reading the response body
                 // Call abort on the request object
                 request.abort();

apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientMultipartLiveTest.java

@@ -4,7 +4,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.apache.hc.core5.http.ParseException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -14,6 +13,7 @@ import org.apache.hc.client5.http.entity.mime.HttpMultipartMode;
 import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
 import org.apache.hc.client5.http.entity.mime.StringBody;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 
 import org.apache.hc.core5.http.ContentType;
@@ -28,7 +28,9 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
 
-class HttpClientMultipartLiveTest extends GetRequestMockServer {
+import com.baeldung.httpclient.handler.CustomHttpClientResponseHandler;
+
+class HttpClientMultipartLiveTest {
 
     // No longer available
     // private static final String SERVER = "http://echo.200please.com";
@@ -43,15 +45,13 @@ class HttpClientMultipartLiveTest extends GetRequestMockServer {
     @BeforeEach
     public void before() {
         post = new HttpPost(SERVER);
-        String URL = "http://localhost:" + serverPort + "/spring-mvc-java/stub/multipart";
-        post = new HttpPost(URL);
     }
 
     @Test
     void givenFileandMultipleTextParts_whenUploadwithAddPart_thenNoExceptions() throws IOException {
         final URL url = Thread.currentThread()
-            .getContextClassLoader()
-            .getResource("uploads/" + TEXTFILENAME);
+          .getContextClassLoader()
+          .getResource("uploads/" + TEXTFILENAME);
 
         final File file = new File(url.getPath());
         final FileBody fileBody = new FileBody(file, ContentType.DEFAULT_BINARY);
@@ -66,28 +66,27 @@ class HttpClientMultipartLiveTest extends GetRequestMockServer {
         final HttpEntity entity = builder.build();
 
         post.setEntity(entity);
-        try (CloseableHttpClient client = HttpClientBuilder.create()
-            .build()) {
+        try(CloseableHttpClient client = HttpClientBuilder.create()
+            .build();
 
-            client.execute(post, response -> {
-                final int statusCode = response.getCode();
-                final String responseString = getContent(response.getEntity());
-                final String contentTypeInHeader = getContentTypeHeader();
+            CloseableHttpResponse response = (CloseableHttpResponse) client
+                .execute(post, new CustomHttpClientResponseHandler())){
+            final int statusCode = response.getCode();
+            final String responseString = getContent(response.getEntity());
+            final String contentTypeInHeader = getContentTypeHeader();
 
-                assertThat(statusCode, equalTo(HttpStatus.SC_OK));
-                assertTrue(contentTypeInHeader.contains("multipart/form-data"));
-                System.out.println(responseString);
-                System.out.println("POST Content Type: " + contentTypeInHeader);
-                return response;
-            });
+            assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+            assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
+            System.out.println(responseString);
+            System.out.println("POST Content Type: " + contentTypeInHeader);
         }
     }
 
     @Test
     void givenFileandTextPart_whenUploadwithAddBinaryBodyandAddTextBody_ThenNoExeption() throws IOException {
         final URL url = Thread.currentThread()
-            .getContextClassLoader()
-            .getResource("uploads/" + TEXTFILENAME);
+          .getContextClassLoader()
+          .getResource("uploads/" + TEXTFILENAME);
         final File file = new File(url.getPath());
         final String message = "This is a multipart post";
         final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
@@ -97,31 +96,30 @@ class HttpClientMultipartLiveTest extends GetRequestMockServer {
         final HttpEntity entity = builder.build();
         post.setEntity(entity);
 
-        try (CloseableHttpClient client = HttpClientBuilder.create()
-            .build()) {
+        try(CloseableHttpClient client = HttpClientBuilder.create()
+            .build();
 
-            client.execute(post, response -> {
+            CloseableHttpResponse response = (CloseableHttpResponse) client
+                .execute(post, new CustomHttpClientResponseHandler())){
 
-                final int statusCode = response.getCode();
-                final String responseString = getContent(response.getEntity());
-                final String contentTypeInHeader = getContentTypeHeader();
-                assertThat(statusCode, equalTo(HttpStatus.SC_OK));
-                assertTrue(contentTypeInHeader.contains("multipart/form-data"));
-                System.out.println(responseString);
-                System.out.println("POST Content Type: " + contentTypeInHeader);
-                return response;
-            });
+            final int statusCode = response.getCode();
+            final String responseString = getContent(response.getEntity());
+            final String contentTypeInHeader = getContentTypeHeader();
+            assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+            assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
+            System.out.println(responseString);
+            System.out.println("POST Content Type: " + contentTypeInHeader);
         }
     }
 
     @Test
     void givenFileAndInputStreamandText_whenUploadwithAddBinaryBodyandAddTextBody_ThenNoException() throws IOException {
         final URL url = Thread.currentThread()
-            .getContextClassLoader()
-            .getResource("uploads/" + ZIPFILENAME);
+          .getContextClassLoader()
+          .getResource("uploads/" + ZIPFILENAME);
         final URL url2 = Thread.currentThread()
-            .getContextClassLoader()
-            .getResource("uploads/" + IMAGEFILENAME);
+          .getContextClassLoader()
+          .getResource("uploads/" + IMAGEFILENAME);
         final InputStream inputStream = new FileInputStream(url.getPath());
         final File file = new File(url2.getPath());
         final String message = "This is a multipart post";
@@ -133,25 +131,25 @@ class HttpClientMultipartLiveTest extends GetRequestMockServer {
         final HttpEntity entity = builder.build();
         post.setEntity(entity);
 
-        try (CloseableHttpClient client = HttpClientBuilder.create()
-            .build()) {
+        try(CloseableHttpClient client = HttpClientBuilder.create()
+            .build();
 
-            client.execute(post, response -> {
-                final int statusCode = response.getCode();
-                final String responseString = getContent(response.getEntity());
-                final String contentTypeInHeader = getContentTypeHeader();
-                assertThat(statusCode, equalTo(HttpStatus.SC_OK));
-                assertTrue(contentTypeInHeader.contains("multipart/form-data;"));
-                System.out.println(responseString);
-                System.out.println("POST Content Type: " + contentTypeInHeader);
-                inputStream.close();
-                return response;
-            });
+            CloseableHttpResponse response = (CloseableHttpResponse) client
+                .execute(post, new CustomHttpClientResponseHandler())){
+
+            final int statusCode = response.getCode();
+            final String responseString = getContent(response.getEntity());
+            final String contentTypeInHeader = getContentTypeHeader();
+            assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+            assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
+            System.out.println(responseString);
+            System.out.println("POST Content Type: " + contentTypeInHeader);
+            inputStream.close();
         }
     }
 
     @Test
-    void givenCharArrayandText_whenUploadwithAddBinaryBodyandAddTextBody_ThenNoException() throws IOException, ParseException {
+    void givenCharArrayandText_whenUploadwithAddBinaryBodyandAddTextBody_ThenNoException() throws IOException {
         final String message = "This is a multipart post";
         final byte[] bytes = "binary code".getBytes();
         final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
@@ -161,20 +159,21 @@ class HttpClientMultipartLiveTest extends GetRequestMockServer {
         final HttpEntity entity = builder.build();
         post.setEntity(entity);
 
-        try (CloseableHttpClient httpClient = HttpClientBuilder.create()
-            .build()) {
+        try(CloseableHttpClient client = HttpClientBuilder.create()
+            .build();
 
-            httpClient.execute(post, response -> {
-                final int statusCode = response.getCode();
-                final String responseString = getContent(response.getEntity());
-                final String contentTypeInHeader = getContentTypeHeader();
-                assertThat(statusCode, equalTo(HttpStatus.SC_OK));
-                assertTrue(contentTypeInHeader.contains("multipart/form-data;"));
-                System.out.println(responseString);
-                System.out.println("POST Content Type: " + contentTypeInHeader);
-                return response;
-            });
+            CloseableHttpResponse response = (CloseableHttpResponse) client
+                .execute(post, new CustomHttpClientResponseHandler())){
+
+            final int statusCode = response.getCode();
+            final String responseString = getContent(response.getEntity());
+            final String contentTypeInHeader = getContentTypeHeader();
+            assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+            assertTrue(contentTypeInHeader.contains("Content-Type: multipart/form-data;"));
+            System.out.println(responseString);
+            System.out.println("POST Content Type: " + contentTypeInHeader);
         }
+
     }
 
     // UTIL

apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientRedirectLiveTest.java

@@ -1,61 +1,98 @@
 package com.baeldung.httpclient;
 
-import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.classic.methods.HttpPost;
-import org.apache.hc.client5.http.impl.DefaultRedirectStrategy;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpHead;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultRedirectStrategy;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.client.LaxRedirectStrategy;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.IOException;
+import java.util.Arrays;
 
-class HttpClientRedirectLiveTest {
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+public class HttpClientRedirectLiveTest {
+
+    private CloseableHttpClient instance;
+
+    private CloseableHttpResponse response;
+
+    @Before
+    public final void before() {
+        instance = HttpClientBuilder.create().build();
+    }
+
+    @After
+    public final void after() throws IllegalStateException, IOException {
+        ResponseUtil.closeResponse(response);
+    }
+
+    // tests
 
     @Test
-    void givenRedirectsAreDisabled_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
+    public final void givenRedirectsAreDisabledViaNewApi_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
+        instance = HttpClients.custom().disableRedirectHandling().build();
 
-        final HttpGet request = new HttpGet("http://t.co/I5YYd9tddw");
+        final HttpGet httpGet = new HttpGet("http://t.co/I5YYd9tddw");
+        response = instance.execute(httpGet);
 
-        try (CloseableHttpClient httpClient = HttpClients.custom()
-            .disableRedirectHandling()
-            .build()) {
-            httpClient.execute(request, response -> {
-                assertThat(response.getCode(), equalTo(301));
-                return response;
-            });
-        }
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(301));
     }
 
     @Test
-    void givenRedirectingPOST_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws IOException {
+    public final void givenRedirectsAreDisabled_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
+        instance = HttpClientBuilder.create().disableRedirectHandling().build();
+        response = instance.execute(new HttpGet("http://t.co/I5YYd9tddw"));
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(301));
+    }
 
-        final HttpPost request = new HttpPost("http://t.co/I5YYd9tddw");
+    // redirect with POST
 
-        try (CloseableHttpClient httpClient = HttpClientBuilder.create()
-            .build()) {
-            httpClient.execute(request, response -> {
-                assertThat(response.getCode(), equalTo(200));
-                return response;
-            });
-        }
+    @Test
+    public final void givenPostRequest_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
+        instance = HttpClientBuilder.create().build();
+        response = instance.execute(new HttpPost("http://t.co/I5YYd9tddw"));
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(301));
     }
 
     @Test
-    void givenRedirectingPOST_whenUsingDefaultRedirectStrategy_thenRedirected() throws IOException {
+    public final void givenRedirectingPOSTViaPost4_2Api_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws IOException {
+        final CloseableHttpClient client = HttpClients.custom().setRedirectStrategy(new DefaultRedirectStrategy() {
+            /** Redirectable methods. */
+            private final String[] REDIRECT_METHODS = new String[]{HttpGet.METHOD_NAME, HttpPost.METHOD_NAME, HttpHead.METHOD_NAME};
 
-        final HttpPost request = new HttpPost("http://t.co/I5YYd9tddw");
+            @Override
+            protected boolean isRedirectable(final String method) {
+                return Arrays.stream(REDIRECT_METHODS)
+                  .anyMatch(m -> m.equalsIgnoreCase(method));
+            }
+        }).build();
 
-        try (CloseableHttpClient httpClient = HttpClientBuilder.create()
-            .setRedirectStrategy(new DefaultRedirectStrategy())
-            .build()) {
-            httpClient.execute(request, response -> {
-                assertThat(response.getCode(), equalTo(200));
-                return response;
-            });
-        }
+        response = client.execute(new HttpPost("http://t.co/I5YYd9tddw"));
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
     }
+
+    @Test
+    public final void givenRedirectingPOSTVia4_2Api_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws IOException {
+        final CloseableHttpClient client = HttpClients.custom().setRedirectStrategy(new LaxRedirectStrategy()).build();
+
+        response = client.execute(new HttpPost("http://t.co/I5YYd9tddw"));
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+    }
+
+    @Test
+    public final void givenRedirectingPOST_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws IOException {
+        instance = HttpClientBuilder.create().setRedirectStrategy(new LaxRedirectStrategy()).build();
+        response = instance.execute(new HttpPost("http://t.co/I5YYd9tddw"));
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+    }
+
 }

apache-httpclient/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java

@@ -1,5 +1,29 @@
 package com.baeldung.httpclient.advancedconfig;
 
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.io.IOException;
+
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
@@ -10,30 +34,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static org.junit.Assert.assertEquals;
 
-import java.io.IOException;
-
-import org.apache.hc.client5.http.auth.AuthCache;
-import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.auth.StandardAuthScheme;
-import org.apache.hc.client5.http.classic.HttpClient;
-import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.classic.methods.HttpPost;
-import org.apache.hc.client5.http.impl.auth.BasicAuthCache;
-import org.apache.hc.client5.http.impl.auth.BasicScheme;
-import org.apache.hc.client5.http.impl.auth.CredentialsProviderBuilder;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner;
-import org.apache.hc.client5.http.protocol.HttpClientContext;
-import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.junit.Rule;
-import org.junit.Test;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-
 public class HttpClientAdvancedConfigurationIntegrationTest {
 
     @Rule
@@ -59,7 +59,7 @@ public class HttpClientAdvancedConfigurationIntegrationTest {
         HttpResponse response = httpClient.execute(httpGet);
 
         //then
-        assertEquals(response.getCode(), 200);
+        assertEquals(response.getStatusLine().getStatusCode(), 200);
     }
 
     @Test
@@ -82,7 +82,7 @@ public class HttpClientAdvancedConfigurationIntegrationTest {
         HttpResponse response = httpClient.execute(httpPost);
 
         //then
-        assertEquals(response.getCode(), 200);
+        assertEquals(response.getStatusLine().getStatusCode(), 200);
 
     }
 
@@ -107,7 +107,7 @@ public class HttpClientAdvancedConfigurationIntegrationTest {
         HttpResponse response = httpclient.execute(httpGet);
 
         //then
-        assertEquals(response.getCode(), 200);
+        assertEquals(response.getStatusLine().getStatusCode(), 200);
         proxyMock.verify(getRequestedFor(urlEqualTo("/private")));
         serviceMock.verify(getRequestedFor(urlEqualTo("/private")));
     }
@@ -125,12 +125,14 @@ public class HttpClientAdvancedConfigurationIntegrationTest {
         DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxy);
 
         // Client credentials
-        CredentialsProvider credentialsProvider = CredentialsProviderBuilder.create()
-            .add(new AuthScope(proxy), "username_admin", "secret_password".toCharArray())
-            .build();
+        CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(new AuthScope(proxy),
+          new UsernamePasswordCredentials("username_admin", "secret_password"));
+
 
         // Create AuthCache instance
         AuthCache authCache = new BasicAuthCache();
+
         // Generate BASIC scheme object and add it to the local auth cache
         BasicScheme basicAuth = new BasicScheme();
         authCache.put(proxy, basicAuth);
@@ -147,11 +149,10 @@ public class HttpClientAdvancedConfigurationIntegrationTest {
 
         //when
         final HttpGet httpGet = new HttpGet("http://localhost:8089/private");
-        httpGet.setHeader("Authorization", StandardAuthScheme.BASIC);
         HttpResponse response = httpclient.execute(httpGet, context);
 
         //then
-        assertEquals(response.getCode(), 200);
+        assertEquals(response.getStatusLine().getStatusCode(), 200);
         proxyMock.verify(getRequestedFor(urlEqualTo("/private")).withHeader("Authorization", containing("Basic")));
         serviceMock.verify(getRequestedFor(urlEqualTo("/private")));
     }

apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java

@@ -43,7 +43,7 @@ public class HttpClientLiveTest {
 
     @Test(expected = ConnectTimeoutException.class)
     public final void givenLowTimeout_whenExecutingRequestWithTimeout_thenException() throws IOException {
-        final RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(5).setConnectTimeout(5).setSocketTimeout(2).build();
+        final RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(50).setConnectTimeout(50).setSocketTimeout(20).build();
         final HttpGet request = new HttpGet(SAMPLE_URL);
         request.setConfig(requestConfig);
         response = instance.execute(request);

apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientSandboxLiveTest.java

@@ -1,6 +1,5 @@
 package com.baeldung.httpclient.base;
 
-import com.baeldung.httpclient.GetRequestMockServer;
 import com.baeldung.httpclient.ResponseUtil;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -10,14 +9,14 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 import java.io.IOException;
 
 /*
  * NOTE : Need module spring-security-rest-basic-auth to be running
  */
-public class HttpClientSandboxLiveTest extends GetRequestMockServer {
+public class HttpClientSandboxLiveTest {
 
     @Test
     public final void givenGetRequestExecuted_whenAnalyzingTheResponse_thenCorrectStatusCode() throws IOException {
@@ -27,7 +26,7 @@ public class HttpClientSandboxLiveTest extends GetRequestMockServer {
 
         final CloseableHttpClient client = HttpClientBuilder.create().setDefaultCredentialsProvider(credentialsProvider).build();
 
-        final HttpGet httpGet = new HttpGet("http://localhost:" + serverPort + "/spring-security-rest-basic-auth/api/foos/1");
+        final HttpGet httpGet = new HttpGet("http://localhost:8080/spring-security-rest-basic-auth/api/foos/1");
         final CloseableHttpResponse response = client.execute(httpGet);
 
         System.out.println(response.getStatusLine());

apache-httpclient/src/test/java/com/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java

@@ -1,71 +1,69 @@
 package com.baeldung.httpclient.conn;
 
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.Iterator;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
-import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
-import org.apache.hc.client5.http.HttpRoute;
-import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.config.ConnectionConfig;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
-import org.apache.hc.client5.http.io.ConnectionEndpoint;
-import org.apache.hc.client5.http.io.LeaseRequest;
-import org.apache.hc.core5.http.HeaderElement;
-import org.apache.hc.core5.http.HeaderElements;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.io.entity.EntityUtils;
-import org.apache.hc.core5.http.message.MessageSupport;
-import org.apache.hc.core5.http.message.StatusLine;
-import org.apache.hc.core5.http.protocol.BasicHttpContext;
-import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.pool.PoolStats;
-import org.apache.hc.core5.util.Args;
-import org.apache.hc.core5.util.TimeValue;
-import org.apache.hc.core5.util.Timeout;
-import org.junit.Assert;
+import org.apache.http.HeaderElement;
+import org.apache.http.HeaderElementIterator;
+import org.apache.http.HttpClientConnection;
+import org.apache.http.HttpException;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.config.SocketConfig;
+import org.apache.http.conn.ConnectionKeepAliveStrategy;
+import org.apache.http.conn.ConnectionPoolTimeoutException;
+import org.apache.http.conn.ConnectionRequest;
+import org.apache.http.conn.routing.HttpRoute;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicHeaderElementIterator;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpCoreContext;
+import org.apache.http.protocol.HttpRequestExecutor;
+import org.apache.http.util.EntityUtils;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class HttpClientConnectionManagementLiveTest {
 
     // Example 2.1. Getting a Connection Request for a Low Level Connection (HttpClientConnection)
     @Test
-    public final void whenLowLevelConnectionIsEstablished_thenNoExceptions() throws ExecutionException, InterruptedException, TimeoutException {
-        BasicHttpClientConnectionManager connMgr = new BasicHttpClientConnectionManager();
-        HttpRoute route = new HttpRoute(new HttpHost("www.baeldung.com", 443));
-        final LeaseRequest connRequest = connMgr.lease("some-id", route, null);
-        assertNotNull(connRequest.get(Timeout.ZERO_MILLISECONDS));
-        connMgr.close();
+    public final void whenLowLevelConnectionIsEstablished_thenNoExceptions() throws ConnectionPoolTimeoutException, InterruptedException, ExecutionException {
+        try (BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager()) {
+            HttpRoute route = new HttpRoute(new HttpHost("www.baeldung.com", 80));
+            final ConnectionRequest connRequest = connManager.requestConnection(route, null);
+            assertNotNull(connRequest.get(1000, TimeUnit.SECONDS));
+        }
     }
 
     // Example 3.1. Setting the PoolingHttpClientConnectionManager on a HttpClient
     @Test
-    public final void whenPollingConnectionManagerIsConfiguredOnHttpClient_thenNoExceptions() throws IOException {
+    public final void whenPollingConnectionManagerIsConfiguredOnHttpClient_thenNoExceptions() throws ClientProtocolException, IOException {
         PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager();
         CloseableHttpClient client = HttpClients.custom()
             .setConnectionManager(poolingConnManager)
             .build();
         client.execute(new HttpGet("https://www.baeldung.com"));
+
         assertTrue(poolingConnManager.getTotalStats()
             .getLeased() == 1);
-        client.close();
-        poolingConnManager.close();
     }
 
     // Example 3.2. Using Two HttpClients to Connect to One Target Host Each
     @Test
-    public final void whenTwoConnectionsForTwoRequests_thenNoExceptions() throws InterruptedException, IOException {
+    public final void whenTwoConnectionsForTwoRequests_thenNoExceptions() throws InterruptedException {
         HttpGet get1 = new HttpGet("https://www.baeldung.com");
         HttpGet get2 = new HttpGet("https://www.google.com");
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
@@ -83,52 +81,38 @@ public class HttpClientConnectionManagementLiveTest {
         thread1.join();
         thread2.join();
 
-        Assert.assertTrue(connManager.getTotalStats()
+        assertTrue(connManager.getTotalStats()
             .getLeased() == 0);
-        client1.close();
-        client2.close();
-        connManager.close();
     }
 
     // Example 4.1. Increasing the Number of Connections that Can be Open and Managed Beyond the default Limits
     @Test
-    public final void whenIncreasingConnectionPool_thenNoExceptions() {
-        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-        connManager.setMaxTotal(5);
-        connManager.setDefaultMaxPerRoute(4);
-        HttpHost host = new HttpHost("www.baeldung.com", 80);
-        connManager.setMaxPerRoute(new HttpRoute(host), 5);
-        connManager.close();
+    public final void whenIncreasingConnectionPool_thenNoEceptions() {
+        try (PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager()) {
+            connManager.setMaxTotal(5);
+            connManager.setDefaultMaxPerRoute(4);
+            HttpHost host = new HttpHost("www.baeldung.com", 80);
+            connManager.setMaxPerRoute(new HttpRoute(host), 5);
+        }
     }
 
     // Example 4.2. Using Threads to Execute Connections
     @Test
-    public final void whenExecutingSameRequestsInDifferentThreads_thenExecuteRequest() throws InterruptedException, IOException {
+    public final void whenExecutingSameRequestsInDifferentThreads_thenExecuteReuqest() throws InterruptedException {
         HttpGet get = new HttpGet("http://www.baeldung.com");
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
         CloseableHttpClient client = HttpClients.custom()
             .setConnectionManager(connManager)
             .build();
-        MultiHttpClientConnThread thread1 = new MultiHttpClientConnThread(client, get, connManager);
-        MultiHttpClientConnThread thread2 = new MultiHttpClientConnThread(client, get, connManager);
-        MultiHttpClientConnThread thread3 = new MultiHttpClientConnThread(client, get, connManager);
-        MultiHttpClientConnThread thread4 = new MultiHttpClientConnThread(client, get, connManager);
-        MultiHttpClientConnThread thread5 = new MultiHttpClientConnThread(client, get, connManager);
-        MultiHttpClientConnThread thread6 = new MultiHttpClientConnThread(client, get, connManager);
+        MultiHttpClientConnThread thread1 = new MultiHttpClientConnThread(client, get);
+        MultiHttpClientConnThread thread2 = new MultiHttpClientConnThread(client, get);
+        MultiHttpClientConnThread thread3 = new MultiHttpClientConnThread(client, get);
         thread1.start();
         thread2.start();
         thread3.start();
-        thread4.start();
-        thread5.start();
-        thread6.start();
         thread1.join();
         thread2.join();
         thread3.join();
-        thread4.join();
-        thread5.join();
-        thread6.join();
-        client.close();
-        connManager.close();
     }
 
     // Example 5.1. A Custom Keep Alive Strategy
@@ -136,19 +120,22 @@ public class HttpClientConnectionManagementLiveTest {
     public final void whenCustomizingKeepAliveStrategy_thenNoExceptions() {
         final ConnectionKeepAliveStrategy myStrategy = new ConnectionKeepAliveStrategy() {
             @Override
-            public TimeValue getKeepAliveDuration(HttpResponse response, HttpContext context) {
-                Args.notNull(response, "HTTP response");
-                final Iterator<HeaderElement> it = MessageSupport.iterate(response, HeaderElements.KEEP_ALIVE);
-                final HeaderElement he = it.next();
-                final String param = he.getName();
-                final String value = he.getValue();
-                if (value != null && param.equalsIgnoreCase("timeout")) {
-                    try {
-                        return TimeValue.ofSeconds(Long.parseLong(value));
-                    } catch (final NumberFormatException ignore) {
+            public long getKeepAliveDuration(final HttpResponse myResponse, final HttpContext myContext) {
+                final HeaderElementIterator it = new BasicHeaderElementIterator(myResponse.headerIterator(HTTP.CONN_KEEP_ALIVE));
+                while (it.hasNext()) {
+                    final HeaderElement he = it.nextElement();
+                    final String param = he.getName();
+                    final String value = he.getValue();
+                    if ((value != null) && param.equalsIgnoreCase("timeout")) {
+                        return Long.parseLong(value) * 1000;
                     }
                 }
-                return TimeValue.ofSeconds(5);
+                final HttpHost target = (HttpHost) myContext.getAttribute(HttpCoreContext.HTTP_TARGET_HOST);
+                if ("localhost".equalsIgnoreCase(target.getHostName())) {
+                    return 10 * 1000;
+                } else {
+                    return 5 * 1000;
+                }
             }
 
         };
@@ -157,38 +144,42 @@ public class HttpClientConnectionManagementLiveTest {
             .setKeepAliveStrategy(myStrategy)
             .setConnectionManager(connManager)
             .build();
-        connManager.close();
     }
 
-    //Example 6.1. BasicHttpClientConnectionManager Connection Reuse
+    // Example 6.1. BasicHttpClientConnectionManager Connection Reuse
     @Test
-    public final void givenBasicHttpClientConnManager_whenConnectionReuse_thenNoExceptions() throws InterruptedException, ExecutionException, TimeoutException, IOException, URISyntaxException {
-        BasicHttpClientConnectionManager connMgr = new BasicHttpClientConnectionManager();
+    public final void givenBasicHttpClientConnManager_whenConnectionReuse_thenNoExceptions() throws IOException, HttpException, InterruptedException, ExecutionException {
+        BasicHttpClientConnectionManager basicConnManager = new BasicHttpClientConnectionManager();
+        HttpClientContext context = HttpClientContext.create();
+
+        // low level
         HttpRoute route = new HttpRoute(new HttpHost("www.baeldung.com", 443));
-        final HttpContext context = new BasicHttpContext();
+        ConnectionRequest connRequest = basicConnManager.requestConnection(route, null);
+        HttpClientConnection conn = connRequest.get(10, TimeUnit.SECONDS);
+        basicConnManager.connect(conn, route, 1000, context);
+        basicConnManager.routeComplete(conn, route, context);
 
-        final LeaseRequest connRequest = connMgr.lease("some-id", route, null);
-        final ConnectionEndpoint endpoint = connRequest.get(Timeout.ZERO_MILLISECONDS);
-        connMgr.connect(endpoint, Timeout.ZERO_MILLISECONDS, context);
+        HttpRequestExecutor exeRequest = new HttpRequestExecutor();
+        context.setTargetHost((new HttpHost("www.baeldung.com", 80)));
+        HttpGet get = new HttpGet("http://www.baeldung.com");
+        exeRequest.execute(get, conn, context);
 
-        connMgr.release(endpoint, null, TimeValue.ZERO_MILLISECONDS);
+        basicConnManager.releaseConnection(conn, null, 1, TimeUnit.SECONDS);
 
+        // high level
         CloseableHttpClient client = HttpClients.custom()
-            .setConnectionManager(connMgr)
+            .setConnectionManager(basicConnManager)
             .build();
-        HttpGet httpGet = new HttpGet("https://www.example.com");
-        client.execute(httpGet, context, response -> response);
-        client.close();
-        connMgr.close();
+        client.execute(get);
     }
 
     // Example 6.2. PoolingHttpClientConnectionManager: Re-Using Connections with Threads
     @Test
-    public final void whenConnectionsNeededGreaterThanMaxTotal_thenLeaseMasTotalandReuse() throws InterruptedException, IOException {
-        HttpGet get = new HttpGet("http://www.baeldung.com");
+    public final void whenConnectionsNeededGreaterThanMaxTotal_thenLeaseMasTotalandReuse() throws InterruptedException {
+        HttpGet get = new HttpGet("http://echo.200please.com");
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-        connManager.setDefaultMaxPerRoute(6);
-        connManager.setMaxTotal(6);
+        connManager.setDefaultMaxPerRoute(5);
+        connManager.setMaxTotal(5);
         CloseableHttpClient client = HttpClients.custom()
             .setConnectionManager(connManager)
             .build();
@@ -202,71 +193,48 @@ public class HttpClientConnectionManagementLiveTest {
         for (MultiHttpClientConnThread thread : threads) {
             thread.join(1000);
         }
-        client.close();
-        connManager.close();
     }
 
     // Example 7.1. Setting Socket Timeout to 5 Seconds
     @Test
-    public final void whenConfiguringTimeOut_thenNoExceptions() throws ExecutionException, InterruptedException, TimeoutException, IOException {
-        final HttpRoute route = new HttpRoute(new HttpHost("www.baeldung.com", 80));
-        final HttpContext context = new BasicHttpContext();
-        final PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-
-        final ConnectionConfig connConfig = ConnectionConfig.custom()
-            .setSocketTimeout(5, TimeUnit.SECONDS)
-            .build();
-
-        connManager.setDefaultConnectionConfig(connConfig);
-
-        final LeaseRequest leaseRequest = connManager.lease("id1", route, null);
-        final ConnectionEndpoint endpoint = leaseRequest.get(Timeout.ZERO_MILLISECONDS);
-        connManager.connect(endpoint, null, context);
-        connManager.close();
+    public final void whenConfiguringTimeOut_thenNoExceptions() {
+        HttpRoute route = new HttpRoute(new HttpHost("www.baeldung.com", 80));
+        try (PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager()) {
+            connManager.setSocketConfig(route.getTargetHost(), SocketConfig.custom()
+                .setSoTimeout(5000)
+                .build());
+            assertTrue(connManager.getSocketConfig(route.getTargetHost())
+                .getSoTimeout() == 5000);
+        }
     }
 
     // Example 8.1. Setting the HttpClient to Check for Stale Connections
     @Test
-    public final void whenEvictIdealConn_thenNoExceptions() throws InterruptedException, IOException {
-        final PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-        connManager.setMaxTotal(100);
-        try (final CloseableHttpClient httpclient = HttpClients.custom()
+    public final void whenHttpClientChecksStaleConns_thenNoExceptions() {
+        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
+        HttpClients.custom()
+            .setDefaultRequestConfig(RequestConfig.custom()
+                .setStaleConnectionCheckEnabled(true)
+                .build())
             .setConnectionManager(connManager)
-            .evictExpiredConnections()
-            .evictIdleConnections(TimeValue.ofSeconds(2))
-            .build()) {
-            // create an array of URIs to perform GETs on
-            final String[] urisToGet = { "http://hc.apache.org/", "http://hc.apache.org/httpcomponents-core-ga/"};
+            .build();
+    }
 
-            for (final String requestURI : urisToGet) {
-                final HttpGet request = new HttpGet(requestURI);
-
-                System.out.println("Executing request " + request.getMethod() + " " + request.getRequestUri());
-
-                httpclient.execute(request, response -> {
-                    System.out.println("----------------------------------------");
-                    System.out.println(request + "->" + new StatusLine(response));
-                    EntityUtils.consume(response.getEntity());
-                    return null;
-                });
-            }
-
-            final PoolStats stats1 = connManager.getTotalStats();
-            System.out.println("Connections kept alive: " + stats1.getAvailable());
-
-            // Sleep 10 sec and let the connection evict or do its job
-            Thread.sleep(4000);
-
-            final PoolStats stats2 = connManager.getTotalStats();
-            System.out.println("Connections kept alive: " + stats2.getAvailable());
-
-            connManager.close();
-        }
+    // Example 8.2. Using a Stale Connection Monitor Thread
+    @Test
+    public final void whenCustomizedIdleConnMonitor_thenNoExceptions() throws InterruptedException {
+        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
+        HttpClients.custom()
+            .setConnectionManager(connManager)
+            .build();
+        IdleConnectionMonitorThread staleMonitor = new IdleConnectionMonitorThread(connManager);
+        staleMonitor.start();
+        staleMonitor.join(1000);
     }
 
     // Example 9.1. Closing Connection and Releasing Resources
-    @Test
-    public final void whenClosingConnectionsandManager_thenCloseWithNoExceptions1() throws IOException {
+    @Test(expected = IllegalStateException.class)
+    public final void whenClosingConnectionsandManager_thenCloseWithNoExceptions1() throws InterruptedException, ExecutionException, IOException, HttpException {
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
         CloseableHttpClient client = HttpClients.custom()
             .setConnectionManager(connManager)
@@ -278,11 +246,16 @@ public class HttpClientConnectionManagementLiveTest {
         response.close();
         client.close();
         connManager.close();
+        connManager.shutdown();
+
+        client.execute(get);
+
+        assertTrue(response.getEntity() == null);
     }
 
     @Test
     // Example 3.2. TESTER VERSION
-    public final void whenTwoConnectionsForTwoRequests_thenTwoConnectionsAreLeased() throws InterruptedException, IOException {
+    public final void whenTwoConnectionsForTwoRequests_thenTwoConnectionsAreLeased() throws InterruptedException {
         HttpGet get1 = new HttpGet("https://www.baeldung.com");
         HttpGet get2 = new HttpGet("https://www.google.com");
 
@@ -300,11 +273,77 @@ public class HttpClientConnectionManagementLiveTest {
         thread2.start();
         thread1.join();
         thread2.join(1000);
-        Assert.assertTrue(poolingConnManager.getTotalStats()
+        assertTrue(poolingConnManager.getTotalStats()
             .getLeased() == 2);
+    }
 
-        client1.close();
-        client2.close();
-        poolingConnManager.close();
+    @Test
+    // Example 4.2 Tester Version
+    public final void whenExecutingSameRequestsInDifferentThreads_thenUseDefaultConnLimit() throws InterruptedException {
+        PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager();
+        CloseableHttpClient client = HttpClients.custom()
+            .setConnectionManager(poolingConnManager)
+            .build();
+        final TesterVersion_MultiHttpClientConnThread thread1 = new TesterVersion_MultiHttpClientConnThread(client, new HttpGet("http://www.google.com"), poolingConnManager);
+        final TesterVersion_MultiHttpClientConnThread thread2 = new TesterVersion_MultiHttpClientConnThread(client, new HttpGet("http://www.google.com"), poolingConnManager);
+        final TesterVersion_MultiHttpClientConnThread thread3 = new TesterVersion_MultiHttpClientConnThread(client, new HttpGet("http://www.google.com"), poolingConnManager);
+        thread1.start();
+        thread2.start();
+        thread3.start();
+        thread1.join(10000);
+        thread2.join(10000);
+        thread3.join(10000);
+    }
+
+    @Test
+    // 6.2 TESTER VERSION
+    public final void whenConnectionsNeededGreaterThanMaxTotal_thenReuseConnections() throws InterruptedException {
+        PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager();
+        poolingConnManager.setDefaultMaxPerRoute(5);
+        poolingConnManager.setMaxTotal(5);
+        CloseableHttpClient client = HttpClients.custom()
+            .setConnectionManager(poolingConnManager)
+            .build();
+        final MultiHttpClientConnThread[] threads = new MultiHttpClientConnThread[10];
+        int countConnMade = 0;
+        for (int i = 0; i < threads.length; i++) {
+            threads[i] = new MultiHttpClientConnThread(client, new HttpGet("http://www.baeldung.com/"), poolingConnManager);
+        }
+        for (final MultiHttpClientConnThread thread : threads) {
+            thread.start();
+        }
+        for (final MultiHttpClientConnThread thread : threads) {
+            thread.join(10000);
+            countConnMade++;
+            if (countConnMade == 0) {
+                assertTrue(thread.getLeasedConn() == 5);
+            }
+        }
+    }
+
+    @Test
+    @Ignore("Very Long Running")
+    // 8.2 TESTER VERSION
+    public final void whenCustomizedIdleConnMonitor_thenEliminateIdleConns() throws InterruptedException {
+        PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager();
+        CloseableHttpClient client = HttpClients.custom()
+            .setConnectionManager(poolingConnManager)
+            .build();
+        final IdleConnectionMonitorThread staleMonitor = new IdleConnectionMonitorThread(poolingConnManager);
+        final HttpGet get = new HttpGet("http://google.com");
+        final TesterVersion_MultiHttpClientConnThread thread1 = new TesterVersion_MultiHttpClientConnThread(client, get, poolingConnManager);
+        final TesterVersion_MultiHttpClientConnThread thread2 = new TesterVersion_MultiHttpClientConnThread(client, get, poolingConnManager);
+        final TesterVersion_MultiHttpClientConnThread thread3 = new TesterVersion_MultiHttpClientConnThread(client, get, poolingConnManager);
+        staleMonitor.start();
+        thread1.start();
+        thread1.join();
+        thread2.start();
+        thread2.join();
+        thread3.start();
+        assertTrue(poolingConnManager.getTotalStats()
+            .getAvailable() == 1);
+        thread3.join(32000);
+        assertTrue(poolingConnManager.getTotalStats()
+            .getAvailable() == 0);
     }
 }

apache-httpclient/src/test/java/com/baeldung/httpclient/conn/MultiHttpClientConnThread.java

@@ -2,12 +2,12 @@ package com.baeldung.httpclient.conn;
 
 import java.io.IOException;
 
-import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
-import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,21 +45,22 @@ public class MultiHttpClientConnThread extends Thread {
         try {
             logger.debug("Thread Running: " + getName());
 
+            logger.debug("Thread Running: " + getName());
 
             if (connManager != null) {
                 logger.info("Before - Leased Connections = " + connManager.getTotalStats().getLeased());
                 logger.info("Before - Available Connections = " + connManager.getTotalStats().getAvailable());
             }
 
-            HttpEntity entity = client.execute(get).getEntity();
+            final HttpResponse response = client.execute(get);
 
             if (connManager != null) {
                 leasedConn = connManager.getTotalStats().getLeased();
                 logger.info("After - Leased Connections = " + connManager.getTotalStats().getLeased());
                 logger.info("After - Available Connections = " + connManager.getTotalStats().getAvailable());
             }
-            EntityUtils.consume(entity);
 
+            EntityUtils.consume(response.getEntity());
         } catch (final IOException ex) {
             logger.error("", ex);
         }

apache-httpclient/src/test/java/com/baeldung/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java

@@ -2,9 +2,10 @@ package com.baeldung.httpclient.conn;
 
 import java.io.IOException;
 
-import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apache-httpclient/src/test/java/com/baeldung/httpclient/handler/CustomHttpClientResponseHandler.java

@@ -0,0 +1,11 @@
+package com.baeldung.httpclient.handler;
+
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.io.HttpClientResponseHandler;
+
+public class CustomHttpClientResponseHandler implements HttpClientResponseHandler<ClassicHttpResponse> {
+    @Override
+    public ClassicHttpResponse handleResponse(ClassicHttpResponse response) {
+        return response;
+    }
+}

apache-httpclient4/README.md

@@ -11,7 +11,6 @@ This module contains articles about Apache HttpClient 4.5
 - [Apache HttpClient vs. CloseableHttpClient](https://www.baeldung.com/apache-httpclient-vs-closeablehttpclient)
 - [Expand Shortened URLs with Apache HttpClient](https://www.baeldung.com/apache-httpclient-expand-url)
 - [Retrying Requests using Apache HttpClient](https://www.baeldung.com/java-retrying-requests-using-apache-httpclient)
-- [Apache HttpClient – Follow Redirects for POST](https://www.baeldung.com/httpclient-redirect-on-http-post)
 
 ### Running the Tests
 To run the live tests, use the command: mvn clean install -Plive

apache-httpclient4/pom.xml

@@ -199,7 +199,33 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>${cargo-maven2-plugin.version}</version>
+                <configuration>
+                    <wait>true</wait>
+                    <container>
+                        <containerId>jetty8x</containerId>
+                        <type>embedded</type>
+                        <systemProperties>
+                            <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
+                        </systemProperties>
+                    </container>
+                    <configuration>
+                        <properties>
+                            <cargo.servlet.port>8082</cargo.servlet.port>
+                        </properties>
+                    </configuration>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>
@@ -207,6 +233,26 @@
             <id>live</id>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>start-server</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop-server</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
@@ -223,6 +269,9 @@
                                     <includes>
                                         <include>**/*LiveTest.java</include>
                                     </includes>
+                                    <systemPropertyVariables>
+                                        <webTarget>cargo</webTarget>
+                                    </systemPropertyVariables>
                                 </configuration>
                             </execution>
                         </executions>
@@ -241,6 +290,9 @@
         <httpcore.version>4.4.16</httpcore.version>
         <httpclient.version>4.5.14</httpclient.version>
         <mockserver.version>5.11.2</mockserver.version>
+        <!-- maven plugins -->
+        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>

apache-httpclient4/src/main/java/com/baeldung/tlsversion/ClientTlsVersionExamples.java

@@ -1,64 +0,0 @@
-package com.baeldung.tlsversion;
-
-import javax.net.ssl.SSLSocket;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContexts;
-import org.apache.http.util.EntityUtils;
-
-import java.io.IOException;
-
-public class ClientTlsVersionExamples {
-
-    public static CloseableHttpClient setViaSocketFactory() {
-        SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
-          SSLContexts.createDefault(),
-          new String[] { "TLSv1.2", "TLSv1.3" },
-          null,
-          SSLConnectionSocketFactory.getDefaultHostnameVerifier());
-
-        return HttpClients.custom().setSSLSocketFactory(sslsf).build();
-    }
-
-    public static CloseableHttpClient setTlsVersionPerConnection() {
-        SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(SSLContexts.createDefault()) {
-
-            @Override
-            protected void prepareSocket(SSLSocket socket) {
-                String hostname = socket.getInetAddress().getHostName();
-                if (hostname.endsWith("internal.system.com")) {
-                    socket.setEnabledProtocols(new String[] { "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" });
-                } else {
-                    socket.setEnabledProtocols(new String[] { "TLSv1.3" });
-                }
-            }
-        };
-
-        return HttpClients.custom().setSSLSocketFactory(sslsf).build();
-    }
-
-    // To configure the TLS versions for the client, set the https.protocols system property during runtime.
-    // For example: java -Dhttps.protocols=TLSv1.1,TLSv1.2,TLSv1.3 -jar webClient.jar
-    public static CloseableHttpClient setViaSystemProperties() {
-        return HttpClients.createSystem();
-        // Alternatively:
-        // return HttpClients.custom().useSystemProperties().build();
-    }
-
-    public static void main(String[] args) throws IOException {
-        // Alternatively:
-        // CloseableHttpClient httpClient = setTlsVersionPerConnection();
-        // CloseableHttpClient httpClient = setViaSystemProperties();
-        try (CloseableHttpClient httpClient = setViaSocketFactory();
-           CloseableHttpResponse response = httpClient.execute(new HttpGet("https://httpbin.org/"))) {
-
-            HttpEntity entity = response.getEntity();
-            EntityUtils.consume(entity);
-        }
-    }
-}

apache-httpclient4/src/test/java/com/baeldung/GetRequestMockServer.java

@@ -1,56 +0,0 @@
-package com.baeldung;
-
-import static org.mockserver.integration.ClientAndServer.startClientAndServer;
-import static org.mockserver.model.HttpRequest.request;
-import static org.mockserver.model.HttpResponse.response;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-
-import org.apache.http.HttpStatus;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.mockserver.client.MockServerClient;
-import org.mockserver.integration.ClientAndServer;
-
-public class GetRequestMockServer {
-
-    public static ClientAndServer mockServer;
-    public static int serverPort;
-    public static String simplePathUrl;
-    public static final String SERVER_ADDRESS = "127.0.0.1";
-    public static final String SIMPLE_PATH = "/httpclient-simple/api/bars/1";
-
-    @BeforeAll
-    static void startServer() throws IOException {
-        serverPort = getFreePort();
-        System.out.println("Free port " + serverPort);
-        mockServer = startClientAndServer(serverPort);
-
-        simplePathUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + SIMPLE_PATH;
-
-        mockGetRequest();
-    }
-
-    @AfterAll
-    static void stopServer() {
-        mockServer.stop();
-    }
-
-    private static void mockGetRequest() {
-
-        MockServerClient client = new MockServerClient(SERVER_ADDRESS, serverPort);
-
-        client.when(request().withPath(SIMPLE_PATH)
-                .withMethod("GET"))
-            .respond(response().withStatusCode(HttpStatus.SC_OK)
-                .withBody("{\"status\":\"ok\"}"));
-    }
-
-    private static int getFreePort() throws IOException {
-        try (ServerSocket serverSocket = new ServerSocket(0)) {
-            return serverSocket.getLocalPort();
-        }
-    }
-
-}

apache-httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java

@@ -10,7 +10,7 @@ import java.io.IOException;
 import java.security.GeneralSecurityException;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLPeerUnverifiedException;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -31,10 +31,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
-import com.baeldung.GetRequestMockServer;
 
-class ClientLiveTest extends GetRequestMockServer {
+class ClientLiveTest {
 
+    final String urlOverHttps = "http://localhost:8082/httpclient-simple/api/bars/1";
 
     @Test
     void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenOk_2() throws GeneralSecurityException {
@@ -54,13 +54,13 @@ class ClientLiveTest extends GetRequestMockServer {
             .build();
 
         final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
-        final ResponseEntity<String> response = new RestTemplate(requestFactory).exchange(simplePathUrl, HttpMethod.GET, null, String.class);
+        final ResponseEntity<String> response = new RestTemplate(requestFactory).exchange(urlOverHttps, HttpMethod.GET, null, String.class);
         assertThat(response.getStatusCode().value(), equalTo(200));
     }
 
     @Test
     void givenAcceptingAllCertificates_whenHttpsUrlIsConsumed_thenCorrect() throws IOException {
-        final HttpGet getMethod = new HttpGet(simplePathUrl);
+        final HttpGet getMethod = new HttpGet(urlOverHttps);
 
         try (final CloseableHttpClient httpClient = HttpClients.custom()
             .setSSLHostnameVerifier(new NoopHostnameVerifier())
@@ -80,22 +80,20 @@ class ClientLiveTest extends GetRequestMockServer {
         final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
         requestFactory.setHttpClient(httpClient);
 
-        final ResponseEntity<String> response = new RestTemplate(requestFactory).exchange(simplePathUrl, HttpMethod.GET, null, String.class);
+        final ResponseEntity<String> response = new RestTemplate(requestFactory).exchange(urlOverHttps, HttpMethod.GET, null, String.class);
         assertThat(response.getStatusCode().value(), equalTo(200));
     }
 
     @Test
     void whenHttpsUrlIsConsumed_thenException() {
-        String urlOverHttps = "https://localhost:"+serverPort+"/httpclient-simple/api/bars/1";
+        String urlOverHttps = "https://localhost:8082/httpclient-simple";
         HttpGet getMethod = new HttpGet(urlOverHttps);
 
-        assertThrows(SSLHandshakeException.class, () -> {
+        assertThrows(SSLPeerUnverifiedException.class, () -> {
             CloseableHttpClient httpClient = HttpClients.createDefault();
             HttpResponse response = httpClient.execute(getMethod);
             assertThat(response.getStatusLine()
                 .getStatusCode(), equalTo(200));
         });
     }
-
-
 }

apache-httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java

@@ -1,5 +1,6 @@
 package com.baeldung.client;
 
+import static org.apache.http.conn.ssl.SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -88,5 +89,4 @@ public class RestClientV4LiveManualTest {
         HttpResponse response = httpClient.execute(getMethod);
         assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
     }
-
 }

apache-httpclient4/src/test/java/com/baeldung/httpclient/ClientUtil.java

@@ -1,20 +0,0 @@
-package com.baeldung.httpclient;
-
-import java.io.IOException;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.impl.client.CloseableHttpClient;
-
-public final class ClientUtil {
-
-    private ClientUtil(){}
-
-    public static void closeClient(CloseableHttpClient client) throws IOException {
-        if (client == null) {
-            return;
-        }
-
-        client.close();
-    }
-}

apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpAsyncClientV4LiveTest.java

@@ -1,176 +0,0 @@
-package com.baeldung.httpclient;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import javax.net.ssl.SSLContext;
-
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.TrustStrategy;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.cookie.BasicClientCookie;
-import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
-import org.apache.http.impl.nio.client.HttpAsyncClients;
-import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
-import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.ssl.SSLContexts;
-import org.junit.jupiter.api.Test;
-
-import com.baeldung.GetRequestMockServer;
-
-class HttpAsyncClientV4LiveTest extends GetRequestMockServer {
-
-    private static final String HOST = "http://www.google.com";
-    private static final String HOST_WITH_SSL = "https://mms.nw.ru/";
-    private static final String HOST_WITH_PROXY = "http://httpbin.org/";
-    private static final String URL_SECURED_BY_BASIC_AUTHENTICATION = "http://browserspy.dk/password-ok.php";// "http://localhost:8080/spring-security-rest-basic-auth/api/foos/1";
-    private static final String DEFAULT_USER = "test";// "user1";
-    private static final String DEFAULT_PASS = "test";// "user1Pass";
-
-    private static final String HOST_WITH_COOKIE = "http://yuilibrary.com/yui/docs/cookie/cookie-simple-example.html"; // "http://github.com";
-    private static final String COOKIE_DOMAIN = ".yuilibrary.com"; // ".github.com";
-    private static final String COOKIE_NAME = "example"; // "JSESSIONID";
-
-    // tests
-
-    @Test
-    void whenUseHttpAsyncClient_thenCorrect() throws InterruptedException, ExecutionException, IOException {
-        final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
-        client.start();
-        final HttpGet request = new HttpGet(HOST);
-
-        final Future<HttpResponse> future = client.execute(request, null);
-        final HttpResponse response = future.get();
-
-        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
-        client.close();
-    }
-
-    @Test
-    void whenUseMultipleHttpAsyncClient_thenCorrect() throws Exception {
-        final ConnectingIOReactor ioReactor = new DefaultConnectingIOReactor();
-        final PoolingNHttpClientConnectionManager cm = new PoolingNHttpClientConnectionManager(ioReactor);
-        final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setConnectionManager(cm).build();
-        client.start();
-        final String[] toGet = { "http://www.google.com/", "http://www.apache.org/", "http://www.bing.com/" };
-
-        final GetThread[] threads = new GetThread[toGet.length];
-        for (int i = 0; i < threads.length; i++) {
-            final HttpGet request = new HttpGet(toGet[i]);
-            threads[i] = new GetThread(client, request);
-        }
-
-        for (final GetThread thread : threads) {
-            thread.start();
-        }
-
-        for (final GetThread thread : threads) {
-            thread.join();
-        }
-
-    }
-
-    @Test
-    void whenUseProxyWithHttpClient_thenCorrect() throws Exception {
-        final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
-        client.start();
-        final HttpHost proxy = new HttpHost("127.0.0.1", GetRequestMockServer.serverPort);
-        final RequestConfig config = RequestConfig.custom().setProxy(proxy).build();
-        final HttpGet request = new HttpGet(HOST_WITH_PROXY);
-        request.setConfig(config);
-        final Future<HttpResponse> future = client.execute(request, null);
-        final HttpResponse response = future.get();
-        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
-        client.close();
-    }
-
-    @Test
-    void whenUseSSLWithHttpAsyncClient_thenCorrect() throws Exception {
-        final TrustStrategy acceptingTrustStrategy = (certificate, authType) -> true;
-        final SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(null, acceptingTrustStrategy).build();
-
-        final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE).setSSLContext(sslContext).build();
-
-        client.start();
-        final HttpGet request = new HttpGet(HOST_WITH_SSL);
-        final Future<HttpResponse> future = client.execute(request, null);
-        final HttpResponse response = future.get();
-        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
-        client.close();
-    }
-
-    @Test
-    void whenUseCookiesWithHttpAsyncClient_thenCorrect() throws Exception {
-        final BasicCookieStore cookieStore = new BasicCookieStore();
-        final BasicClientCookie cookie = new BasicClientCookie(COOKIE_NAME, "1234");
-        cookie.setDomain(COOKIE_DOMAIN);
-        cookie.setPath("/");
-        cookieStore.addCookie(cookie);
-        final CloseableHttpAsyncClient client = HttpAsyncClients.custom().build();
-        client.start();
-        final HttpGet request = new HttpGet(HOST_WITH_COOKIE);
-
-        final HttpContext localContext = new BasicHttpContext();
-        localContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore);
-
-        final Future<HttpResponse> future = client.execute(request, localContext, null);
-        final HttpResponse response = future.get();
-        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
-        client.close();
-    }
-
-    @Test
-    void whenUseAuthenticationWithHttpAsyncClient_thenCorrect() throws Exception {
-        final CredentialsProvider provider = new BasicCredentialsProvider();
-        final UsernamePasswordCredentials creds = new UsernamePasswordCredentials(DEFAULT_USER, DEFAULT_PASS);
-        provider.setCredentials(AuthScope.ANY, creds);
-        final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setDefaultCredentialsProvider(provider).build();
-
-        final HttpGet request = new HttpGet(URL_SECURED_BY_BASIC_AUTHENTICATION);
-        client.start();
-        final Future<HttpResponse> future = client.execute(request, null);
-        final HttpResponse response = future.get();
-        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
-        client.close();
-    }
-
-    static class GetThread extends Thread {
-
-        private final CloseableHttpAsyncClient client;
-        private final HttpContext context;
-        private final HttpGet request;
-
-        GetThread(final CloseableHttpAsyncClient client, final HttpGet request) {
-            this.client = client;
-            context = HttpClientContext.create();
-            this.request = request;
-        }
-
-        @Override
-        public void run() {
-            try {
-                final Future<HttpResponse> future = client.execute(request, context, null);
-                final HttpResponse response = future.get();
-                assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
-            } catch (final Exception ex) {
-                System.out.println(ex.getLocalizedMessage());
-            }
-        }
-
-    }
-}

apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestV4LiveTest.java

@@ -44,9 +44,7 @@ public class HttpClientCancelRequestV4LiveTest {
             System.out.println(response.getStatusLine());
             if (entity != null) {
                 System.out.println("Response content length: " + entity.getContentLength());
-                entity.getContent().close();
             }
-
             System.out.println("----------------------------------------");
 
             // Do not feel like reading the response body

apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientCookBookV4LiveTest.java

@@ -1,184 +0,0 @@
-package com.baeldung.httpclient;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import static org.hamcrest.Matchers.emptyArray;
-import static org.hamcrest.Matchers.not;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.SocketTimeoutException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.http.Consts;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHeaders;
-import org.apache.http.NameValuePair;
-
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-
-class HttpClientCookBookV4LiveTest {
-
-    private static final String SAMPLE_GET_URL = "http://www.google.com";
-    private static final String SAMPLE_POST_URL = "http://www.github.com";
-
-    private CloseableHttpClient client;
-
-    private CloseableHttpResponse response;
-
-    @BeforeEach
-    public final void before() {
-        client = HttpClientBuilder.create().build();
-    }
-
-    @AfterEach
-    public final void after() throws IllegalStateException, IOException {
-        ResponseUtil.closeResponse(response);
-        ClientUtil.closeClient(client);
-    }
-
-    @Test
-    void givenGetRequestExecuted_thenCorrectStatusCode() throws IOException {
-        HttpGet httpGet = new HttpGet(SAMPLE_GET_URL);
-        response = client.execute(httpGet);
-        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
-    }
-
-    @Test
-    void givenGetRequestExecuted_thenCorrectContentMimeType() throws IOException {
-        CloseableHttpResponse response = client.execute(new HttpGet(SAMPLE_GET_URL));
-        String contentMimeType = ContentType.getOrDefault(response.getEntity()).getMimeType();
-        assertThat(contentMimeType, equalTo(ContentType.TEXT_HTML.getMimeType()));
-    }
-
-    @Test
-    void  givenGetRequestExecuted_thenCorrectResponse() throws IOException {
-        CloseableHttpResponse response = client.execute(new HttpGet(SAMPLE_GET_URL));
-        String bodyAsString = EntityUtils.toString(response.getEntity());
-        assertThat(bodyAsString, notNullValue());
-    }
-
-    @Test
-    void givenLowSocketTimeOut_whenExecutingRequestWithTimeout_thenException() throws IOException {
-        RequestConfig requestConfig = RequestConfig.custom()
-            .setConnectionRequestTimeout(1000)
-            .setConnectTimeout(1000)
-            .setSocketTimeout(20)
-            .build();
-        HttpGet request = new HttpGet(SAMPLE_POST_URL);
-        request.setConfig(requestConfig);
-
-        assertThrows(SocketTimeoutException.class, () -> {
-            response = client.execute(request);
-        });
-    }
-
-    @Test
-    void givenLowSocketTimeOut_whenSettingTimeoutOnTheClient_thenException(){
-        RequestConfig requestConfig = RequestConfig.custom()
-            .setConnectionRequestTimeout(1000)
-            .setConnectTimeout(1000)
-            .setSocketTimeout(20).build();
-        HttpClientBuilder builder = HttpClientBuilder.create().setDefaultRequestConfig(requestConfig);
-
-        client = builder.build();
-        HttpGet request = new HttpGet(SAMPLE_GET_URL);
-
-        assertThrows(SocketTimeoutException.class, () -> {
-            response = client.execute(request);
-        });
-    }
-
-    @Test
-    void whenExecutingPostRequest_thenNoExceptions() throws IOException {
-        response = client.execute(new HttpPost(SAMPLE_POST_URL));
-        assertThat(response.getStatusLine().getStatusCode(), equalTo(301));
-    }
-
-    @Test
-    void givenParametersAddedToRequest_thenCorrect() throws IOException {
-        final HttpPost httpPost = new HttpPost(SAMPLE_POST_URL);
-        final List<NameValuePair> params = new ArrayList<NameValuePair>();
-        params.add(new BasicNameValuePair("key1", "value1"));
-        params.add(new BasicNameValuePair("key2", "value2"));
-        httpPost.setEntity(new UrlEncodedFormEntity(params, Consts.UTF_8));
-
-        response = client.execute(new HttpPost(SAMPLE_POST_URL));
-        assertThat(response.getStatusLine().getStatusCode(), equalTo(301));
-    }
-
-    @Test
-    void givenRedirectsAreDisabled_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
-        CloseableHttpClient client = HttpClientBuilder.create()
-            .disableRedirectHandling()
-            .build();
-        CloseableHttpResponse response = client.execute(new HttpGet("http://t.co/I5YYd9tddw"));
-        assertThat(response.getStatusLine().getStatusCode(), equalTo(301));
-    }
-
-    @Test
-    void givenHeadersAddedToRequest_thenCorrect() throws IOException {
-        HttpGet request = new HttpGet(SAMPLE_GET_URL);
-        request.addHeader(HttpHeaders.ACCEPT, "application/xml");
-        response = client.execute(request);
-        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
-    }
-
-    @Test
-    void givenRequestWasSet_whenAnalyzingTheHeadersOfTheResponse_thenCorrect() throws IOException {
-        CloseableHttpResponse response = client.execute(new HttpGet(SAMPLE_GET_URL));
-        Header[] headers = response.getHeaders(HttpHeaders.CONTENT_TYPE);
-        assertThat(headers, not(emptyArray()));
-    }
-
-    @Test
-    void givenStreamIsClosed_thenCloseResponse() throws IOException {
-        response = client.execute(new HttpGet(SAMPLE_GET_URL));
-        try {
-            HttpEntity entity = response.getEntity();
-            if (entity != null) {
-                InputStream instream = entity.getContent();
-                instream.close();
-            }
-        } finally {
-            response.close();
-        }
-    }
-
-    @Test
-    void givenAutoClosableClient_thenCorrect() throws IOException {
-        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            HttpGet httpGet = new HttpGet(SAMPLE_GET_URL);
-            try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
-                // handle response;
-                HttpEntity entity = response.getEntity();
-                if (entity != null) {
-                    try (InputStream instream = entity.getContent()) {
-                        // Process the input stream if needed
-                    }
-                }
-                assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
-            }
-        }
-    }
-
-}

apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientRedirectV4LiveTest.java

@@ -1,70 +0,0 @@
-package com.baeldung.httpclient;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.io.IOException;
-
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.client.LaxRedirectStrategy;
-
-class HttpClientRedirectV4LiveTest {
-    private CloseableHttpClient instance;
-
-    private CloseableHttpResponse response;
-
-    @BeforeEach
-    public final void before() {
-        instance = HttpClientBuilder.create()
-            .build();
-    }
-
-    @AfterEach
-    public final void after() throws IllegalStateException, IOException {
-        ResponseUtil.closeResponse(response);
-    }
-
-    @Test
-    void givenRedirectsAreDisabled_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
-        instance = HttpClients.custom()
-            .disableRedirectHandling()
-            .build();
-
-        final HttpGet httpGet = new HttpGet("http://t.co/I5YYd9tddw");
-        response = instance.execute(httpGet);
-
-        assertThat(response.getStatusLine()
-            .getStatusCode(), equalTo(301));
-    }
-
-    // redirect with POST
-
-    @Test
-    void givenPostRequest_whenConsumingUrlWhichRedirects_thenNotRedirected() throws IOException {
-        instance = HttpClientBuilder.create()
-            .build();
-        response = instance.execute(new HttpPost("http://t.co/I5YYd9tddw"));
-        assertThat(response.getStatusLine()
-            .getStatusCode(), equalTo(301));
-    }
-
-    @Test
-    void givenRedirectingPOST_whenConsumingUrlWhichRedirectsWithPOST_thenRedirected() throws IOException {
-        instance = HttpClientBuilder.create()
-            .setRedirectStrategy(new LaxRedirectStrategy())
-            .build();
-        response = instance.execute(new HttpPost("http://t.co/I5YYd9tddw"));
-        assertThat(response.getStatusLine()
-            .getStatusCode(), equalTo(200));
-    }
-
-}

apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java

@@ -21,9 +21,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import com.baeldung.GetRequestMockServer;
-
-class HttpClientTimeoutV4LiveTest extends GetRequestMockServer {
+class HttpClientTimeoutV4LiveTest {
 
     private CloseableHttpResponse response;
 
@@ -99,7 +97,7 @@ class HttpClientTimeoutV4LiveTest extends GetRequestMockServer {
         int timeout = 20; // seconds
         RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout * 1000)
             .setConnectTimeout(timeout * 1000).setSocketTimeout(timeout * 1000).build();
-        HttpGet getMethod = new HttpGet(simplePathUrl);
+        HttpGet getMethod = new HttpGet("http://localhost:8082/httpclient-simple/api/bars/1");
         getMethod.setConfig(requestConfig);
 
         int hardTimeout = 5; // seconds

apache-httpclient4/src/test/java/com/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java

@@ -1,161 +0,0 @@
-package com.baeldung.httpclient.advancedconfig;
-
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.AuthCache;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
-import org.junit.Rule;
-import org.junit.Test;
-
-import java.io.IOException;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.containing;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
-import static org.junit.Assert.assertEquals;
-
-public class HttpClientAdvancedConfigurationIntegrationTest {
-
-    @Rule
-    public WireMockRule serviceMock = new WireMockRule(8089);
-
-    @Rule
-    public WireMockRule proxyMock = new WireMockRule(8090);
-
-    @Test
-    public void givenClientWithCustomUserAgentHeader_whenExecuteRequest_shouldReturn200() throws IOException {
-        //given
-        String userAgent = "BaeldungAgent/1.0";
-        serviceMock.stubFor(get(urlEqualTo("/detail"))
-          .withHeader("User-Agent", equalTo(userAgent))
-          .willReturn(aResponse()
-            .withStatus(200)));
-
-        HttpClient httpClient = HttpClients.createDefault();
-        HttpGet httpGet = new HttpGet("http://localhost:8089/detail");
-        httpGet.setHeader(HttpHeaders.USER_AGENT, userAgent);
-
-        //when
-        HttpResponse response = httpClient.execute(httpGet);
-
-        //then
-        assertEquals(response.getStatusLine().getStatusCode(), 200);
-    }
-
-    @Test
-    public void givenClientThatSendDataInBody_whenSendXmlInBody_shouldReturn200() throws IOException {
-        //given
-        String xmlBody = "<xml><id>1</id></xml>";
-        serviceMock.stubFor(post(urlEqualTo("/person"))
-          .withHeader("Content-Type", equalTo("application/xml"))
-          .withRequestBody(equalTo(xmlBody))
-          .willReturn(aResponse()
-            .withStatus(200)));
-
-        HttpClient httpClient = HttpClients.createDefault();
-        HttpPost httpPost = new HttpPost("http://localhost:8089/person");
-        httpPost.setHeader("Content-Type", "application/xml");
-        StringEntity xmlEntity = new StringEntity(xmlBody);
-        httpPost.setEntity(xmlEntity);
-
-        //when
-        HttpResponse response = httpClient.execute(httpPost);
-
-        //then
-        assertEquals(response.getStatusLine().getStatusCode(), 200);
-
-    }
-
-    @Test
-    public void givenServerThatIsBehindProxy_whenClientIsConfiguredToSendRequestViaProxy_shouldReturn200() throws IOException {
-        //given
-        proxyMock.stubFor(get(urlMatching(".*"))
-          .willReturn(aResponse().proxiedFrom("http://localhost:8089/")));
-
-        serviceMock.stubFor(get(urlEqualTo("/private"))
-          .willReturn(aResponse().withStatus(200)));
-
-
-        HttpHost proxy = new HttpHost("localhost", 8090);
-        DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxy);
-        HttpClient httpclient = HttpClients.custom()
-          .setRoutePlanner(routePlanner)
-          .build();
-
-        //when
-        final HttpGet httpGet = new HttpGet("http://localhost:8089/private");
-        HttpResponse response = httpclient.execute(httpGet);
-
-        //then
-        assertEquals(response.getStatusLine().getStatusCode(), 200);
-        proxyMock.verify(getRequestedFor(urlEqualTo("/private")));
-        serviceMock.verify(getRequestedFor(urlEqualTo("/private")));
-    }
-
-    @Test
-    public void givenServerThatIsBehindAuthorizationProxy_whenClientSendRequest_shouldAuthorizeProperly() throws IOException {
-        //given
-        proxyMock.stubFor(get(urlMatching("/private"))
-          .willReturn(aResponse().proxiedFrom("http://localhost:8089/")));
-        serviceMock.stubFor(get(urlEqualTo("/private"))
-          .willReturn(aResponse().withStatus(200)));
-
-
-        HttpHost proxy = new HttpHost("localhost", 8090);
-        DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxy);
-
-        // Client credentials
-        CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-        credentialsProvider.setCredentials(new AuthScope(proxy),
-          new UsernamePasswordCredentials("username_admin", "secret_password"));
-
-
-        // Create AuthCache instance
-        AuthCache authCache = new BasicAuthCache();
-
-        // Generate BASIC scheme object and add it to the local auth cache
-        BasicScheme basicAuth = new BasicScheme();
-        authCache.put(proxy, basicAuth);
-        HttpClientContext context = HttpClientContext.create();
-        context.setCredentialsProvider(credentialsProvider);
-        context.setAuthCache(authCache);
-
-
-        HttpClient httpclient = HttpClients.custom()
-          .setRoutePlanner(routePlanner)
-          .setDefaultCredentialsProvider(credentialsProvider)
-          .build();
-
-
-        //when
-        final HttpGet httpGet = new HttpGet("http://localhost:8089/private");
-        HttpResponse response = httpclient.execute(httpGet, context);
-
-        //then
-        assertEquals(response.getStatusLine().getStatusCode(), 200);
-        proxyMock.verify(getRequestedFor(urlEqualTo("/private")).withHeader("Authorization", containing("Basic")));
-        serviceMock.verify(getRequestedFor(urlEqualTo("/private")));
-    }
-
-
-}

apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java

@@ -13,15 +13,13 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.junit.jupiter.api.Test;
 
-import com.baeldung.GetRequestMockServer;
-
 class ApacheHttpClientUnitTest extends GetRequestMockServer {
 
 
     @Test
     void givenDeveloperUsedCloseableHttpResponse_whenExecutingGetRequest_thenStatusIsOk() throws IOException {
         try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
-            HttpGet httpGet = new HttpGet(simplePathUrl);
+            HttpGet httpGet = new HttpGet(serviceOneUrl);
             try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
                 HttpEntity entity = response.getEntity();
                 EntityUtils.consume(entity);

apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java

@@ -0,0 +1,78 @@
+package com.baeldung.httpclient.httpclient;
+
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockserver.client.MockServerClient;
+import org.mockserver.integration.ClientAndServer;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.URISyntaxException;
+
+import static org.mockserver.integration.ClientAndServer.startClientAndServer;
+import static org.mockserver.matchers.Times.exactly;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+public class GetRequestMockServer {
+
+    public static ClientAndServer mockServer;
+    public static String serviceOneUrl;
+    public static String serviceTwoUrl;
+
+    private static int serverPort;
+
+    public static final String SERVER_ADDRESS = "127.0.0.1";
+    public static final String PATH_ONE = "/test1";
+    public static final String PATH_TWO = "/test2";
+    public static final String METHOD = "GET";
+
+    @BeforeAll
+    static void startServer() throws IOException, URISyntaxException {
+        serverPort = getFreePort();
+        serviceOneUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_ONE;
+        serviceTwoUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_TWO;
+        mockServer = startClientAndServer(serverPort);
+        mockGetRequest();
+    }
+
+    @AfterAll
+    static void stopServer() {
+        mockServer.stop();
+    }
+
+    private static void mockGetRequest() {
+        new MockServerClient(SERVER_ADDRESS, serverPort)
+          .when(
+            request()
+              .withPath(PATH_ONE)
+              .withMethod(METHOD),
+            exactly(5)
+          )
+          .respond(
+            response()
+              .withStatusCode(HttpStatus.SC_OK)
+              .withBody("{\"status\":\"ok\"}")
+          );
+        new MockServerClient(SERVER_ADDRESS, serverPort)
+          .when(
+            request()
+              .withPath(PATH_TWO)
+              .withMethod(METHOD),
+            exactly(1)
+          )
+          .respond(
+            response()
+              .withStatusCode(HttpStatus.SC_OK)
+              .withBody("{\"status\":\"ok\"}")
+          );
+    }
+
+    private static int getFreePort () throws IOException {
+        try (ServerSocket serverSocket = new ServerSocket(0)) {
+            return serverSocket.getLocalPort();
+        }
+    }
+
+}

apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/conn/HttpClientConnectionManagementLiveTest.java

@@ -1,349 +0,0 @@
-package com.baeldung.httpclient.httpclient.conn;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.http.HeaderElement;
-import org.apache.http.HeaderElementIterator;
-import org.apache.http.HttpClientConnection;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.config.SocketConfig;
-import org.apache.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.http.conn.ConnectionPoolTimeoutException;
-import org.apache.http.conn.ConnectionRequest;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.message.BasicHeaderElementIterator;
-import org.apache.http.protocol.HTTP;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpCoreContext;
-import org.apache.http.protocol.HttpRequestExecutor;
-import org.apache.http.util.EntityUtils;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class HttpClientConnectionManagementLiveTest {
-
-    // Example 2.1. Getting a Connection Request for a Low Level Connection (HttpClientConnection)
-    @Test
-    public final void whenLowLevelConnectionIsEstablished_thenNoExceptions() throws ConnectionPoolTimeoutException, InterruptedException, ExecutionException {
-        try (BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager()) {
-            HttpRoute route = new HttpRoute(new HttpHost("www.baeldung.com", 80));
-            final ConnectionRequest connRequest = connManager.requestConnection(route, null);
-            assertNotNull(connRequest.get(1000, TimeUnit.SECONDS));
-        }
-    }
-
-    // Example 3.1. Setting the PoolingHttpClientConnectionManager on a HttpClient
-    @Test
-    public final void whenPollingConnectionManagerIsConfiguredOnHttpClient_thenNoExceptions() throws ClientProtocolException, IOException {
-        PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager();
-        CloseableHttpClient client = HttpClients.custom()
-            .setConnectionManager(poolingConnManager)
-            .build();
-        client.execute(new HttpGet("https://www.baeldung.com"));
-
-        assertTrue(poolingConnManager.getTotalStats()
-            .getLeased() == 1);
-    }
-
-    // Example 3.2. Using Two HttpClients to Connect to One Target Host Each
-    @Test
-    public final void whenTwoConnectionsForTwoRequests_thenNoExceptions() throws InterruptedException {
-        HttpGet get1 = new HttpGet("https://www.baeldung.com");
-        HttpGet get2 = new HttpGet("https://www.google.com");
-        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-        CloseableHttpClient client1 = HttpClients.custom()
-            .setConnectionManager(connManager)
-            .build();
-        CloseableHttpClient client2 = HttpClients.custom()
-            .setConnectionManager(connManager)
-            .build();
-
-        MultiHttpClientConnThread thread1 = new MultiHttpClientConnThread(client1, get1);
-        MultiHttpClientConnThread thread2 = new MultiHttpClientConnThread(client2, get2);
-        thread1.start();
-        thread2.start();
-        thread1.join();
-        thread2.join();
-
-        assertTrue(connManager.getTotalStats()
-            .getLeased() == 0);
-    }
-
-    // Example 4.1. Increasing the Number of Connections that Can be Open and Managed Beyond the default Limits
-    @Test
-    public final void whenIncreasingConnectionPool_thenNoEceptions() {
-        try (PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager()) {
-            connManager.setMaxTotal(5);
-            connManager.setDefaultMaxPerRoute(4);
-            HttpHost host = new HttpHost("www.baeldung.com", 80);
-            connManager.setMaxPerRoute(new HttpRoute(host), 5);
-        }
-    }
-
-    // Example 4.2. Using Threads to Execute Connections
-    @Test
-    public final void whenExecutingSameRequestsInDifferentThreads_thenExecuteReuqest() throws InterruptedException {
-        HttpGet get = new HttpGet("http://www.baeldung.com");
-        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-        CloseableHttpClient client = HttpClients.custom()
-            .setConnectionManager(connManager)
-            .build();
-        MultiHttpClientConnThread thread1 = new MultiHttpClientConnThread(client, get);
-        MultiHttpClientConnThread thread2 = new MultiHttpClientConnThread(client, get);
-        MultiHttpClientConnThread thread3 = new MultiHttpClientConnThread(client, get);
-        thread1.start();
-        thread2.start();
-        thread3.start();
-        thread1.join();
-        thread2.join();
-        thread3.join();
-    }
-
-    // Example 5.1. A Custom Keep Alive Strategy
-    @Test
-    public final void whenCustomizingKeepAliveStrategy_thenNoExceptions() {
-        final ConnectionKeepAliveStrategy myStrategy = new ConnectionKeepAliveStrategy() {
-            @Override
-            public long getKeepAliveDuration(final HttpResponse myResponse, final HttpContext myContext) {
-                final HeaderElementIterator it = new BasicHeaderElementIterator(myResponse.headerIterator(HTTP.CONN_KEEP_ALIVE));
-                while (it.hasNext()) {
-                    final HeaderElement he = it.nextElement();
-                    final String param = he.getName();
-                    final String value = he.getValue();
-                    if ((value != null) && param.equalsIgnoreCase("timeout")) {
-                        return Long.parseLong(value) * 1000;
-                    }
-                }
-                final HttpHost target = (HttpHost) myContext.getAttribute(HttpCoreContext.HTTP_TARGET_HOST);
-                if ("localhost".equalsIgnoreCase(target.getHostName())) {
-                    return 10 * 1000;
-                } else {
-                    return 5 * 1000;
-                }
-            }
-
-        };
-        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-        HttpClients.custom()
-            .setKeepAliveStrategy(myStrategy)
-            .setConnectionManager(connManager)
-            .build();
-    }
-
-    // Example 6.1. BasicHttpClientConnectionManager Connection Reuse
-    @Test
-    public final void givenBasicHttpClientConnManager_whenConnectionReuse_thenNoExceptions() throws IOException, HttpException, InterruptedException, ExecutionException {
-        BasicHttpClientConnectionManager basicConnManager = new BasicHttpClientConnectionManager();
-        HttpClientContext context = HttpClientContext.create();
-
-        // low level
-        HttpRoute route = new HttpRoute(new HttpHost("www.baeldung.com", 443));
-        ConnectionRequest connRequest = basicConnManager.requestConnection(route, null);
-        HttpClientConnection conn = connRequest.get(10, TimeUnit.SECONDS);
-        basicConnManager.connect(conn, route, 1000, context);
-        basicConnManager.routeComplete(conn, route, context);
-
-        HttpRequestExecutor exeRequest = new HttpRequestExecutor();
-        context.setTargetHost((new HttpHost("www.baeldung.com", 80)));
-        HttpGet get = new HttpGet("http://www.baeldung.com");
-        exeRequest.execute(get, conn, context);
-
-        basicConnManager.releaseConnection(conn, null, 1, TimeUnit.SECONDS);
-
-        // high level
-        CloseableHttpClient client = HttpClients.custom()
-            .setConnectionManager(basicConnManager)
-            .build();
-        client.execute(get);
-    }
-
-    // Example 6.2. PoolingHttpClientConnectionManager: Re-Using Connections with Threads
-    @Test
-    public final void whenConnectionsNeededGreaterThanMaxTotal_thenLeaseMasTotalandReuse() throws InterruptedException {
-        HttpGet get = new HttpGet("http://echo.200please.com");
-        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-        connManager.setDefaultMaxPerRoute(5);
-        connManager.setMaxTotal(5);
-        CloseableHttpClient client = HttpClients.custom()
-            .setConnectionManager(connManager)
-            .build();
-        MultiHttpClientConnThread[] threads = new MultiHttpClientConnThread[10];
-        for (int i = 0; i < threads.length; i++) {
-            threads[i] = new MultiHttpClientConnThread(client, get, connManager);
-        }
-        for (MultiHttpClientConnThread thread : threads) {
-            thread.start();
-        }
-        for (MultiHttpClientConnThread thread : threads) {
-            thread.join(1000);
-        }
-    }
-
-    // Example 7.1. Setting Socket Timeout to 5 Seconds
-    @Test
-    public final void whenConfiguringTimeOut_thenNoExceptions() {
-        HttpRoute route = new HttpRoute(new HttpHost("www.baeldung.com", 80));
-        try (PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager()) {
-            connManager.setSocketConfig(route.getTargetHost(), SocketConfig.custom()
-                .setSoTimeout(5000)
-                .build());
-            assertTrue(connManager.getSocketConfig(route.getTargetHost())
-                .getSoTimeout() == 5000);
-        }
-    }
-
-    // Example 8.1. Setting the HttpClient to Check for Stale Connections
-    @Test
-    public final void whenHttpClientChecksStaleConns_thenNoExceptions() {
-        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-        HttpClients.custom()
-            .setDefaultRequestConfig(RequestConfig.custom()
-                .setStaleConnectionCheckEnabled(true)
-                .build())
-            .setConnectionManager(connManager)
-            .build();
-    }
-
-    // Example 8.2. Using a Stale Connection Monitor Thread
-    @Test
-    public final void whenCustomizedIdleConnMonitor_thenNoExceptions() throws InterruptedException {
-        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-        HttpClients.custom()
-            .setConnectionManager(connManager)
-            .build();
-        IdleConnectionMonitorThread staleMonitor = new IdleConnectionMonitorThread(connManager);
-        staleMonitor.start();
-        staleMonitor.join(1000);
-    }
-
-    // Example 9.1. Closing Connection and Releasing Resources
-    @Test(expected = IllegalStateException.class)
-    public final void whenClosingConnectionsandManager_thenCloseWithNoExceptions1() throws InterruptedException, ExecutionException, IOException, HttpException {
-        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager();
-        CloseableHttpClient client = HttpClients.custom()
-            .setConnectionManager(connManager)
-            .build();
-        final HttpGet get = new HttpGet("http://google.com");
-        CloseableHttpResponse response = client.execute(get);
-
-        EntityUtils.consume(response.getEntity());
-        response.close();
-        client.close();
-        connManager.close();
-        connManager.shutdown();
-
-        client.execute(get);
-
-        assertTrue(response.getEntity() == null);
-    }
-
-    @Test
-    // Example 3.2. TESTER VERSION
-    public final void whenTwoConnectionsForTwoRequests_thenTwoConnectionsAreLeased() throws InterruptedException {
-        HttpGet get1 = new HttpGet("https://www.baeldung.com");
-        HttpGet get2 = new HttpGet("https://www.google.com");
-
-        PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager();
-        final CloseableHttpClient client1 = HttpClients.custom()
-            .setConnectionManager(poolingConnManager)
-            .build();
-        final CloseableHttpClient client2 = HttpClients.custom()
-            .setConnectionManager(poolingConnManager)
-            .build();
-
-        final TesterVersion_MultiHttpClientConnThread thread1 = new TesterVersion_MultiHttpClientConnThread(client1, get1, poolingConnManager);
-        final TesterVersion_MultiHttpClientConnThread thread2 = new TesterVersion_MultiHttpClientConnThread(client2, get2, poolingConnManager);
-        thread1.start();
-        thread2.start();
-        thread1.join();
-        thread2.join(1000);
-        assertTrue(poolingConnManager.getTotalStats()
-            .getLeased() == 2);
-    }
-
-    @Test
-    // Example 4.2 Tester Version
-    public final void whenExecutingSameRequestsInDifferentThreads_thenUseDefaultConnLimit() throws InterruptedException {
-        PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager();
-        CloseableHttpClient client = HttpClients.custom()
-            .setConnectionManager(poolingConnManager)
-            .build();
-        final TesterVersion_MultiHttpClientConnThread thread1 = new TesterVersion_MultiHttpClientConnThread(client, new HttpGet("http://www.google.com"), poolingConnManager);
-        final TesterVersion_MultiHttpClientConnThread thread2 = new TesterVersion_MultiHttpClientConnThread(client, new HttpGet("http://www.google.com"), poolingConnManager);
-        final TesterVersion_MultiHttpClientConnThread thread3 = new TesterVersion_MultiHttpClientConnThread(client, new HttpGet("http://www.google.com"), poolingConnManager);
-        thread1.start();
-        thread2.start();
-        thread3.start();
-        thread1.join(10000);
-        thread2.join(10000);
-        thread3.join(10000);
-    }
-
-    @Test
-    // 6.2 TESTER VERSION
-    public final void whenConnectionsNeededGreaterThanMaxTotal_thenReuseConnections() throws InterruptedException {
-        PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager();
-        poolingConnManager.setDefaultMaxPerRoute(5);
-        poolingConnManager.setMaxTotal(5);
-        CloseableHttpClient client = HttpClients.custom()
-            .setConnectionManager(poolingConnManager)
-            .build();
-        final MultiHttpClientConnThread[] threads = new MultiHttpClientConnThread[10];
-        int countConnMade = 0;
-        for (int i = 0; i < threads.length; i++) {
-            threads[i] = new MultiHttpClientConnThread(client, new HttpGet("http://www.baeldung.com/"), poolingConnManager);
-        }
-        for (final MultiHttpClientConnThread thread : threads) {
-            thread.start();
-        }
-        for (final MultiHttpClientConnThread thread : threads) {
-            thread.join(10000);
-            countConnMade++;
-            if (countConnMade == 0) {
-                assertTrue(thread.getLeasedConn() == 5);
-            }
-        }
-    }
-
-    @Test
-    @Ignore("Very Long Running")
-    // 8.2 TESTER VERSION
-    public final void whenCustomizedIdleConnMonitor_thenEliminateIdleConns() throws InterruptedException {
-        PoolingHttpClientConnectionManager poolingConnManager = new PoolingHttpClientConnectionManager();
-        CloseableHttpClient client = HttpClients.custom()
-            .setConnectionManager(poolingConnManager)
-            .build();
-        final IdleConnectionMonitorThread staleMonitor = new IdleConnectionMonitorThread(poolingConnManager);
-        final HttpGet get = new HttpGet("http://google.com");
-        final TesterVersion_MultiHttpClientConnThread thread1 = new TesterVersion_MultiHttpClientConnThread(client, get, poolingConnManager);
-        final TesterVersion_MultiHttpClientConnThread thread2 = new TesterVersion_MultiHttpClientConnThread(client, get, poolingConnManager);
-        final TesterVersion_MultiHttpClientConnThread thread3 = new TesterVersion_MultiHttpClientConnThread(client, get, poolingConnManager);
-        staleMonitor.start();
-        thread1.start();
-        thread1.join();
-        thread2.start();
-        thread2.join();
-        thread3.start();
-        assertTrue(poolingConnManager.getTotalStats()
-            .getAvailable() == 1);
-        thread3.join(32000);
-        assertTrue(poolingConnManager.getTotalStats()
-            .getAvailable() == 0);
-    }
-}

apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/conn/IdleConnectionMonitorThread.java

@@ -1,41 +0,0 @@
-package com.baeldung.httpclient.httpclient.conn;
-
-import java.util.concurrent.TimeUnit;
-
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-
-public class IdleConnectionMonitorThread extends Thread {
-    private final HttpClientConnectionManager connMgr;
-    private volatile boolean shutdown;
-
-    IdleConnectionMonitorThread(final PoolingHttpClientConnectionManager connMgr) {
-        super();
-        this.connMgr = connMgr;
-    }
-
-    // API
-
-    @Override
-    public final void run() {
-        try {
-            while (!shutdown) {
-                synchronized (this) {
-                    wait(1000);
-                    connMgr.closeExpiredConnections();
-                    connMgr.closeIdleConnections(30, TimeUnit.SECONDS);
-                }
-            }
-        } catch (final InterruptedException ex) {
-            shutdown();
-        }
-    }
-
-    private void shutdown() {
-        shutdown = true;
-        synchronized (this) {
-            notifyAll();
-        }
-    }
-
-}

apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/conn/MultiHttpClientConnThread.java

@@ -1,69 +0,0 @@
-package com.baeldung.httpclient.httpclient.conn;
-
-import java.io.IOException;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MultiHttpClientConnThread extends Thread {
-    private final Logger logger = LoggerFactory.getLogger(getClass());
-
-    private final CloseableHttpClient client;
-    private final HttpGet get;
-
-    private PoolingHttpClientConnectionManager connManager;
-    private int leasedConn;
-
-    MultiHttpClientConnThread(final CloseableHttpClient client, final HttpGet get, final PoolingHttpClientConnectionManager connManager) {
-        this.client = client;
-        this.get = get;
-        this.connManager = connManager;
-        leasedConn = 0;
-    }
-
-    MultiHttpClientConnThread(final CloseableHttpClient client, final HttpGet get) {
-        this.client = client;
-        this.get = get;
-    }
-
-    // API
-
-    final int getLeasedConn() {
-        return leasedConn;
-    }
-
-    //
-
-    @Override
-    public final void run() {
-        try {
-            logger.debug("Thread Running: " + getName());
-
-            logger.debug("Thread Running: " + getName());
-
-            if (connManager != null) {
-                logger.info("Before - Leased Connections = " + connManager.getTotalStats().getLeased());
-                logger.info("Before - Available Connections = " + connManager.getTotalStats().getAvailable());
-            }
-
-            final HttpResponse response = client.execute(get);
-
-            if (connManager != null) {
-                leasedConn = connManager.getTotalStats().getLeased();
-                logger.info("After - Leased Connections = " + connManager.getTotalStats().getLeased());
-                logger.info("After - Available Connections = " + connManager.getTotalStats().getAvailable());
-            }
-
-            EntityUtils.consume(response.getEntity());
-        } catch (final IOException ex) {
-            logger.error("", ex);
-        }
-    }
-
-}

apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/conn/TesterVersion_MultiHttpClientConnThread.java

@@ -1,46 +0,0 @@
-package com.baeldung.httpclient.httpclient.conn;
-
-import java.io.IOException;
-
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-public class TesterVersion_MultiHttpClientConnThread extends Thread {
-    private final Logger logger = LoggerFactory.getLogger(getClass());
-
-    private final CloseableHttpClient client;
-    private final HttpGet get;
-    private PoolingHttpClientConnectionManager connManager;
-
-    TesterVersion_MultiHttpClientConnThread(final CloseableHttpClient client, final HttpGet get, final PoolingHttpClientConnectionManager connManager) {
-        this.client = client;
-        this.get = get;
-        this.connManager = Preconditions.checkNotNull(connManager);
-    }
-
-    //
-
-    @Override
-    public final void run() {
-        try {
-            logger.debug("Thread Running: " + getName());
-
-            logger.info("Before - Leased Connections = " + connManager.getTotalStats().getLeased());
-            logger.info("Before - Available Connections = " + connManager.getTotalStats().getAvailable());
-
-            client.execute(get);
-
-            logger.info("After - Leased Connections = " + connManager.getTotalStats().getLeased());
-            logger.info("After - Available Connections = " + connManager.getTotalStats().getAvailable());
-        } catch (final IOException ex) {
-            logger.error("", ex);
-        }
-    }
-
-}

apache-kafka-2/README.md

@@ -8,8 +8,3 @@ You can build the project from the command line using: *mvn clean install*, or i
 ### Relevant Articles:
 - [Guide to Check if Apache Kafka Server Is Running](https://www.baeldung.com/apache-kafka-check-server-is-running)
 - [Add Custom Headers to a Kafka Message](https://www.baeldung.com/java-kafka-custom-headers)
-- [Get Last N Messages in Apache Kafka Topic](https://www.baeldung.com/java-apache-kafka-get-last-n-messages)
-- [Is a Key Required as Part of Sending Messages to Kafka?](https://www.baeldung.com/java-kafka-message-key)
-- [Read Data From the Beginning Using Kafka Consumer API](https://www.baeldung.com/java-kafka-consumer-api-read)
-- [Get Partition Count for a Topic in Kafka](https://www.baeldung.com/java-kafka-partition-count-topic)
-- [bootstrap-server in Kafka Configuration](https://www.baeldung.com/java-kafka-bootstrap-server)

apache-kafka-2/src/main/java/com/baeldung/kafka/consumer/ConsumeFromBeginning.java

@@ -1,81 +0,0 @@
-package com.baeldung.kafka.consumer;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Properties;
-import java.util.UUID;
-
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ConsumeFromBeginning {
-
-    private static Logger logger = LoggerFactory.getLogger(ConsumeFromBeginning.class);
-
-    private static String TOPIC = "baeldung";
-    private static int messagesInTopic = 10;
-
-    private static KafkaProducer<String, String> producer;
-    private static KafkaConsumer<String, String> consumer;
-
-    public static void main(String[] args) {
-        setup();
-
-        publishMessages();
-
-        consumeFromBeginning();
-    }
-
-    private static void consumeFromBeginning() {
-        consumer.subscribe(Arrays.asList(TOPIC));
-
-        ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(10));
-
-        for (ConsumerRecord<String, String> record : records) {
-            logger.info(record.value());
-        }
-
-        consumer.seekToBeginning(consumer.assignment());
-
-        records = consumer.poll(Duration.ofSeconds(10));
-
-        for (ConsumerRecord<String, String> record : records) {
-            logger.info(record.value());
-        }
-    }
-
-    private static void publishMessages() {
-        for (int i = 1; i <= messagesInTopic; i++) {
-            ProducerRecord<String, String> record = new ProducerRecord<>(TOPIC, String.valueOf(i));
-            producer.send(record);
-        }
-    }
-
-    private static void setup() {
-        Properties producerProperties = new Properties();
-        producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
-        producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-        producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-
-        Properties consumerProperties = new Properties();
-        consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
-        consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
-        consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
-        consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-        consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, UUID.randomUUID()
-          .toString());
-
-        producer = new KafkaProducer<>(producerProperties);
-        consumer = new KafkaConsumer<>(consumerProperties);
-    }
-
-}

apache-kafka-2/src/main/java/com/baeldung/kafka/consumer/SimpleConsumerWithBootStrapServers.java

@@ -1,39 +0,0 @@
-package com.baeldung.kafka.consumer;
-
-import org.apache.kafka.clients.consumer.*;
-import org.apache.kafka.common.serialization.LongDeserializer;
-import org.apache.kafka.common.serialization.StringDeserializer;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Properties;
-
-public class SimpleConsumerWithBootStrapServers {
-
-    public static void main(String[] args) {
-        try(final Consumer<Long, String> consumer = createConsumer()) {
-            ConsumerRecords<Long, String> records = consumer.poll(Duration.ofMinutes(1));
-            for(ConsumerRecord<Long, String> record : records) {
-                System.out.println(record.value());
-            }
-        }
-    }
-
-    private static Consumer<Long, String> createConsumer() {
-        final Properties props = new Properties();
-        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
-                "localhost:9092,another-host.com:29092");
-        props.put(ConsumerConfig.GROUP_ID_CONFIG,
-                "MySampleConsumer");
-        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
-                LongDeserializer.class.getName());
-        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
-                StringDeserializer.class.getName());
-        // Create the consumer using props.
-        final Consumer<Long, String> consumer = new KafkaConsumer<Long, String>(props);
-        // Subscribe to the topic.
-        consumer.subscribe(Arrays.asList("samples"));
-        return consumer;
-    }
-
-}

apache-kafka-2/src/main/java/com/baeldung/kafka/message/MessageWithKey.java

@@ -1,106 +0,0 @@
-package com.baeldung.kafka.message;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Properties;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import org.apache.kafka.clients.admin.Admin;
-import org.apache.kafka.clients.admin.AdminClientConfig;
-import org.apache.kafka.clients.admin.NewTopic;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.clients.producer.RecordMetadata;
-import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MessageWithKey {
-
-    private static Logger logger = LoggerFactory.getLogger(MessageWithKey.class);
-
-    private static String TOPIC = "baeldung";
-    private static int PARTITIONS = 5;
-    private static short REPLICATION_FACTOR = 1;
-
-    private static String MESSAGE_KEY = "message-key";
-
-    private static Admin admin;
-    private static KafkaProducer<String, String> producer;
-    private static KafkaConsumer<String, String> consumer;
-
-    public static void main(String[] args) throws ExecutionException, InterruptedException {
-        setup();
-
-        publishMessagesWithoutKey();
-
-        consumeMessages();
-
-        publishMessagesWithKey();
-
-        consumeMessages();
-    }
-
-    private static void consumeMessages() {
-        consumer.subscribe(Arrays.asList(TOPIC));
-
-        ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(5));
-        for (ConsumerRecord<String, String> record : records) {
-            logger.info("Key : {}, Value : {}", record.key(), record.value());
-        }
-    }
-
-    private static void publishMessagesWithKey() throws ExecutionException, InterruptedException {
-        for (int i = 1; i <= 10; i++) {
-            ProducerRecord<String, String> record = new ProducerRecord<>(TOPIC, MESSAGE_KEY, String.valueOf(i));
-            Future<RecordMetadata> future = producer.send(record);
-            RecordMetadata metadata = future.get();
-
-            logger.info(String.valueOf(metadata.partition()));
-        }
-    }
-
-    private static void publishMessagesWithoutKey() throws ExecutionException, InterruptedException {
-        for (int i = 1; i <= 10; i++) {
-            ProducerRecord<String, String> record = new ProducerRecord<>(TOPIC, String.valueOf(i));
-            Future<RecordMetadata> future = producer.send(record);
-            RecordMetadata metadata = future.get();
-
-            logger.info(String.valueOf(metadata.partition()));
-        }
-    }
-
-    private static void setup() {
-        Properties adminProperties = new Properties();
-        adminProperties.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
-
-        Properties producerProperties = new Properties();
-        producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
-        producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-        producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-
-        Properties consumerProperties = new Properties();
-        consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
-        consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
-        consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
-        consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-        consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, UUID.randomUUID()
-          .toString());
-
-        admin = Admin.create(adminProperties);
-        producer = new KafkaProducer<>(producerProperties);
-        consumer = new KafkaConsumer<>(consumerProperties);
-
-        admin.createTopics(Collections.singleton(new NewTopic(TOPIC, PARTITIONS, REPLICATION_FACTOR)));
-    }
-
-}

apache-kafka-2/src/test/java/com/baeldung/kafka/KafaConsumeLastNMessages.java

@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Testcontainers
-public class KafaConsumeLastNMessagesLiveTest {
+public class KafaConsumeLastNMessages {
 
     private static String TOPIC1 = "baeldung-github";
     private static String TOPIC2 = "baeldung-blog";

apache-kafka-2/src/test/java/com/baeldung/kafka/KafkaCountPartitionsLiveTest.java

@@ -1,83 +0,0 @@
-package com.baeldung.kafka;
-
-import org.apache.kafka.clients.admin.AdminClient;
-import org.apache.kafka.clients.admin.DescribeTopicsResult;
-import org.apache.kafka.clients.admin.TopicDescription;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.common.KafkaFuture;
-import org.apache.kafka.common.PartitionInfo;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.KafkaContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-
-@Testcontainers
-public class KafkaCountPartitionsLiveTest {
-    @Container
-    private static final KafkaContainer KAFKA_CONTAINER = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"));
-    private final static String TOPIC = "baeldung-kafka-github";
-    private final static Integer PARTITION_NUMBER = 3;
-    private static KafkaProducer<String, String> producer;
-
-    @BeforeAll
-    static void setup() throws IOException, InterruptedException {
-        KAFKA_CONTAINER.addExposedPort(9092);
-
-        KAFKA_CONTAINER.execInContainer(
-                "/bin/sh",
-                "-c",
-                "/usr/bin/kafka-topics " +
-                        "--bootstrap-server localhost:9092 " +
-                        "--create " +
-                        "--replication-factor 1 " +
-                        "--partitions " + PARTITION_NUMBER + " " +
-                        "--topic " + TOPIC
-        );
-
-        Properties producerProperties = new Properties();
-        producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
-        producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-        producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-
-        producer = new KafkaProducer<>(producerProperties);
-    }
-
-    @AfterAll
-    static void destroy() {
-        KAFKA_CONTAINER.stop();
-    }
-
-    @Test
-    void testPartitionsForTopic_isEqualToActualNumberAssignedDuringCreation() {
-        List<PartitionInfo> info = producer.partitionsFor(TOPIC);
-        Assertions.assertEquals(PARTITION_NUMBER, info.size());
-    }
-
-    @Test
-    void testTopicPartitionDescription_isEqualToActualNumberAssignedDuringCreation() {
-        Properties props = new Properties();
-        props.put("bootstrap.servers", KAFKA_CONTAINER.getBootstrapServers());
-        props.put("client.id","java-admin-client");
-        props.put("request.timeout.ms", 3000);
-        props.put("connections.max.idle.ms", 5000);
-        try(AdminClient client = AdminClient.create(props)){
-            DescribeTopicsResult describeTopicsResult = client.describeTopics(Collections.singletonList(TOPIC));
-            Map<String, KafkaFuture<TopicDescription>> values = describeTopicsResult.values();
-            KafkaFuture<TopicDescription> topicDescription = values.get(TOPIC);
-            Assertions.assertEquals(PARTITION_NUMBER, topicDescription.get().partitions().size());
-        } catch (ExecutionException | InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}

apache-kafka-2/src/test/java/com/baeldung/kafka/consumer/ConsumeFromBeginningLiveTest.java

@@ -1,109 +0,0 @@
-package com.baeldung.kafka.consumer;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Properties;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.KafkaContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
-
-// This live test needs a Docker Daemon running so that a kafka container can be created
-
-@Testcontainers
-public class ConsumeFromBeginningLiveTest {
-
-    private static Logger logger = LoggerFactory.getLogger(ConsumeFromBeginningLiveTest.class);
-
-    private static String TOPIC = "baeldung";
-    private static int messagesInTopic = 10;
-
-    private static KafkaProducer<String, String> producer;
-    private static KafkaConsumer<String, String> consumer;
-
-    @Container
-    private static final KafkaContainer KAFKA_CONTAINER = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"));
-
-    @BeforeAll
-    static void setup() {
-        KAFKA_CONTAINER.addExposedPort(9092);
-
-        Properties producerProperties = new Properties();
-        producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
-        producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-        producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-
-        Properties consumerProperties = new Properties();
-        consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
-        consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
-        consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
-        consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-        consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, UUID.randomUUID()
-          .toString());
-
-        producer = new KafkaProducer<>(producerProperties);
-        consumer = new KafkaConsumer<>(consumerProperties);
-    }
-
-    private static void publishMessages() throws ExecutionException, InterruptedException {
-        for (int i = 1; i <= messagesInTopic; i++) {
-            ProducerRecord<String, String> record = new ProducerRecord<>(TOPIC, String.valueOf(i));
-            producer.send(record)
-              .get();
-        }
-    }
-
-    @AfterAll
-    static void destroy() {
-        KAFKA_CONTAINER.stop();
-    }
-
-    @Test
-    void givenMessages_whenConsumedFromBeginning_thenCheckIfConsumedFromBeginning() throws ExecutionException, InterruptedException {
-
-        publishMessages();
-
-        consumer.subscribe(Arrays.asList(TOPIC));
-
-        ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(10));
-
-        int messageCount = 0;
-        for (ConsumerRecord<String, String> record : records) {
-            logger.info(record.value());
-            messageCount++;
-        }
-
-        assertEquals(messagesInTopic, messageCount);
-
-        consumer.seekToBeginning(consumer.assignment());
-
-        records = consumer.poll(Duration.ofSeconds(10));
-
-        messageCount = 0;
-        for (ConsumerRecord<String, String> record : records) {
-            logger.info(record.value());
-            messageCount++;
-        }
-
-        assertEquals(messagesInTopic, messageCount);
-    }
-}

apache-kafka-2/src/test/java/com/baeldung/kafka/message/MessageWithKeyLiveTest.java

@@ -1,130 +0,0 @@
-package com.baeldung.kafka.message;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Properties;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-import org.apache.kafka.clients.admin.Admin;
-import org.apache.kafka.clients.admin.AdminClientConfig;
-import org.apache.kafka.clients.admin.NewTopic;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.clients.producer.RecordMetadata;
-import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.serialization.StringSerializer;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.KafkaContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
-
-// This live test needs a Docker Daemon running so that a kafka container can be created
-
-@Testcontainers
-public class MessageWithKeyLiveTest {
-
-    private static String TOPIC = "baeldung";
-    private static int PARTITIONS = 5;
-    private static short REPLICATION_FACTOR = 1;
-
-    private static String MESSAGE_KEY = "message-key";
-    private static String MESSAGE_VALUE = "Hello World";
-
-    private static Admin admin;
-    private static KafkaProducer<String, String> producer;
-    private static KafkaConsumer<String, String> consumer;
-
-    @Container
-    private static final KafkaContainer KAFKA_CONTAINER = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"));
-
-    @BeforeAll
-    static void setup() {
-        KAFKA_CONTAINER.addExposedPort(9092);
-
-        Properties adminProperties = new Properties();
-        adminProperties.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
-
-        Properties producerProperties = new Properties();
-        producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
-        producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-        producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
-
-        Properties consumerProperties = new Properties();
-        consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
-        consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
-        consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
-        consumerProperties.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
-        consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, UUID.randomUUID()
-          .toString());
-
-        admin = Admin.create(adminProperties);
-        producer = new KafkaProducer<>(producerProperties);
-        consumer = new KafkaConsumer<>(consumerProperties);
-
-        admin.createTopics(Collections.singleton(new NewTopic(TOPIC, PARTITIONS, REPLICATION_FACTOR)));
-    }
-
-    @AfterAll
-    static void destroy() {
-        KAFKA_CONTAINER.stop();
-    }
-
-    @Test
-    void givenAMessageWithKey_whenPublishedToKafkaAndConsumed_thenCheckForKey() throws ExecutionException, InterruptedException {
-
-        ProducerRecord<String, String> producerRecord = new ProducerRecord<>(TOPIC, MESSAGE_KEY, MESSAGE_VALUE);
-        Future<RecordMetadata> future = producer.send(producerRecord);
-
-        RecordMetadata metadata = future.get();
-
-        assertNotNull(metadata);
-
-        consumer.subscribe(Arrays.asList(TOPIC));
-
-        ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(5));
-        for (ConsumerRecord<String, String> consumerRecord : records) {
-            assertEquals(MESSAGE_KEY, consumerRecord.key());
-            assertEquals(MESSAGE_VALUE, consumerRecord.value());
-        }
-    }
-
-    @Test
-    void givenAListOfMessageWithKeys_whenPublishedToKafka_thenCheckedIfPublishedToSamePartition() throws ExecutionException, InterruptedException {
-
-        boolean isSamePartition = true;
-        int partition = 0;
-
-        for (int i = 1; i <= 10; i++) {
-            ProducerRecord<String, String> producerRecord = new ProducerRecord<>(TOPIC, MESSAGE_KEY, MESSAGE_VALUE);
-            Future<RecordMetadata> future = producer.send(producerRecord);
-
-            RecordMetadata metadata = future.get();
-
-            assertNotNull(metadata);
-            if (i == 1) {
-                partition = metadata.partition();
-            } else {
-                if (partition != metadata.partition()) {
-                    isSamePartition = false;
-                }
-            }
-        }
-
-        assertTrue(isSamePartition);
-    }
-}

apache-libraries-2/README.md

@@ -1,2 +0,0 @@
-## Relevant Articles
-- [Understanding XSLT Processing in Java](https://www.baeldung.com/java-extensible-stylesheet-language-transformations)

apache-libraries-2/pom.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>apache-libraries-2</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>apache-libraries-2</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>${javax.validation.validation-api.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <javax.validation.validation-api.version>2.0.1.Final</javax.validation.validation-api.version>
-    </properties>
-
-</project>

apache-libraries-2/src/main/java/com/baeldung/xslt/XSLTProcessor.java

@@ -1,18 +0,0 @@
-package com.baeldung.xslt;
-
-import javax.xml.transform.*;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.File;
-
-public class XSLTProcessor {
-    public static void transformXMLUsingXSLT(String inputXMLPath, String xsltPath, String outputHTMLPath) throws TransformerException {
-        Source xmlSource = new StreamSource(new File(inputXMLPath));
-        Source xsltSource = new StreamSource(new File(xsltPath));
-        Result output = new StreamResult(new File(outputHTMLPath));
-
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
-        Transformer transformer = transformerFactory.newTransformer(xsltSource);
-        transformer.transform(xmlSource, output);
-    }
-}

apache-libraries-2/src/main/java/com/baeldung/xsltProcessing/XSLTProcessorWithParametersAndOption.java

@@ -1,31 +0,0 @@
-package com.baeldung.xsltProcessing;
-
-import javax.xml.transform.*;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.File;
-
-public class XSLTProcessorWithParametersAndOption {
-    public static void transformXMLWithParametersAndOption(
-            String inputXMLPath,
-            String xsltPath,
-            String outputHTMLPath,
-            String companyName,
-            boolean enableIndentation
-    ) throws TransformerException {
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
-        Source xsltSource = new StreamSource(new File(xsltPath));
-        Transformer transformer = transformerFactory.newTransformer(xsltSource);
-
-        transformer.setParameter("companyName", companyName);
-
-        if (enableIndentation) {
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-        }
-
-        Source xmlSource = new StreamSource(new File(inputXMLPath));
-        Result outputResult = new StreamResult(new File(outputHTMLPath));
-
-        transformer.transform(xmlSource, outputResult);
-    }
-}

apache-libraries-2/src/main/java/com/baeldung/xsltProcessing/XSLTProcessorWithTemplate.java

@@ -1,21 +0,0 @@
-package com.baeldung.xsltProcessing;
-
-import javax.xml.transform.*;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.File;
-
-public class XSLTProcessorWithTemplate {
-    public static void transformXMLUsingTemplate(String inputXMLPath, String xsltPath, String outputHTMLPath) throws TransformerException {
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
-        Source xsltSource = new StreamSource(new File(xsltPath));
-        Templates templates = transformerFactory.newTemplates(xsltSource);
-
-        Transformer transformer = templates.newTransformer();
-
-        Source xmlSource = new StreamSource(new File(inputXMLPath));
-        Result outputResult = new StreamResult(new File(outputHTMLPath));
-
-        transformer.transform(xmlSource, outputResult);
-    }
-}

apache-libraries-2/src/main/resources/avroHttpRequest-schema.avsc

@@ -1,47 +0,0 @@
-{
-  "type":"record",
-  "name":"AvroHttpRequest",
-  "namespace":"com.baeldung.avro.model",
-  "fields":[
-    {
-      "name":"requestTime",
-      "type":"long"
-    },
-    {
-      "name":"clientIdentifier",
-      "type":{
-        "type":"record",
-        "name":"ClientIdentifier",
-        "fields":[
-          {
-            "name":"hostName",
-            "type":"string"
-          },
-          {
-            "name":"ipAddress",
-            "type":"string"
-          }
-        ]
-      }
-    },
-    {
-      "name":"employeeNames",
-      "type":{
-        "type":"array",
-        "items":"string"
-      },
-      "default":null
-    },
-    {
-      "name":"active",
-      "type":{
-        "type":"enum",
-        "name":"Active",
-        "symbols":[
-          "YES",
-          "NO"
-        ]
-      }
-    }
-  ]
-}

apache-libraries-2/src/main/resources/log4j2.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Configuration status="WARN">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Logger name="org.apache.meecrowave" level="warn">
-            <AppenderRef ref="Console"/>
-        </Logger>
-
-        <Root level="info">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>

apache-libraries-2/src/test/java/com/baeldung/xslt/XSLTProcessorUnitTest.java

@@ -1,29 +0,0 @@
-package com.baeldung.xslt;
-
-import org.junit.jupiter.api.Test;
-
-import javax.xml.transform.TransformerException;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class XSLTProcessorUnitTest {
-
-    @Test
-    public void givenValidInputAndStylesheet_whenTransformingXML_thenOutputHTMLCreated() throws TransformerException, IOException {
-        // Given
-        String inputXMLPath = "src/test/resources/input.xml";
-        String xsltPath = "src/test/resources/stylesheet.xslt";
-        String outputHTMLPath = "src/test/resources/output.html";
-
-      
-        XSLTProcessor.transformXMLUsingXSLT(inputXMLPath, xsltPath, outputHTMLPath);
-
-      
-        Path outputFile = Paths.get(outputHTMLPath);
-        assertTrue(Files.exists(outputFile));
-    }
-}

apache-libraries-2/src/test/resources/input.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-    <person gender="male">
-        <name>John Doe</name>
-        <age>30</age>
-    </person>
-    <person gender="female">
-        <name>Jane Smith</name>
-        <age>25</age>
-    </person>
-</root>

apache-libraries-2/src/test/resources/output.html

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <p>Male person: John Doe, Age: 30</p>
-    <p>Female person: Jane Smith, Age: 25</p>

apache-libraries-2/src/test/resources/stylesheet.xslt

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:template match="person[@gender='male']">
-        <xsl:element name="p">
-            <xsl:text>Male person: </xsl:text>
-            <xsl:value-of select="name"/>
-            <xsl:text>, Age: </xsl:text>
-            <xsl:value-of select="age"/>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="person[@gender='female']">
-        <xsl:element name="p">
-            <xsl:text>Female person: </xsl:text>
-            <xsl:value-of select="name"/>
-            <xsl:text>, Age: </xsl:text>
-            <xsl:value-of select="age"/>
-        </xsl:element>
-    </xsl:template>
-
-</xsl:stylesheet>

apache-poi-2/README.md

@@ -12,6 +12,4 @@ This module contains articles about Apache POI.
 - [Finding the Last Row in an Excel Spreadsheet From Java](https://www.baeldung.com/java-excel-find-last-row)
 - [Setting Formulas in Excel with Apache POI](https://www.baeldung.com/java-apache-poi-set-formulas)
 - [Set the Date Format Using Apache POI](https://www.baeldung.com/java-apache-poi-date-format)
-- [Replacing Variables in a Document Template with Java](https://www.baeldung.com/java-replace-pattern-word-document-doc-docx)
-- [Lock Header Rows With Apache POI](https://www.baeldung.com/java-apache-poi-lock-header-rows)
 - More articles: [[<-- prev]](../apache-poi)

apache-poi-2/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apache-poi-2</artifactId>
@@ -19,15 +19,10 @@
             <artifactId>poi-ooxml</artifactId>
             <version>${poi.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-scratchpad</artifactId>
-            <version>${poi.version}</version>
-        </dependency>
     </dependencies>
 
     <properties>
-        <poi.version>5.2.3</poi.version>
+        <poi.version>5.2.0</poi.version>
     </properties>
 
 </project>

apache-poi-2/src/main/java/com/baeldung/poi/excel/locksheet/LockSheet.java

@@ -1,19 +0,0 @@
-package com.baeldung.poi.excel.locksheet;
-
-import org.apache.poi.ss.usermodel.*;
-
-public class LockSheet {
-
-    public void lockFirstRow(Sheet sheet) {
-        sheet.createFreezePane(0, 1);
-    }
-
-    public void lockTwoRows(Sheet sheet) {
-        sheet.createFreezePane(0, 2);
-    }
-
-    public void lockFirstColumn(Sheet sheet) {
-        sheet.createFreezePane(1, 0);
-    }
-
-}

apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocTextReplacer.java

@@ -1,38 +0,0 @@
-package com.baeldung.poi.replacevariables;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-
-public class DocTextReplacer {
-
-    public void replaceText() throws IOException {
-        String filePath = getClass().getClassLoader()
-          .getResource("baeldung.doc")
-          .getPath();
-        try (InputStream inputStream = new FileInputStream(filePath); POIFSFileSystem fileSystem = new POIFSFileSystem(inputStream)) {
-            HWPFDocument doc = new HWPFDocument(fileSystem);
-            doc = replaceText(doc, "Baeldung", "Hello");
-            saveFile(filePath, doc);
-            doc.close();
-        }
-    }
-
-    private HWPFDocument replaceText(HWPFDocument doc, String originalText, String updatedText) {
-        Range range = doc.getRange();
-        range.replaceText(originalText, updatedText);
-        return doc;
-    }
-
-    private void saveFile(String filePath, HWPFDocument doc) throws IOException {
-        try (FileOutputStream out = new FileOutputStream(filePath)) {
-            doc.write(out);
-        }
-    }
-
-}

apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocxNaiveTextReplacer.java

@@ -1,63 +0,0 @@
-package com.baeldung.poi.replacevariables;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
-import org.apache.poi.xwpf.usermodel.XWPFTableRow;
-
-public class DocxNaiveTextReplacer {
-
-    public void replaceText() throws IOException {
-        String filePath = getClass().getClassLoader()
-          .getResource("baeldung-copy.docx")
-          .getPath();
-        try (InputStream inputStream = new FileInputStream(filePath)) {
-            XWPFDocument doc = new XWPFDocument(inputStream);
-            doc = replaceText(doc, "Baeldung", "Hello");
-            saveFile(filePath, doc);
-            doc.close();
-        }
-    }
-
-    private XWPFDocument replaceText(XWPFDocument doc, String originalText, String updatedText) {
-        replaceTextInParagraphs(doc.getParagraphs(), originalText, updatedText);
-        for (XWPFTable tbl : doc.getTables()) {
-            for (XWPFTableRow row : tbl.getRows()) {
-                for (XWPFTableCell cell : row.getTableCells()) {
-                    replaceTextInParagraphs(cell.getParagraphs(), originalText, updatedText);
-                }
-            }
-        }
-        return doc;
-    }
-
-    private void replaceTextInParagraphs(List<XWPFParagraph> paragraphs, String originalText, String updatedText) {
-        paragraphs.forEach(paragraph -> replaceTextInParagraph(paragraph, originalText, updatedText));
-    }
-
-    private void replaceTextInParagraph(XWPFParagraph paragraph, String originalText, String updatedText) {
-        List<XWPFRun> runs = paragraph.getRuns();
-        for (XWPFRun run : runs) {
-            String text = run.getText(0);
-            if (text != null && text.contains(originalText)) {
-                String updatedRunText = text.replace(originalText, updatedText);
-                run.setText(updatedRunText, 0);
-            }
-        }
-    }
-
-    private void saveFile(String filePath, XWPFDocument doc) throws IOException {
-        try (FileOutputStream out = new FileOutputStream(filePath)) {
-            doc.write(out);
-        }
-    }
-
-}

apache-poi-2/src/main/java/com/baeldung/poi/replacevariables/DocxTextReplacer.java

@@ -1,65 +0,0 @@
-package com.baeldung.poi.replacevariables;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Objects;
-
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
-import org.apache.poi.xwpf.usermodel.XWPFTableRow;
-
-public class DocxTextReplacer {
-
-    public void replaceText() throws IOException {
-        String filePath = getClass().getClassLoader()
-          .getResource("baeldung.docx")
-          .getPath();
-        try (InputStream inputStream = new FileInputStream(filePath)) {
-            XWPFDocument doc = new XWPFDocument(inputStream);
-            doc = replaceText(doc, "Baeldung", "Hello");
-            saveFile(filePath, doc);
-            doc.close();
-        }
-    }
-
-    private XWPFDocument replaceText(XWPFDocument doc, String originalText, String updatedText) {
-        replaceTextInParagraphs(doc.getParagraphs(), originalText, updatedText);
-        for (XWPFTable tbl : doc.getTables()) {
-            for (XWPFTableRow row : tbl.getRows()) {
-                for (XWPFTableCell cell : row.getTableCells()) {
-                    replaceTextInParagraphs(cell.getParagraphs(), originalText, updatedText);
-                }
-            }
-        }
-        return doc;
-    }
-
-    private void replaceTextInParagraphs(List<XWPFParagraph> paragraphs, String originalText, String updatedText) {
-        paragraphs.forEach(paragraph -> replaceTextInParagraph(paragraph, originalText, updatedText));
-    }
-
-    private void replaceTextInParagraph(XWPFParagraph paragraph, String originalText, String updatedText) {
-        String paragraphText = paragraph.getParagraphText();
-        if (paragraphText.contains(originalText)) {
-            String updatedParagraphText = paragraphText.replace(originalText, updatedText);
-            while (paragraph.getRuns().size() > 0) {
-                paragraph.removeRun(0);
-            }
-            XWPFRun newRun = paragraph.createRun();
-            newRun.setText(updatedParagraphText);
-        }
-    }
-
-    private void saveFile(String filePath, XWPFDocument doc) throws IOException {
-        try (FileOutputStream out = new FileOutputStream(filePath)) {
-            doc.write(out);
-        }
-    }
-
-}

apache-poi-2/src/test/java/com/baeldung/poi/excel/locksheet/LockSheetUnitTest.java

@@ -1,53 +0,0 @@
-package com.baeldung.poi.excel.locksheet;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.IOException;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.jupiter.api.*;
-
-class LockSheetUnitTest {
-
-    private LockSheet lockSheet;
-    private Workbook workbook;
-    private Sheet sheet;
-
-    @BeforeEach
-    void setup() {
-        workbook = new XSSFWorkbook();
-        sheet = workbook.createSheet();
-        Row row = sheet.createRow(0);
-        row.createCell(0).setCellValue("row 1 col 1");
-        row.createCell(1).setCellValue("row 1 col 2");
-        row = sheet.createRow(1);
-        row.createCell(0).setCellValue("row 2 col 1");
-        row.createCell(1).setCellValue("row 2 col 2");
-        lockSheet = new LockSheet();
-    }
-
-    @AfterEach
-    void cleanup() throws IOException {
-        workbook.close();
-    }
-
-    @Test
-    void whenLockFirstRow_thenFirstRowIsLocked() {
-        lockSheet.lockFirstRow(sheet);
-        assertEquals(sheet.getPaneInformation().getHorizontalSplitPosition(), 1);
-    }
-
-    @Test
-    void whenLockTwoRows_thenTwoRowsAreLocked() {
-        lockSheet.lockTwoRows(sheet);
-        assertEquals(sheet.getPaneInformation().getHorizontalSplitPosition(), 2);
-    }
-
-    @Test
-    void whenLockFirstColumn_thenFirstColumnIsLocked() {
-        lockSheet.lockFirstColumn(sheet);
-        assertEquals(sheet.getPaneInformation().getVerticalSplitPosition(), 1);
-    }
-
-}

apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocTextReplacerUnitTest.java

@@ -1,31 +0,0 @@
-package com.baeldung.poi.replacevariables;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.extractor.WordExtractor;
-import org.junit.jupiter.api.Test;
-
-class DocTextReplacerUnitTest {
-
-    @Test
-    void whenReplaceText_ThenTextReplaced() throws IOException {
-        new DocTextReplacer().replaceText();
-
-        String filePath = getClass().getClassLoader()
-          .getResource("baeldung.doc")
-          .getPath();
-        try (FileInputStream fis = new FileInputStream(filePath); HWPFDocument document = new HWPFDocument(fis); WordExtractor extractor = new WordExtractor(document)) {
-            long occurrencesOfHello = Arrays.stream(extractor.getText()
-                .split("\\s+"))
-              .filter(s -> s.contains("Hello"))
-              .count();
-            assertEquals(5, occurrencesOfHello);
-        }
-    }
-
-}

apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocxNaiveTextReplacerUnitTest.java

@@ -1,31 +0,0 @@
-package com.baeldung.poi.replacevariables;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.junit.jupiter.api.Test;
-
-class DocxNaiveTextReplacerUnitTest {
-
-    @Test
-    void whenReplaceText_ThenTextReplaced() throws IOException {
-        new DocxNaiveTextReplacer().replaceText();
-
-        String filePath = getClass().getClassLoader()
-          .getResource("baeldung-copy.docx")
-          .getPath();
-        try (FileInputStream fis = new FileInputStream(filePath); XWPFDocument document = new XWPFDocument(fis); XWPFWordExtractor extractor = new XWPFWordExtractor(document)) {
-            long occurrencesOfHello = Arrays.stream(extractor.getText()
-                .split("\\s+"))
-              .filter(s -> s.contains("Hello"))
-              .count();
-            assertTrue(occurrencesOfHello < 5);
-        }
-    }
-
-}

apache-poi-2/src/test/java/com/baeldung/poi/replacevariables/DocxTestReplacerUnitTest.java

@@ -1,31 +0,0 @@
-package com.baeldung.poi.replacevariables;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.junit.jupiter.api.Test;
-
-class DocxTestReplacerUnitTest {
-
-    @Test
-    void whenReplaceText_ThenTextReplaced() throws IOException {
-        new DocxTextReplacer().replaceText();
-
-        String filePath = getClass().getClassLoader()
-          .getResource("baeldung.docx")
-          .getPath();
-        try (FileInputStream fis = new FileInputStream(filePath); XWPFDocument document = new XWPFDocument(fis); XWPFWordExtractor extractor = new XWPFWordExtractor(document)) {
-            long occurrencesOfHello = Arrays.stream(extractor.getText()
-                .split("\\s+"))
-              .filter(s -> s.contains("Hello"))
-              .count();
-            assertEquals(5, occurrencesOfHello);
-        }
-    }
-
-}

apache-spark/pom.xml

@@ -17,17 +17,17 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-core_2.12</artifactId>
+            <artifactId>spark-core_2.11</artifactId>
             <version>${org.apache.spark.spark-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-sql_2.12</artifactId>
+            <artifactId>spark-sql_2.11</artifactId>
             <version>${org.apache.spark.spark-sql.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-graphx_2.12</artifactId>
+            <artifactId>spark-graphx_2.11</artifactId>
             <version>${org.apache.spark.spark-graphx.version}</version>
         </dependency>
         <dependency>
@@ -37,22 +37,22 @@
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-streaming_2.12</artifactId>
+            <artifactId>spark-streaming_2.11</artifactId>
             <version>${org.apache.spark.spark-streaming.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-mllib_2.12</artifactId>
+            <artifactId>spark-mllib_2.11</artifactId>
             <version>${org.apache.spark.spark-mllib.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-streaming-kafka-0-10_2.12</artifactId>
+            <artifactId>spark-streaming-kafka-0-10_2.11</artifactId>
             <version>${org.apache.spark.spark-streaming-kafka.version}</version>
         </dependency>
         <dependency>
             <groupId>com.datastax.spark</groupId>
-            <artifactId>spark-cassandra-connector_2.12</artifactId>
+            <artifactId>spark-cassandra-connector_2.11</artifactId>
             <version>${com.datastax.spark.spark-cassandra-connector.version}</version>
         </dependency>
         <dependency>
@@ -97,17 +97,17 @@
     </repositories>
 
     <properties>
-        <org.apache.spark.spark-core.version>3.3.2</org.apache.spark.spark-core.version>
-        <org.apache.spark.spark-sql.version>3.3.2</org.apache.spark.spark-sql.version>
-        <org.apache.spark.spark-streaming.version>3.3.2</org.apache.spark.spark-streaming.version>
-        <org.apache.spark.spark-mllib.version>3.3.2</org.apache.spark.spark-mllib.version>
-        <org.apache.spark.spark-graphx.version>3.3.2</org.apache.spark.spark-graphx.version>
+        <org.apache.spark.spark-core.version>2.4.8</org.apache.spark.spark-core.version>
+        <org.apache.spark.spark-sql.version>2.4.8</org.apache.spark.spark-sql.version>
+        <org.apache.spark.spark-streaming.version>2.4.8</org.apache.spark.spark-streaming.version>
+        <org.apache.spark.spark-mllib.version>2.4.8</org.apache.spark.spark-mllib.version>
+        <org.apache.spark.spark-graphx.version>2.4.8</org.apache.spark.spark-graphx.version>
         <graphframes.version>0.8.1-spark3.0-s_2.12</graphframes.version>
-        <org.apache.spark.spark-streaming-kafka.version>3.3.2</org.apache.spark.spark-streaming-kafka.version>
-        <com.datastax.spark.spark-cassandra-connector.version>3.3.0</com.datastax.spark.spark-cassandra-connector.version>
+        <org.apache.spark.spark-streaming-kafka.version>2.4.8</org.apache.spark.spark-streaming-kafka.version>
+        <com.datastax.spark.spark-cassandra-connector.version>2.5.2</com.datastax.spark.spark-cassandra-connector.version>
         <com.datastax.spark.spark-cassandra-connector-java.version>1.6.0-M1</com.datastax.spark.spark-cassandra-connector-java.version>
         <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
-        <postgres.version>42.5.4</postgres.version>
+        <postgres.version>42.3.3</postgres.version>
     </properties>
 
 </project>

apache-spark/src/main/java/com/baeldung/data/pipeline/WordCountingAppWithCheckpoint.java

@@ -16,11 +16,8 @@ import org.apache.log4j.Logger;
 import org.apache.spark.SparkConf;
 import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.api.java.JavaSparkContext;
-import org.apache.spark.api.java.Optional;
 import org.apache.spark.api.java.function.Function2;
-import org.apache.spark.api.java.function.Function3;
 import org.apache.spark.streaming.Durations;
-import org.apache.spark.streaming.State;
 import org.apache.spark.streaming.StateSpec;
 import org.apache.spark.streaming.api.java.JavaDStream;
 import org.apache.spark.streaming.api.java.JavaInputDStream;
@@ -77,8 +74,7 @@ public class WordCountingAppWithCheckpoint {
         JavaPairDStream<String, Integer> wordCounts = words.mapToPair(s -> new Tuple2<>(s, 1))
             .reduceByKey((Function2<Integer, Integer, Integer>) (i1, i2) -> i1 + i2);
 
-        JavaMapWithStateDStream<String, Integer, Integer, Tuple2<String, Integer>> cumulativeWordCounts =
-                wordCounts.mapWithState(StateSpec.function((Function3<String, Optional<Integer>, State<Integer>, Tuple2<String, Integer>>) (word, one, state) -> {
+        JavaMapWithStateDStream<String, Integer, Integer, Tuple2<String, Integer>> cumulativeWordCounts = wordCounts.mapWithState(StateSpec.function((word, one, state) -> {
             int sum = one.orElse(0) + (state.exists() ? state.get() : 0);
             Tuple2<String, Integer> output = new Tuple2<>(word, sum);
             state.update(sum);

apache-spark/src/main/java/com/baeldung/dataframes/SparkDriver.java

@@ -9,7 +9,6 @@ public class SparkDriver implements Serializable {
     public static SparkSession getSparkSession() {
         return SparkSession.builder()
             .appName("Customer Aggregation pipeline")
-                .config("spark.sql.legacy.timeParserPolicy", "LEGACY")
             .master("local")
             .getOrCreate();
 

apache-velocity/pom.xml

@@ -63,6 +63,7 @@
         <org.apache.httpcomponents.version>4.5.2</org.apache.httpcomponents.version>
         <velocity-version>1.7</velocity-version>
         <velocity-tools-version>2.0</velocity-tools-version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>

asm/pom.xml

@@ -49,6 +49,7 @@
 
     <properties>
         <asm.version>5.2</asm.version>
+        <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
     </properties>
 
 </project>

aws-modules/aws-miscellaneous/pom.xml

@@ -100,11 +100,20 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>dynamodb-local</id>
+            <name>DynamoDB Local Release Repository</name>
+            <url>${dynamodblocal.repository.url}</url>
+        </repository>
+    </repositories>
+
     <properties>
         <aws-lambda-java-events.version>1.3.0</aws-lambda-java-events.version>
         <aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
         <gson.version>2.8.0</gson.version>
-        <dynamodblocal.version>1.21.1</dynamodblocal.version>
+        <dynamodblocal.version>1.11.86</dynamodblocal.version>
+        <dynamodblocal.repository.url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</dynamodblocal.repository.url>
         <commons-codec-version>1.10.L001</commons-codec-version>
         <jets3t-version>0.9.4.0006L</jets3t-version>
         <maven-plugins-version>3.1.1</maven-plugins-version>

aws-modules/aws-s3-update-object/pom.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>aws-s3-update-object</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>aws-s3-update-object</name>
-    <description>Project demonstrating overwriting of S3 objects</description>
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
-    </parent>
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk</artifactId>
-            <version>${aws-java-sdk-version}</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-    <properties>
-        <aws-java-sdk-version>1.12.523</aws-java-sdk-version>
-    </properties>
-</project>

aws-modules/aws-s3-update-object/src/main/java/com/baeldung/awss3updateobject/AwsS3UpdateObjectApplication.java

@@ -1,13 +0,0 @@
-package com.baeldung.awss3updateobject;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class AwsS3UpdateObjectApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(AwsS3UpdateObjectApplication.class, args);
-	}
-
-}

aws-modules/aws-s3-update-object/src/main/java/com/baeldung/awss3updateobject/controller/FileController.java

@@ -1,24 +0,0 @@
-package com.baeldung.awss3updateobject.controller;
-
-import com.baeldung.awss3updateobject.service.FileService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-@RestController
-@RequestMapping("api/v1/file")
-public class FileController {
-
-    @Autowired
-    FileService fileService;
-
-    @PostMapping("/upload")
-    public String uploadFile(@RequestParam("file") MultipartFile multipartFile) throws Exception {
-        return this.fileService.uploadFile(multipartFile);
-    }
-
-    @PostMapping("/update")
-    public String updateFile(@RequestParam("file") MultipartFile multipartFile, @RequestParam("filePath")  String exitingFilePath) throws Exception {
-        return this.fileService.updateFile(multipartFile, exitingFilePath);
-    }
-}

aws-modules/aws-s3-update-object/src/main/java/com/baeldung/awss3updateobject/service/FileService.java

@@ -1,80 +0,0 @@
-package com.baeldung.awss3updateobject.service;
-
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.PostConstruct;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class FileService {
-
-    private static final Logger logger = LoggerFactory.getLogger(FileService.class);
-
-    public AmazonS3 amazonS3;
-
-    @Value("${aws.s3bucket}")
-    public String awsS3Bucket;
-
-    @PostConstruct
-    private void init(){
-        AWSCredentials credentials = new BasicAWSCredentials(
-                "AWS AccessKey",
-                "AWS secretKey"
-        );
-        this.amazonS3 = AmazonS3ClientBuilder.standard()
-                .withRegion(Regions.fromName("us-east-1"))
-                .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                .build();
-    }
-
-    public String uploadFile(MultipartFile multipartFile) throws Exception {
-        String key = "/documents/" + multipartFile.getOriginalFilename();
-        return this.uploadDocument(this.awsS3Bucket, key, multipartFile);
-    }
-
-    public String updateFile(MultipartFile multipartFile, String key) throws Exception {
-        return this.uploadDocument(this.awsS3Bucket, key, multipartFile);
-    }
-
-    private String uploadDocument(String s3bucket, String key, MultipartFile multipartFile) throws Exception {
-        try {
-            ObjectMetadata metadata = new ObjectMetadata();
-            metadata.setContentType(multipartFile.getContentType());
-            Map<String, String> attributes = new HashMap<>();
-            attributes.put("document-content-size", String.valueOf(multipartFile.getSize()));
-            metadata.setUserMetadata(attributes);
-            InputStream documentStream = multipartFile.getInputStream();
-            PutObjectResult putObjectResult = this.amazonS3.putObject(new PutObjectRequest(s3bucket, key, documentStream, metadata));
-
-            S3Object s3Object = this.amazonS3.getObject(s3bucket, key);
-            logger.info("Last Modified: " + s3Object.getObjectMetadata().getLastModified());
-            return key;
-        } catch (AmazonS3Exception ex) {
-            if (ex.getErrorCode().equalsIgnoreCase("NoSuchBucket")) {
-                String msg = String.format("No bucket found with name %s", s3bucket);
-                throw new Exception(msg);
-            } else if (ex.getErrorCode().equalsIgnoreCase("AccessDenied")) {
-                String msg = String.format("Access denied to S3 bucket %s", s3bucket);
-                throw new Exception(msg);
-            }
-            throw ex;
-        } catch (IOException ex) {
-            String msg = String.format("Error saving file %s to AWS S3 bucket %s", key, s3bucket);
-            throw new Exception(msg);
-        }
-    }
-}

aws-modules/aws-s3-update-object/src/main/resources/application.properties

@@ -1 +0,0 @@
-aws.s3bucket=baeldung-documents;

aws-modules/aws-s3-update-object/src/test/java/com/baeldung/awss3updateobject/controller/FileControllerUnitTest.java

@@ -1,62 +0,0 @@
-package com.baeldung.awss3updateobject.controller;
-
-import com.baeldung.awss3updateobject.service.FileService;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.web.multipart.MultipartFile;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.*;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-
-public class FileControllerUnitTest {
-
-    private MockMvc mockMvc;
-
-    @Mock
-    private FileService fileService;
-
-    @InjectMocks
-    private FileController fileController;
-
-    @BeforeEach
-    public void setUp() {
-        MockitoAnnotations.openMocks(this);
-        this.mockMvc = MockMvcBuilders.standaloneSetup(fileController).build();
-    }
-
-    @Test
-    public void givenValidMultipartFile_whenUploadedViaEndpoint_thenCorrectPathIsReturned() throws Exception {
-        MockMultipartFile multipartFile = new MockMultipartFile("file", "test.txt", "text/plain", "sample file content".getBytes());
-        String expectedResult = "File Uploaded Successfully";
-
-        when(fileService.uploadFile(multipartFile)).thenReturn(expectedResult);
-
-        mockMvc.perform(multipart("/api/v1/file/upload").file(multipartFile))
-                .andExpect(status().isOk())
-                .andExpect(content().string(expectedResult));
-    }
-
-    @Test
-    public void givenValidMultipartFileAndExistingPath_whenUpdatedViaEndpoint_thenSamePathIsReturned() throws Exception {
-        MockMultipartFile multipartFile = new MockMultipartFile("file", "test.txt", "text/plain", "updated file content".getBytes());
-        String filePath = "some/path/to/file";
-        String expectedResult = "File Updated Successfully";
-
-        when(fileService.updateFile(multipartFile, filePath)).thenReturn(expectedResult);
-
-        mockMvc.perform(multipart("/api/v1/file/update")
-                        .file(multipartFile)
-                        .param("filePath", filePath))
-                .andExpect(status().isOk())
-                .andExpect(content().string(expectedResult));
-    }
-}

aws-modules/aws-s3-update-object/src/test/java/com/baeldung/awss3updateobject/service/FileServiceUnitTest.java

@@ -1,99 +0,0 @@
-package com.baeldung.awss3updateobject.service;
-
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.AmazonS3Exception;
-import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.amazonaws.services.s3.model.S3Object;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-public class FileServiceUnitTest {
-
-    @Mock
-    private AmazonS3 amazonS3;
-
-    @Mock
-    private MultipartFile multipartFile;
-
-    @InjectMocks
-    private FileService fileService;
-
-    @BeforeEach
-    public void setup() {
-        MockitoAnnotations.openMocks(this);
-        fileService = new FileService();
-        fileService.awsS3Bucket = "test-bucket";
-        fileService.amazonS3 = amazonS3;
-      }
-
-    @Test
-    public void givenValidFile_whenUploaded_thenKeyMatchesDocumentPath() throws Exception {
-        when(multipartFile.getName()).thenReturn("testFile");
-        when(multipartFile.getOriginalFilename()).thenReturn("testFile");
-        when(multipartFile.getContentType()).thenReturn("application/pdf");
-        when(multipartFile.getSize()).thenReturn(1024L);
-        when(multipartFile.getInputStream()).thenReturn(mock(InputStream.class));
-
-        S3Object s3Object = new S3Object();
-        when(amazonS3.putObject(any())).thenReturn(null);
-        when(amazonS3.getObject(anyString(), anyString())).thenReturn(s3Object);
-
-        String key = fileService.uploadFile(multipartFile);
-
-        assertEquals("/documents/testFile", key);
-    }
-
-    @Test
-    public void givenValidFile_whenUploadFailsDueToNoBucket_thenExceptionIsThrown() throws Exception {
-        when(multipartFile.getName()).thenReturn("testFile");
-        when(multipartFile.getOriginalFilename()).thenReturn("testFile");
-        when(multipartFile.getContentType()).thenReturn("application/pdf");
-        when(multipartFile.getSize()).thenReturn(1024L);
-        when(multipartFile.getInputStream()).thenReturn(mock(InputStream.class));
-
-        AmazonS3Exception exception = new AmazonS3Exception("Test exception");
-        exception.setErrorCode("NoSuchBucket");
-        when(amazonS3.putObject(any(PutObjectRequest.class))).thenThrow(exception);
-
-        assertThrows(Exception.class, () -> fileService.uploadFile(multipartFile));
-    }
-
-    @Test
-    public void givenExistingFile_whenUpdated_thenSameKeyIsReturned() throws Exception {
-        when(multipartFile.getName()).thenReturn("testFile");
-        when(multipartFile.getContentType()).thenReturn("application/pdf");
-        when(multipartFile.getSize()).thenReturn(1024L);
-        when(multipartFile.getInputStream()).thenReturn(mock(InputStream.class));
-
-        S3Object s3Object = new S3Object();
-        when(amazonS3.putObject(any(PutObjectRequest.class))).thenReturn(null);
-        when(amazonS3.getObject(anyString(), anyString())).thenReturn(s3Object);
-
-        String key = "/documents/existingFile";
-        String resultKey = fileService.updateFile(multipartFile, key);
-
-        assertEquals(key, resultKey);
-    }
-
-    @Test
-    public void givenFileWithIOException_whenUpdated_thenExceptionIsThrown() throws Exception {
-        when(multipartFile.getName()).thenReturn("testFile");
-        when(multipartFile.getContentType()).thenReturn("application/pdf");
-        when(multipartFile.getSize()).thenReturn(1024L);
-        when(multipartFile.getInputStream()).thenThrow(new IOException("Test IO Exception"));
-
-        assertThrows(Exception.class, () -> fileService.updateFile(multipartFile, "/documents/existingFile"));
-    }
-}

aws-modules/aws-s3/README.md

@@ -8,6 +8,3 @@ This module contains articles about Simple Storage Service (S3) on AWS
 - [Multipart Uploads in Amazon S3 with Java](https://www.baeldung.com/aws-s3-multipart-upload)
 - [Using the JetS3t Java Client With Amazon S3](https://www.baeldung.com/jets3t-amazon-s3)
 - [Check if a Specified Key Exists in a Given S3 Bucket Using Java](https://www.baeldung.com/java-aws-s3-check-specified-key-exists)
-- [Listing All AWS S3 Objects in a Bucket Using Java](https://www.baeldung.com/java-aws-s3-list-bucket-objects)
-- [Update an Existing Amazon S3 Object Using Java](https://www.baeldung.com/java-update-amazon-s3-object)
-- [How To Rename Files and Folders in Amazon S3](https://www.baeldung.com/java-amazon-s3-rename-files-folders)

aws-modules/aws-s3/pom.xml

@@ -16,11 +16,10 @@
 
     <dependencies>
         <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>s3</artifactId>
-            <version>${aws.java.sdk.version}</version>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk</artifactId>
+            <version>${aws-java-sdk.version}</version>
         </dependency>
-
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -61,7 +60,6 @@
     </build>
 
     <properties>
-        <aws.java.sdk.version>2.20.52</aws.java.sdk.version>
         <commons-codec-version>1.10.L001</commons-codec-version>
         <jets3t-version>0.9.4.0006L</jets3t-version>
     </properties>

aws-modules/aws-s3/src/main/java/com/baeldung/s3/AWSS3ObjectUtils.java

@@ -0,0 +1,42 @@
+package com.baeldung.s3;
+
+import org.apache.http.HttpStatus;
+
+import com.amazonaws.AmazonServiceException;
+import com.amazonaws.services.s3.AmazonS3;
+
+public class AWSS3ObjectUtils {
+
+    private AmazonS3 s3Client;
+
+    public AWSS3ObjectUtils(AmazonS3 s3client) {
+        this.s3Client = s3client;
+    }
+
+    public boolean doesObjectExistByDefaultMethod(String bucket, String key) {
+        return s3Client.doesObjectExist(bucket, key);
+    }
+
+    public boolean doesObjectExistByListObjects(String bucket, String key) {
+        return s3Client.listObjects(bucket)
+            .getObjectSummaries()
+            .stream()
+            .filter(s3ObjectSummary -> s3ObjectSummary.getKey()
+                .equals(key))
+            .findFirst()
+            .isPresent();
+    }
+
+    public boolean doesObjectExistByMetaData(String bucket, String key) {
+        try {
+            s3Client.getObjectMetadata(bucket, key);
+            return true;
+        } catch (AmazonServiceException e) {
+            if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
+                return false;
+            } else {
+                throw e;
+            }
+        }
+    }
+}