Handled PR comments

aws · Dec 3, 2024 · 76713f1 · 76713f1
1 parent 700b3e5
commit 76713f1
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/.../main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactory.java b/.../main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactory.java
@@ -116,31 +116,30 @@ private HttpRequestBase createApacheRequest(HttpExecuteRequest request, URI uri)
 
         switch (method) {
             case HEAD:
-                return request.contentStreamProvider().isPresent()
+                return isRequestBodyPresent(request)
                        ? wrapEntity(request, new HttpRequestImpl(method, uri))
                        : new HttpHead(uri);
             case GET:
-                return request.contentStreamProvider().isPresent()
+                return isRequestBodyPresent(request)
                        ? wrapEntity(request, new HttpRequestImpl(method, uri))
                        : new HttpGet(uri);
             case DELETE:
-                return request.contentStreamProvider().isPresent()
+                return isRequestBodyPresent(request)
                        ? wrapEntity(request, new HttpRequestImpl(method, uri))
                        : new HttpDelete(uri);
             case OPTIONS:
-                return request.contentStreamProvider().isPresent()
+                return isRequestBodyPresent(request)
                        ? wrapEntity(request, new HttpRequestImpl(method, uri))
                        : new HttpOptions(uri);
             case PATCH:
             case POST:
             case PUT:
                 return wrapEntity(request, new HttpRequestImpl(method, uri));
             default:
-                throw new IllegalArgumentException("Unknown or unsupported HTTP method: " + method);
+                throw new RuntimeException("Unknown HTTP method name: " + request.httpRequest().method());
         }
     }
 
-
     private HttpRequestBase wrapEntity(HttpExecuteRequest request,
                                        HttpEntityEnclosingRequestBase entityEnclosingRequest) {
 
@@ -211,4 +210,9 @@ public String getMethod() {
             return this.method.toString();
         }
     }
+
+    private static boolean isRequestBodyPresent(HttpExecuteRequest request) {
+        return request.contentStreamProvider().isPresent();
+    }
+
 }