Merge branch 'eugenp:master' into JAVA-20167_1

Author: timis1

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

@@ -10,7 +10,7 @@ This module contains articles about algorithms. Some classes of algorithms, e.g.
 - [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)

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,5 +13,4 @@ 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/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 4 Cookbook](https://www.baeldung.com/httpclient4)
+- [Apache HttpClient Cookbook](https://www.baeldung.com/apache-httpclient-cookbook)
 - [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/src/test/java/com/baeldung/httpclient/GetRequestMockServer.java

@@ -21,17 +21,16 @@ public class GetRequestMockServer {
     public static String serviceOneUrl;
     public static String serviceTwoUrl;
 
-    private static int serverPort;
+    public 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();
-        serverPort = 8080;
+    static void startServer() throws IOException {
+        serverPort = getFreePort();
         System.out.println("Free port "+serverPort);
         serviceOneUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_ONE;
         serviceTwoUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_TWO;

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

@@ -9,6 +9,7 @@
 
 import javax.net.ssl.SSLContext;
 
+import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner;
 import org.junit.jupiter.api.Test;
 
 import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
@@ -55,12 +56,12 @@ class HttpAsyncClientLiveTest extends GetRequestMockServer {
 
     @Test
     void whenUseHttpAsyncClient_thenCorrect() throws InterruptedException, ExecutionException, IOException {
-        final HttpHost target = new HttpHost(HOST);
+        final HttpHost target = new HttpHost(HOST_WITH_COOKIE);
         final SimpleHttpRequest request = SimpleRequestBuilder.get()
             .setHttpHost(target)
             .build();
 
-        final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
+        final CloseableHttpAsyncClient client = HttpAsyncClients.custom().build();
         client.start();
 
 
@@ -102,30 +103,15 @@ void whenUseMultipleHttpAsyncClient_thenCorrect() throws Exception {
 
     @Test
     void whenUseProxyWithHttpClient_thenCorrect() throws Exception {
-        final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
+        final HttpHost proxy = new HttpHost("127.0.0.1", GetRequestMockServer.serverPort);
+        DefaultProxyRoutePlanner routePlanner = new DefaultProxyRoutePlanner(proxy);
+        final CloseableHttpAsyncClient client = HttpAsyncClients.custom()
+            .setRoutePlanner(routePlanner)
+            .build();
         client.start();
-        final HttpHost proxy = new HttpHost("127.0.0.1", 8080);
-        final RequestConfig config = RequestConfig.custom().setProxy(proxy).build();
-        final SimpleHttpRequest request = new SimpleHttpRequest("GET" ,HOST_WITH_PROXY);
-        request.setConfig(config);
-        final Future<SimpleHttpResponse> future = client.execute(request, new FutureCallback<>(){
-            @Override
-            public void completed(SimpleHttpResponse response) {
-
-                System.out.println("responseData");
-            }
-
-            @Override
-            public void failed(Exception ex) {
-                System.out.println("Error executing HTTP request: " + ex.getMessage());
-            }
-
-            @Override
-            public void cancelled() {
-                System.out.println("HTTP request execution cancelled");
-            }
-        });
 
+        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();

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

@@ -0,0 +1,77 @@
+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 java.net.URISyntaxException;
+
+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 String serviceOneUrl;
+    public static String serviceTwoUrl;
+
+    public 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/HttpAsyncClientV4LiveTest.java

@@ -31,7 +31,8 @@
 import org.apache.http.ssl.SSLContexts;
 import org.junit.jupiter.api.Test;
 
-class HttpAsyncClientV4LiveTest {
+
+class HttpAsyncClientV4LiveTest extends GetRequestMockServer {
 
     private static final String HOST = "http://www.google.com";
     private static final String HOST_WITH_SSL = "https://mms.nw.ru/";
@@ -87,7 +88,7 @@ void whenUseMultipleHttpAsyncClient_thenCorrect() throws Exception {
     void whenUseProxyWithHttpClient_thenCorrect() throws Exception {
         final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault();
         client.start();
-        final HttpHost proxy = new HttpHost("127.0.0.1", 8080);
+        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);