From bbb7cb0e5cfa0f8300fd3b7854fbf116946d1d5d Mon Sep 17 00:00:00 2001 From: Vitalij Berdinskih Date: Wed, 21 Jun 2023 10:26:26 +0300 Subject: [PATCH 1/2] Missed the HTTP protocol version in HC5. The hardcoded protocol version in Request.toString() --- core/src/main/java/feign/Request.java | 3 ++- hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/feign/Request.java b/core/src/main/java/feign/Request.java index 73c797d83a..1e590a4869 100644 --- 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 index d1dfbb2a8b..215c00d05e 100644 --- a/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java +++ b/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java @@ -29,6 +29,8 @@ import feign.*; import feign.Request.Options; +import static feign.Util.enumForName; + /** * This module directs Feign's http requests to Apache's * HttpClient 5. Ex. @@ -179,6 +181,8 @@ Response toFeignResponse(SimpleHttpResponse httpResponse, Request request) { } return Response.builder() + .protocolVersion( + enumForName(Request.ProtocolVersion.class, httpResponse.getVersion().format())) .status(statusCode) .reason(reason) .headers(headers) From b380bb15b7791ac54713f063894f8525e478d99a Mon Sep 17 00:00:00 2001 From: Vitalij Berdinskih Date: Wed, 21 Jun 2023 10:41:54 +0300 Subject: [PATCH 2/2] Fix formatting --- hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java b/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java index 215c00d05e..09c89887ef 100644 --- a/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java +++ b/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java @@ -28,7 +28,6 @@ import java.util.concurrent.CompletableFuture; import feign.*; import feign.Request.Options; - import static feign.Util.enumForName; /**