This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new 6b3b09da5 Add HTTP 502 and 504 to retryable status codes (#2223)
6b3b09da5 is described below

commit 6b3b09da5be135770b0c16ae44b62d7291852208
Author: Jitesh Khatri <[email protected]>
AuthorDate: Tue Nov 17 00:08:36 2026 +0530

    Add HTTP 502 and 504 to retryable status codes (#2223)
    
    ## Summary
    
    Add HTTP 502 (Bad Gateway) and 504 (Gateway Timeout) to the default 
retryable HTTP status codes.
    
    - Preserve the existing retryable HTTP status codes 429 (Too Many Requests) 
and 503 (Service Unavailable).
    - Extend the default retry policy to include HTTP 502 and 504.
    - Update the Javadoc to document all supported retryable HTTP status codes 
and the corresponding default configuration.
    - Add tests covering default, session-level, and repository-specific 
configuration.
    - Add regression tests for HTTP 502 and 504 responses in the Apache and 
HTTP transport implementations.
    
    ## Related Issue
    
    Closes #2151
    
    ## Testing
    
    - [x] `HttpTransporterUtilsTest` — 12 tests passed.
    - [x] `ApacheTransporterTest` — passed.
    - [x] Maven reactor build for the focused test modules — successful.
    - [x] `git diff --check` — passed.
    
    ## License
    
    - [x] I hereby declare this contribution to be licensed under the [Apache 
License Version 2.0, January 2004](https://www.apache.org/licenses/LICENSE-2.0)
---
 .../eclipse/aether/ConfigurationProperties.java    | 16 +++++-----
 .../transport/apache/ApacheTransporterTest.java    | 14 ++++++++
 .../transport/http/HttpTransporterUtilsTest.java   | 37 ++++++++++++++++++++++
 3 files changed, 59 insertions(+), 8 deletions(-)

diff --git 
a/maven-resolver-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java
 
b/maven-resolver-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java
index afca6686a..e4f42c41c 100644
--- 
a/maven-resolver-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java
+++ 
b/maven-resolver-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java
@@ -387,9 +387,9 @@ public final class ConfigurationProperties {
 
     /**
      * The initial delay in milliseconds for retried requests after receiving 
a server response with status
-     * "too many requests" (HTTP codes 429 and 503). Accepts long as 
milliseconds. This value is used if the remote server
-     * does not use {@code Retry-After} header, in which case the server value 
is obeyed.
-     * This delay is increased for every retry, up to {@link 
#HTTP_RETRY_HANDLER_INTERVAL_MAX}.
+     * "service unavailable" or "too many requests" (HTTP codes 429, 502, 503, 
and 504). Accepts long as milliseconds.
+     * This value is used if the remote server does not use {@code 
Retry-After} header, in which case the server value
+     * is obeyed. This delay is increased for every retry, up to {@link 
#HTTP_RETRY_HANDLER_INTERVAL_MAX}.
      *
      * @since 1.9.16
      * @configurationSource {@link 
RepositorySystemSession#getConfigProperties()}
@@ -428,8 +428,8 @@ public final class ConfigurationProperties {
     public static final long DEFAULT_HTTP_RETRY_HANDLER_INTERVAL_MAX = 
300_000L;
 
     /**
-     * The HTTP codes of remote server responses that should be handled as 
"too many requests"
-     * (examples: HTTP codes 429 and 503). Accepts comma separated list of 
HTTP response codes.
+     * The HTTP codes of remote server responses that should be handled as 
"service unavailable" or "too many requests"
+     * (examples: HTTP codes 429, 502, 503, and 504). Accepts comma separated 
list of HTTP response codes.
      *
      * @since 1.9.16
      * @configurationSource {@link 
RepositorySystemSession#getConfigProperties()}
@@ -441,12 +441,12 @@ public final class ConfigurationProperties {
             PREFIX_TRANSPORT_HTTP + "retryHandler.serviceUnavailable";
 
     /**
-     * The default HTTP codes of remote server responses that should be 
handled as "too many requests".
-     * Default value: "429,503".
+     * The default HTTP codes of remote server responses that should be 
handled as "service unavailable" or "too many requests".
+     * Default value: "429,502,503,504".
      *
      * @since 1.9.16
      */
-    public static final String DEFAULT_HTTP_RETRY_HANDLER_SERVICE_UNAVAILABLE 
= "429,503";
+    public static final String DEFAULT_HTTP_RETRY_HANDLER_SERVICE_UNAVAILABLE 
= "429,502,503,504";
 
     /**
      * Should HTTP client use preemptive-authentication for all HTTP verbs 
(works only w/ BASIC). By default, is
diff --git 
a/maven-resolver-transport-apache/src/test/java/org/eclipse/aether/transport/apache/ApacheTransporterTest.java
 
b/maven-resolver-transport-apache/src/test/java/org/eclipse/aether/transport/apache/ApacheTransporterTest.java
index 832514c32..3c799cd46 100644
--- 
a/maven-resolver-transport-apache/src/test/java/org/eclipse/aether/transport/apache/ApacheTransporterTest.java
+++ 
b/maven-resolver-transport-apache/src/test/java/org/eclipse/aether/transport/apache/ApacheTransporterTest.java
@@ -546,4 +546,18 @@ class ApacheTransporterTest extends HttpTransporterTest {
                 .getTotalStats();
         assertEquals(0, stats.getAvailable(), stats.toString());
     }
+
+    @Test
+    void testRetryHandler_badGateway_defaultCount_positive() throws Exception {
+        newTransporter(httpServer.getHttpUrl());
+        httpServer.setServerErrorsBeforeWorks(1, 502);
+        transporter.peek(new PeekTask(URI.create("repo/file.txt")));
+    }
+
+    @Test
+    void testRetryHandler_gatewayTimeout_defaultCount_positive() throws 
Exception {
+        newTransporter(httpServer.getHttpUrl());
+        httpServer.setServerErrorsBeforeWorks(1, 504);
+        transporter.peek(new PeekTask(URI.create("repo/file.txt")));
+    }
 }
diff --git 
a/maven-resolver-util/src/test/java/org/eclipse/aether/util/connector/transport/http/HttpTransporterUtilsTest.java
 
b/maven-resolver-util/src/test/java/org/eclipse/aether/util/connector/transport/http/HttpTransporterUtilsTest.java
index 99ad53dab..0b916049b 100644
--- 
a/maven-resolver-util/src/test/java/org/eclipse/aether/util/connector/transport/http/HttpTransporterUtilsTest.java
+++ 
b/maven-resolver-util/src/test/java/org/eclipse/aether/util/connector/transport/http/HttpTransporterUtilsTest.java
@@ -20,6 +20,9 @@ package org.eclipse.aether.util.connector.transport.http;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.eclipse.aether.ConfigurationProperties;
 import org.eclipse.aether.DefaultRepositorySystemSession;
@@ -221,4 +224,38 @@ public class HttpTransporterUtilsTest {
         assertEquals("/räpo/", uri.getPath());
         assertEquals("https://host.de/r%C3%A4po/";, uri.toASCIIString());
     }
+
+    @Test
+    void getHttpServiceUnavailableCodesUsesDefaultCodes() {
+        DefaultRepositorySystemSession session = new 
DefaultRepositorySystemSession();
+        RemoteRepository repository = new RemoteRepository.Builder("test", 
"default", "https://example.com/";).build();
+
+        Set<Integer> codes = 
HttpTransporterUtils.getHttpServiceUnavailableCodes(session, repository);
+
+        assertEquals(new HashSet<>(Arrays.asList(429, 502, 503, 504)), codes);
+    }
+
+    @Test
+    void getHttpServiceUnavailableCodesSupportsCustomConfiguration() {
+        DefaultRepositorySystemSession session = new 
DefaultRepositorySystemSession();
+        RemoteRepository repository = new RemoteRepository.Builder("test", 
"default", "https://example.com/";).build();
+
+        
session.setConfigProperty(ConfigurationProperties.HTTP_RETRY_HANDLER_SERVICE_UNAVAILABLE,
 "429,502");
+
+        Set<Integer> codes = 
HttpTransporterUtils.getHttpServiceUnavailableCodes(session, repository);
+
+        assertEquals(new HashSet<>(Arrays.asList(429, 502)), codes);
+    }
+
+    @Test
+    void 
getHttpServiceUnavailableCodesSupportsRepositorySpecificConfiguration() {
+        DefaultRepositorySystemSession session = new 
DefaultRepositorySystemSession();
+        RemoteRepository repository = new RemoteRepository.Builder("test", 
"default", "https://example.com/";).build();
+
+        
session.setConfigProperty(ConfigurationProperties.HTTP_RETRY_HANDLER_SERVICE_UNAVAILABLE
 + ".test", "502,504");
+
+        Set<Integer> codes = 
HttpTransporterUtils.getHttpServiceUnavailableCodes(session, repository);
+
+        assertEquals(new HashSet<>(Arrays.asList(502, 504)), codes);
+    }
 }

Reply via email to