The HTTP protocol version: it misses in AsyncApacheHttp5Client's resp…

…onse and hardcoded in Request.toString() (#2097) * Missed the HTTP protocol version in HC5. The hardcoded protocol version in Request.toString() * Fix formatting
OpenFeign · Jun 21, 2023 · e4d2bed · e4d2bed
1 parent f1e2c19
commit e4d2bed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/src/main/java/feign/Request.java b/core/src/main/java/feign/Request.java
@@ -276,7 +276,8 @@ public ProtocolVersion protocolVersion() {
   @Override
   public String toString() {
     final StringBuilder builder = new StringBuilder();
-    builder.append(httpMethod).append(' ').append(url).append(" HTTP/1.1\n");
+    builder.append(httpMethod).append(' ').append(url).append(' ').append(protocolVersion)
+        .append('\n');
     for (final String field : headers.keySet()) {
       for (final String value : valuesOrEmpty(headers, field)) {
         builder.append(field).append(": ").append(value).append('\n');

diff --git a/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java b/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java
@@ -28,6 +28,7 @@
 import java.util.concurrent.CompletableFuture;
 import feign.*;
 import feign.Request.Options;
+import static feign.Util.enumForName;
 
 /**
  * This module directs Feign's http requests to Apache's
@@ -179,6 +180,8 @@ Response toFeignResponse(SimpleHttpResponse httpResponse, Request request) {
     }
 
     return Response.builder()
+        .protocolVersion(
+            enumForName(Request.ProtocolVersion.class, httpResponse.getVersion().format()))
         .status(statusCode)
         .reason(reason)
         .headers(headers)