Merge branch 'eugenp:master' into master

.gitignore

@@ -89,6 +89,7 @@ spring-soap/src/main/java/com/baeldung/springsoap/gen/
 /report-*.json
 transaction.log
 *-shell.log
+customers.xml
 
 apache-cxf/cxf-aegis/baeldung.xml
 testing-modules/report-*.json

akka-modules/akka-http/pom.xml

@@ -36,7 +36,6 @@
         </dependency>
     </dependencies>
 
-
     <properties>
         <akka.http.version>10.0.11</akka.http.version>
         <akka.stream.version>2.5.11</akka.stream.version>

annotations/annotation-processing/pom.xml

@@ -21,7 +21,6 @@
         </dependency>
     </dependencies>
 
-
     <properties>
         <auto-service.version>1.0-rc2</auto-service.version>
     </properties>

apache-httpclient-2/README.md

@@ -12,6 +12,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Reading an HTTP Response Body as a String in Java](https://www.baeldung.com/java-http-response-body-as-string)
 - [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)
-- [Expand Shortened URLs with Apache HttpClient](https://www.baeldung.com/apache-httpclient-expand-url)
 - [Apache HttpClient vs. CloseableHttpClient](https://www.baeldung.com/apache-httpclient-vs-closeablehttpclient)
 - More articles: [[<-- prev]](../apache-httpclient)

apache-httpclient4/README.md

@@ -9,6 +9,7 @@ This module contains articles about Apache HttpClient 4.5
 - [Custom HTTP Header with the Apache HttpClient](https://www.baeldung.com/httpclient-custom-http-header)
 - [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)
 
 ### Running the Tests
 To run the live tests, use the command: mvn clean install -Plive

apache-httpclient4/pom.xml

@@ -1,7 +1,7 @@
 <?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">
+    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-httpclient4</artifactId>
     <version>0.1-SNAPSHOT</version>

apache-httpclient4/src/test/java/com/baeldung/httpclient/retry/ApacheHttpClientRetryIntegrationTest.java

@@ -0,0 +1,168 @@
+package com.baeldung.httpclient.retry;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.Objects;
+
+import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.HttpResponseInterceptor;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPatch;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class ApacheHttpClientRetryIntegrationTest {
+
+    private Integer requestCounter;
+    private CloseableHttpClient httpClient;
+
+    @BeforeEach
+    void setUp() {
+        requestCounter = 0;
+    }
+
+    @AfterEach
+    void tearDown() throws IOException {
+        if (httpClient != null) {
+            httpClient.close();
+        }
+    }
+
+    private void createDefaultApacheHttpClient() {
+        this.httpClient = HttpClientBuilder
+          .create()
+          .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> {
+              requestCounter++;
+          }).build();
+    }
+
+    private void createFailingHttpClient() {
+        this.httpClient = HttpClientBuilder
+          .create()
+          .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+          .addInterceptorLast((HttpResponseInterceptor) (httpResponse, httpContext) -> {
+              throw new IOException();
+          })
+          .build();
+    }
+
+    private void createHttpClientWithRetryHandler() {
+        this.httpClient = HttpClientBuilder
+          .create()
+          .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+          .addInterceptorLast((HttpResponseInterceptor) (httpRequest, httpContext) -> { throw new IOException(); })
+          .setRetryHandler(new DefaultHttpRequestRetryHandler(6, true))
+          .build();
+    }
+
+    private void createHttpClientWithCustomRetryHandler() {
+        this.httpClient = HttpClientBuilder
+          .create()
+          .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+          .addInterceptorLast((HttpResponseInterceptor) (httpRequest, httpContext) -> { throw new IOException(); })
+          .setRetryHandler((exception, executionCount, context) -> {
+              if (executionCount < 5 && Objects.equals("GET", ((HttpClientContext) context).getRequest().getRequestLine().getMethod())) {
+                  return true;
+              } else {
+                  return false;
+              }
+          })
+          .build();
+    }
+
+    private void createHttpClientWithRetriesDisabled() {
+        this.httpClient = HttpClientBuilder
+          .create()
+          .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+          .addInterceptorLast((HttpResponseInterceptor) (httpRequest, httpContext) -> { throw new IOException(); })
+          .disableAutomaticRetries()
+          .build();
+    }
+
+    @Test
+    public void givenDefaultConfiguration_whenReceivedIOException_thenRetriesPerformed() {
+        createFailingHttpClient();
+        assertThrows(IOException.class, () -> httpClient.execute(new HttpGet("https://httpstat.us/200")));
+        assertThat(requestCounter).isEqualTo(4);
+    }
+
+    @Test
+    public void givenDefaultConfiguration_whenDomainNameNotResolved_thenNoRetryApplied() {
+        createDefaultApacheHttpClient();
+        HttpGet request = new HttpGet(URI.create("http://domain.that.does.not.exist:80/api/v1"));
+
+        assertThrows(UnknownHostException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(1);
+    }
+
+    @Test
+    public void givenDefaultConfiguration_whenGotInternalServerError_thenNoRetryLogicApplied() throws IOException {
+        createDefaultApacheHttpClient();
+        HttpGet request = new HttpGet(URI.create("https://httpstat.us/500"));
+
+        CloseableHttpResponse response = assertDoesNotThrow(() -> httpClient.execute(request));
+        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(500);
+        assertThat(requestCounter).isEqualTo(1);
+        response.close();
+    }
+
+    @Test
+    public void givenDefaultConfiguration_whenHttpPatchRequest_thenRetryIsNotApplied() {
+        createFailingHttpClient();
+        HttpPatch request = new HttpPatch(URI.create("https://httpstat.us/500"));
+
+        assertThrows(IOException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(1);
+    }
+
+    @Test
+    public void givenDefaultConfiguration_whenHttpPutRequest_thenRetryIsNotApplied() {
+        createFailingHttpClient();
+        HttpPut request = new HttpPut(URI.create("https://httpstat.us/500"));
+
+        assertThrows(IOException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(1);
+    }
+
+    @Test
+    public void givenConfiguredRetryHandler_whenHttpPostRequest_thenRetriesPerformed() {
+        createHttpClientWithRetryHandler();
+
+        HttpPost request = new HttpPost(URI.create("https://httpstat.us/200"));
+
+        assertThrows(IOException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(7);
+    }
+
+    @Test
+    public void givenCustomRetryHandler_whenUnknownHostException_thenRetryAnyway() {
+        createHttpClientWithCustomRetryHandler();
+
+        HttpGet request = new HttpGet(URI.create("https://domain.that.does.not.exist/200"));
+
+        assertThrows(IOException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(5);
+    }
+
+    @Test
+    public void givenDisabledRetries_whenExecutedHttpRequestEndUpWithIOException_thenRetryIsNotApplied() {
+        createHttpClientWithRetriesDisabled();
+        HttpGet request = new HttpGet(URI.create("https://httpstat.us/200"));
+
+        assertThrows(IOException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(1);
+    }
+}

apache-kafka/pom.xml

@@ -171,7 +171,8 @@
                 <configuration>
                     <argLine>
                         --add-opens java.base/java.time=ALL-UNNAMED
-                        --add-opens java.base/java.nio=ALL-UNNAMED
+                        --add-opens
+                        java.base/java.nio=ALL-UNNAMED
                         --add-opens java.base/java.util=ALL-UNNAMED
                     </argLine>
                 </configuration>
@@ -179,8 +180,6 @@
         </plugins>
     </build>
 
-
-
     <properties>
         <kafka.version>3.4.0</kafka.version>
         <testcontainers-kafka.version>1.15.3</testcontainers-kafka.version>

apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountIntegrationTest.java

@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import com.baeldung.apache.beam.intro.WordCount;
 
-public class WordCountUnitTest {
+public class WordCountIntegrationTest {
     
     @Test
     public void givenInputFile_whenWordCountRuns_thenJobFinishWithoutError() {

apache-spark/pom.xml

@@ -7,7 +7,6 @@
     <version>1.0-SNAPSHOT</version>
     <name>apache-spark</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>

aws-modules/aws-lambda/shipping-tracker/ShippingFunction/pom.xml

@@ -2,7 +2,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>ShippingFunction</artifactId>
     <version>1.0</version>
     <name>ShippingFunction</name>

aws-modules/aws-lambda/todo-reminder/ToDoFunction/pom.xml

@@ -1,6 +1,6 @@
 <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/maven-v4_0_0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>helloworld</groupId>
     <artifactId>ToDoFunction</artifactId>

axon/pom.xml

@@ -103,7 +103,8 @@
                 <configuration>
                     <argLine>
                         --add-opens java.base/java.util=ALL-UNNAMED
-                        --add-opens java.base/java.util.concurrent=ALL-UNNAMED
+                        --add-opens
+                        java.base/java.util.concurrent=ALL-UNNAMED
                     </argLine>
                 </configuration>
             </plugin>

checker-plugin/pom.xml

@@ -7,7 +7,6 @@
     <version>1.0-SNAPSHOT</version>
     <name>checker-plugin</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>

core-groovy-modules/core-groovy-2/pom.xml

@@ -4,7 +4,6 @@
     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>core-groovy-2</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>core-groovy-2</name>
     <packaging>jar</packaging>
 
@@ -153,14 +152,6 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>maven_central</id>
-            <name>Maven Central</name>
-            <url>https://repo.maven.apache.org/maven2/</url>
-        </repository>
-    </repositories>
-
     <properties>
         <groovy-wslite.version>1.1.3</groovy-wslite.version>
         <assembly.plugin.version>3.4.2</assembly.plugin.version>

core-groovy-modules/core-groovy-collections/pom.xml

@@ -4,7 +4,6 @@
     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>core-groovy-collections</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>core-groovy-collections</name>
     <packaging>jar</packaging>
 
@@ -111,13 +110,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>maven_central</id>
-            <name>Maven Central</name>
-            <url>https://repo.maven.apache.org/maven2/</url>
-        </repository>
-    </repositories>
-
-
 </project>

core-groovy-modules/core-groovy-strings/pom.xml

@@ -4,7 +4,6 @@
     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>core-groovy-strings</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>core-groovy-strings</name>
     <packaging>jar</packaging>
 
@@ -101,12 +100,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>maven_central</id>
-            <name>Maven Central</name>
-            <url>https://repo.maven.apache.org/maven2/</url>
-        </repository>
-    </repositories>
-
 </project>

core-groovy-modules/core-groovy/pom.xml

@@ -3,9 +3,7 @@
     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>core-groovy</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>core-groovy</name>
     <packaging>jar</packaging>
 
@@ -102,12 +100,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>maven_central</id>
-            <name>Maven Central</name>
-            <url>https://repo.maven.apache.org/maven2/</url>
-        </repository>
-    </repositories>
-
 </project>

core-java-modules/core-java-10/pom.xml

@@ -4,7 +4,6 @@
     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>core-java-10</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-10</name>
     <packaging>jar</packaging>
 

core-java-modules/core-java-11-2/pom.xml

@@ -4,7 +4,6 @@
     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>core-java-11-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-11-2</name>
     <packaging>jar</packaging>
 

core-java-modules/core-java-11-3/pom.xml

@@ -4,7 +4,6 @@
     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>core-java-11-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-11-3</name>
     <packaging>jar</packaging>
 
@@ -14,7 +13,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    
+
     <dependencies>
         <dependency>
             <groupId>com.google.code.gson</groupId>

core-java-modules/core-java-11/pom.xml

@@ -4,10 +4,8 @@
     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>core-java-11</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-11</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>

core-java-modules/core-java-12/pom.xml

@@ -4,10 +4,8 @@
     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>core-java-12</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-12</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>

core-java-modules/core-java-13/pom.xml

@@ -3,12 +3,9 @@
     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>
-    <groupId>com.baeldung</groupId>
     <artifactId>core-java-13</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-13</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>

core-java-modules/core-java-14/pom.xml

@@ -6,7 +6,6 @@
     <artifactId>core-java-14</artifactId>
     <name>core-java-14</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>

core-java-modules/core-java-15/pom.xml

@@ -6,7 +6,6 @@
     <artifactId>core-java-15</artifactId>
     <name>core-java-15</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>

core-java-modules/core-java-16/pom.xml

@@ -4,10 +4,8 @@
     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>core-java-16</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-16</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>

core-java-modules/core-java-17/pom.xml

@@ -4,10 +4,8 @@
     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>core-java-17</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-17</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>

core-java-modules/core-java-19/pom.xml

@@ -1,21 +1,17 @@
 <?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">
+    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>core-java-19</artifactId>
+    <name>core-java-19</name>
+
     <parent>
         <groupId>com.baeldung.core-java-modules</groupId>
         <artifactId>core-java-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>core-java-19</artifactId>
-
-    <properties>
-        <maven.compiler.source>19</maven.compiler.source>
-        <maven.compiler.target>19</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
     <build>
         <plugins>
             <plugin>
@@ -30,4 +26,10 @@
         </plugins>
     </build>
 
+    <properties>
+        <maven.compiler.source>19</maven.compiler.source>
+        <maven.compiler.target>19</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
 </project>

core-java-modules/core-java-19/src/main/java/com/baeldung/highcpu/Application.java

@@ -0,0 +1,20 @@
+package com.baeldung.highcpu;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.IntUnaryOperator;
+import java.util.stream.IntStream;
+
+public class Application {
+
+    static List<Integer> generateList() {
+        return IntStream.range(0, 10000000).parallel().map(IntUnaryOperator.identity()).collect(LinkedList::new, List::add, List::addAll);
+    }
+
+    public static void main(String[] args) {
+        List<Integer> list = generateList();
+        long start = System.nanoTime();
+        int value = list.get(9500000);
+        System.out.printf("Found value %d in %d nanos\n", value, (System.nanoTime() - start));
+    }
+}