fix: Response.protocolVersion may cause NPE (#2351)

* fix: set Response.protocolVersion default value * refactor: add default protocol version field * refactor: change to default protocol version value using builder field.
OpenFeign · Mar 16, 2024 · 3051df1 · 3051df1
1 parent a5a1cd3
commit 3051df1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/core/src/main/java/feign/Response.java b/core/src/main/java/feign/Response.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 The Feign Authors
+ * Copyright 2012-2024 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -50,13 +50,14 @@ public static Builder builder() {
   }
 
   public static final class Builder {
+    private static final ProtocolVersion DEFAULT_PROTOCOL_VERSION = ProtocolVersion.HTTP_1_1;
     int status;
     String reason;
     Map<String, Collection<String>> headers;
     Body body;
     Request request;
     private RequestTemplate requestTemplate;
-    private ProtocolVersion protocolVersion = ProtocolVersion.HTTP_1_1;
+    private ProtocolVersion protocolVersion = DEFAULT_PROTOCOL_VERSION;
 
     Builder() {}
 
@@ -136,7 +137,7 @@ public Builder request(Request request) {
 
     /** HTTP protocol version */
     public Builder protocolVersion(ProtocolVersion protocolVersion) {
-      this.protocolVersion = protocolVersion;
+      this.protocolVersion = (protocolVersion != null) ? protocolVersion : DEFAULT_PROTOCOL_VERSION;
       return this;
     }
 

diff --git a/core/src/test/java/feign/ResponseTest.java b/core/src/test/java/feign/ResponseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 The Feign Authors
+ * Copyright 2012-2024 The Feign Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -134,4 +134,19 @@ void statusCodesOfAnyValueAreAllowed() {
               assertThat(response.status()).isEqualTo(statusCode);
             });
   }
+
+  @Test
+  void protocolVersionDefaultsToHttp1_1() {
+    Response response =
+        Response.builder()
+            .status(200)
+            .request(
+                Request.create(HttpMethod.GET, "/api", Collections.emptyMap(), null, Util.UTF_8))
+            .protocolVersion(null)
+            .body(new byte[0])
+            .build();
+
+    assertThat(response.protocolVersion()).isEqualTo(Request.ProtocolVersion.HTTP_1_1);
+    assertThat(response.toString()).startsWith("HTTP/1.1 200");
+  }
 }