diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java index c460fec9..3807e640 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java @@ -98,6 +98,8 @@ public class FeignClientFactoryBean private int connectTimeoutMillis = new Request.Options().connectTimeoutMillis(); + private boolean followRedirects = new Request.Options().isFollowRedirects(); + @Override public void afterPropertiesSet() { Assert.hasText(contextId, "Context id must be set"); @@ -182,6 +184,7 @@ public class FeignClientFactoryBean builder.options(options); readTimeoutMillis = options.readTimeoutMillis(); connectTimeoutMillis = options.connectTimeoutMillis(); + followRedirects = options.isFollowRedirects(); } Map requestInterceptors = getInheritedAwareInstances(context, RequestInterceptor.class); @@ -222,9 +225,10 @@ public class FeignClientFactoryBean connectTimeoutMillis = config.getConnectTimeout() != null ? config.getConnectTimeout() : connectTimeoutMillis; readTimeoutMillis = config.getReadTimeout() != null ? config.getReadTimeout() : readTimeoutMillis; + followRedirects = config.isFollowRedirects() != null ? config.isFollowRedirects() : followRedirects; builder.options(new Request.Options(connectTimeoutMillis, TimeUnit.MILLISECONDS, readTimeoutMillis, - TimeUnit.MILLISECONDS, true)); + TimeUnit.MILLISECONDS, followRedirects)); if (config.getRetryer() != null) { Retryer retryer = getOrInstantiate(config.getRetryer()); @@ -495,13 +499,16 @@ public class FeignClientFactoryBean && Objects.equals(beanFactory, that.beanFactory) && decode404 == that.decode404 && inheritParentContext == that.inheritParentContext && Objects.equals(fallback, that.fallback) && Objects.equals(fallbackFactory, that.fallbackFactory) && Objects.equals(name, that.name) - && Objects.equals(path, that.path) && Objects.equals(type, that.type) && Objects.equals(url, that.url); + && Objects.equals(path, that.path) && Objects.equals(type, that.type) && Objects.equals(url, that.url) + && Objects.equals(connectTimeoutMillis, that.connectTimeoutMillis) + && Objects.equals(readTimeoutMillis, that.readTimeoutMillis) + && Objects.equals(followRedirects, that.followRedirects); } @Override public int hashCode() { return Objects.hash(applicationContext, beanFactory, decode404, inheritParentContext, fallback, fallbackFactory, - name, path, type, url); + name, path, type, url, readTimeoutMillis, connectTimeoutMillis, followRedirects); } @Override @@ -512,6 +519,8 @@ public class FeignClientFactoryBean .append(inheritParentContext).append(", ").append("applicationContext=").append(applicationContext) .append(", ").append("beanFactory=").append(beanFactory).append(", ").append("fallback=") .append(fallback).append(", ").append("fallbackFactory=").append(fallbackFactory).append("}") + .append("connectTimeoutMillis=").append(connectTimeoutMillis).append("}").append("readTimeoutMillis=") + .append(readTimeoutMillis).append("}").append("followRedirects=").append(followRedirects).append("}") .toString(); } diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientProperties.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientProperties.java index 7e5cfb5b..a15786ab 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientProperties.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,6 +39,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Ilia Ilinykh * @author Ram Anaswara * @author Jonatan Ivanov + * @author Olga Maciaszek-Sharma */ @ConfigurationProperties("feign.client") public class FeignClientProperties { @@ -140,6 +141,8 @@ public class FeignClientProperties { private MetricsProperties metrics; + private Boolean followRedirects; + public Logger.Level getLoggerLevel() { return loggerLevel; } @@ -260,6 +263,14 @@ public class FeignClientProperties { this.metrics = metrics; } + public Boolean isFollowRedirects() { + return followRedirects; + } + + public void setFollowRedirects(Boolean followRedirects) { + this.followRedirects = followRedirects; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -278,14 +289,15 @@ public class FeignClientProperties { && Objects.equals(exceptionPropagationPolicy, that.exceptionPropagationPolicy) && Objects.equals(defaultRequestHeaders, that.defaultRequestHeaders) && Objects.equals(defaultQueryParameters, that.defaultQueryParameters) - && Objects.equals(capabilities, that.capabilities) && Objects.equals(metrics, that.metrics); + && Objects.equals(capabilities, that.capabilities) && Objects.equals(metrics, that.metrics) + && Objects.equals(followRedirects, that.followRedirects); } @Override public int hashCode() { return Objects.hash(loggerLevel, connectTimeout, readTimeout, retryer, errorDecoder, requestInterceptors, decode404, encoder, decoder, contract, exceptionPropagationPolicy, defaultQueryParameters, - defaultRequestHeaders, capabilities, metrics); + defaultRequestHeaders, capabilities, metrics, followRedirects); } } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java index 8c099a86..d5b5f113 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ package org.springframework.cloud.openfeign; import java.util.Map; +import java.util.concurrent.TimeUnit; import feign.Capability; import feign.Contract; @@ -45,14 +46,14 @@ import org.springframework.cloud.openfeign.support.SpringMvcContract; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import static org.assertj.core.api.Assertions.assertThat; /** * @author Spencer Gibb * @author Jonatan Ivanov + * @author Olga Maciaszek-Sharma */ @SpringBootTest(classes = FeignClientOverrideDefaultsTests.TestConfiguration.class) @DirtiesContext @@ -121,6 +122,7 @@ class FeignClientOverrideDefaultsTests { Request.Options options = context.getInstance("bar", Request.Options.class); assertThat(options.connectTimeoutMillis()).isEqualTo(1); assertThat(options.readTimeoutMillis()).isEqualTo(1); + assertThat(options.isFollowRedirects()).isFalse(); } @Test @@ -169,7 +171,7 @@ class FeignClientOverrideDefaultsTests { @FeignClient(name = "bar", url = "https://bar", configuration = BarConfiguration.class) interface BarClient { - @RequestMapping(value = "/", method = RequestMethod.GET) + @GetMapping("/") String get(); } @@ -240,7 +242,7 @@ class FeignClientOverrideDefaultsTests { @Bean Request.Options feignRequestOptions() { - return new Request.Options(1, 1); + return new Request.Options(1, TimeUnit.MILLISECONDS, 1, TimeUnit.MILLISECONDS, false); } @Bean diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java index deaad2e2..30c3323d 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -249,6 +249,20 @@ public class FeignClientUsingPropertiesTests { .hasAtLeastOneElementOfType(MicrometerCapability.class); } + @Test + public void shouldSetFollowRedirects() { + FeignClientFactoryBean testFactoryBean = new FeignClientFactoryBean(); + testFactoryBean.setContextId("test"); + testFactoryBean.setType(FeignClientFactoryBean.class); + testFactoryBean.setApplicationContext(applicationContext); + + TimeoutClient client = testFactoryBean.feign(context).target(TimeoutClient.class, "http://localhost:" + port); + + Request.Options options = getRequestOptions((Proxy) client); + + assertThat(options.isFollowRedirects()).isFalse(); + } + private Request.Options getRequestOptions(Proxy client) { Object invocationHandlerLambda = ReflectionTestUtils.getField(client, "h"); Object invocationHandler = ReflectionTestUtils.getField(invocationHandlerLambda, "arg$2"); diff --git a/spring-cloud-openfeign-core/src/test/resources/feign-properties.properties b/spring-cloud-openfeign-core/src/test/resources/feign-properties.properties index 9c00b4c2..9ead89f3 100644 --- a/spring-cloud-openfeign-core/src/test/resources/feign-properties.properties +++ b/spring-cloud-openfeign-core/src/test/resources/feign-properties.properties @@ -23,3 +23,4 @@ feign.client.config.unwrap.readTimeout=1000 feign.client.config.unwrap.exceptionPropagationPolicy=unwrap feign.client.config.readTimeout.readTimeout=1000 feign.client.config.connectTimeout.connectTimeout=1000 +feign.client.config.default.followRedirects=false