Use method isIdempotent

Author: arturobernalg

httpclient5/src/main/java/org/apache/hc/client5/http/impl/TooEarlyRetryStrategy.java

@@ -43,6 +43,7 @@
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.Method;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.util.Args;
@@ -76,11 +77,6 @@ public final class TooEarlyRetryStrategy implements HttpRequestRetryStrategy {
      */
     public static final String DISABLE_EARLY_DATA_ATTR = "http.client.tls.early_data.disable";
 
-    // Java 8–friendly immutable set of idempotent methods (no Set.of).
-    private static final Set<String> IDEMPOTENT = Collections.unmodifiableSet(
-            new HashSet<String>(Arrays.asList("GET", "HEAD", "OPTIONS", "TRACE", "PUT", "DELETE"))
-    );
-
     private final int maxRetries;
     private final boolean include429and503;
     private final HttpRequestRetryStrategy delegateForExceptions; // optional, may be null
@@ -179,7 +175,7 @@ public boolean retryRequest(
             return false;
         }
 
-        if (!IDEMPOTENT.contains(original.getMethod())) {
+        if (!Method.normalizedValueOf(original.getMethod()).isIdempotent()) {
             return false;
         }
 

httpclient5/src/main/java/org/apache/hc/client5/http/impl/TooEarlyStatusRetryExec.java

@@ -39,6 +39,7 @@
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.Method;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 
 /**
@@ -51,9 +52,6 @@
 public final class TooEarlyStatusRetryExec implements ExecChainHandler {
 
     private static final String RETRIED_ATTR = "http.client.too_early.retried";
-    private static final Set<String> IDEMPOTENT = Collections.unmodifiableSet(
-            new HashSet<>(Arrays.asList("GET", "HEAD", "OPTIONS", "TRACE", "PUT", "DELETE"))
-    );
 
     private final boolean include429and503;
 
@@ -74,7 +72,7 @@ public ClassicHttpResponse execute(
                 || code == HttpStatus.SC_SERVICE_UNAVAILABLE);
 
         final boolean alreadyRetried = Boolean.TRUE.equals(scope.clientContext.getAttribute(RETRIED_ATTR));
-        final boolean idempotent = IDEMPOTENT.contains(request.getMethod());
+        final boolean idempotent = Method.normalizedValueOf(request.getMethod()).isIdempotent();
         final HttpEntity reqEntity = request.getEntity();
         final boolean repeatable = reqEntity == null || reqEntity.isRepeatable();
 

httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/TooEarlyStatusRetryAsyncExec.java

@@ -46,6 +46,7 @@
 import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.Method;
 import org.apache.hc.core5.http.nio.AsyncDataConsumer;
 import org.apache.hc.core5.http.nio.AsyncEntityProducer;
 import org.apache.hc.core5.http.nio.CapacityChannel;
@@ -60,9 +61,6 @@
 public final class TooEarlyStatusRetryAsyncExec implements AsyncExecChainHandler {
 
     private static final String RETRIED_ATTR = "http.client.too_early.retried";
-    private static final Set<String> IDEMPOTENT = Collections.unmodifiableSet(
-            new HashSet<>(Arrays.asList("GET", "HEAD", "OPTIONS", "TRACE", "PUT", "DELETE"))
-    );
 
     private final boolean include429and503;
 
@@ -95,7 +93,7 @@ public AsyncDataConsumer handleResponse(
 
                 final boolean alreadyRetried =
                         Boolean.TRUE.equals(scope.clientContext.getAttribute(RETRIED_ATTR));
-                final boolean idempotent = IDEMPOTENT.contains(request.getMethod());
+                final boolean idempotent = Method.normalizedValueOf(request.getMethod()).isIdempotent();
                 final boolean repeatable = entityProducer == null || entityProducer.isRepeatable();
 
                 if (eligible && !alreadyRetried && idempotent && repeatable) {