Updates in response to CodeRabbit

OpenFeign · Aug 28, 2023 · 2da31ac · 2da31ac
1 parent 4315cc1
commit 2da31ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/core/src/main/java/feign/RedirectionInterceptor.java b/core/src/main/java/feign/RedirectionInterceptor.java
@@ -30,10 +30,9 @@ public Object aroundDecode(InvocationContext invocationContext) throws Exception
     Response response = invocationContext.response();
     int status = response.status();
     Object returnValue = null;
-    if (300 <= status && status < 400) {
+    if (300 <= status && status < 400 && response.headers().containsKey("Location")) {
       Type returnType = rawType(invocationContext.returnType());
-      Collection<String> locations =
-          response.headers().getOrDefault("Location", Collections.emptyList());
+      Collection<String> locations = response.headers().get("Location");
       if (Collection.class.equals(returnType)) {
         returnValue = locations;
       } else if (String.class.equals(returnType)) {

diff --git a/core/src/test/java/feign/FeignTest.java b/core/src/test/java/feign/FeignTest.java
@@ -18,8 +18,12 @@
 import feign.Feign.ResponseMappingDecoder;
 import feign.Request.HttpMethod;
 import feign.Target.HardCodedTarget;
-import feign.codec.*;
-import feign.querymap.BeanQueryMapEncoder;
+import feign.codec.DecodeException;
+import feign.codec.Decoder;
+import feign.codec.EncodeException;
+import feign.codec.Encoder;
+import feign.codec.ErrorDecoder;
+import feign.codec.StringDecoder;import feign.querymap.BeanQueryMapEncoder;
 import feign.querymap.FieldQueryMapEncoder;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;