Add test. Fix typo in docs. Update config properties documentation.

docs/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.2-SNAPSHOT</version>
+		<version>3.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>jar</packaging>

docs/src/main/asciidoc/_configprops.adoc

@@ -26,7 +26,7 @@
 |feign.httpclient.hc5.socket-timeout-unit |  | Default value for socket timeout unit.
 |feign.httpclient.max-connections | `200` | 
 |feign.httpclient.max-connections-per-route | `50` | 
-|feign.httpclient.ok-http.read-timeout | `60s` | {@link OkHttpClient} read timeout; defaults to 60 seconds.
+|feign.httpclient.ok-http-client-properties.read-timeout | `60s` | {@link OkHttpClient} read timeout; defaults to 60 seconds.
 |feign.httpclient.time-to-live | `900` | 
 |feign.httpclient.time-to-live-unit |  | 
 |feign.metrics.enabled | `true` | Enables metrics capability for Feign.

pom.xml

@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>3.1.2-SNAPSHOT</version>
+	<version>3.1.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.1</version>
+		<version>3.1.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,7 +26,7 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>3.1.2-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-commons.version>3.1.1-SNAPSHOT</spring-cloud-commons.version>
 
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>

spring-cloud-openfeign-core/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.2-SNAPSHOT</version>
+		<version>3.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java

@@ -287,7 +287,7 @@ public class FeignAutoConfiguration {
 			boolean followRedirects = httpClientProperties.isFollowRedirects();
 			int connectTimeout = httpClientProperties.getConnectionTimeout();
 			boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
-			Duration readTimeout = httpClientProperties.getOkHttp().getReadTimeout();
+			Duration readTimeout = httpClientProperties.getOkHttpClientProperties().getReadTimeout();
 			this.okHttpClient = httpClientFactory.createBuilder(disableSslValidation)
 					.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).followRedirects(followRedirects)
 					.readTimeout(readTimeout).connectionPool(connectionPool).build();

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java

@@ -17,7 +17,6 @@
 package org.springframework.cloud.openfeign;
 
 import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.LinkedHashMap;
@@ -30,7 +29,6 @@ import feign.Target;
 
 import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
 import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
-import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 
@@ -97,29 +95,15 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
 				try {
 					return this.fallbackMethodMap.get(method).invoke(fallback, args);
 				}
-				catch (Exception exception) {
-					unwrapAndRethrow(exception);
+				catch (Exception e) {
+					throw new IllegalStateException(e);
 				}
-				return null;
 			};
 			return circuitBreaker.run(supplier, fallbackFunction);
 		}
 		return circuitBreaker.run(supplier);
 	}
 
-	private void unwrapAndRethrow(Exception exception) {
-		if (exception instanceof InvocationTargetException || exception instanceof NoFallbackAvailableException) {
-			Throwable underlyingException = exception.getCause();
-			if (underlyingException instanceof RuntimeException) {
-				throw (RuntimeException) underlyingException;
-			}
-			if (underlyingException != null) {
-				throw new IllegalStateException(underlyingException);
-			}
-			throw new IllegalStateException(exception);
-		}
-	}
-
 	private Supplier<Object> asSupplier(final Method method, final Object[] args) {
 		final RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
 		return () -> {

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java

@@ -69,7 +69,6 @@ import org.springframework.util.StringUtils;
  * @author Sam Kruglov
  * @author Jasbir Singh
  * @author Hyeonmin Park
- * @author Felix Dittrich
  */
 public class FeignClientFactoryBean
 		implements FactoryBean<Object>, InitializingBean, ApplicationContextAware, BeanFactoryAware {
@@ -133,6 +132,7 @@ public class FeignClientFactoryBean
 		// @formatter:on
 
 		configureFeign(context, builder);
+		applyBuildCustomizers(context, builder);
 
 		return builder;
 	}
@@ -374,7 +374,6 @@ public class FeignClientFactoryBean
 		Client client = getOptional(context, Client.class);
 		if (client != null) {
 			builder.client(client);
-			applyBuildCustomizers(context, builder);
 			Targeter targeter = get(context, Targeter.class);
 			return targeter.target(this, builder, context, target);
 		}
@@ -444,17 +443,11 @@ public class FeignClientFactoryBean
 			}
 			builder.client(client);
 		}
-
-		applyBuildCustomizers(context, builder);
-
 		Targeter targeter = get(context, Targeter.class);
 		return (T) targeter.target(this, builder, context, new HardCodedTarget<>(type, name, url));
 	}
 
 	private String cleanPath() {
-		if (path == null) {
-			return "";
-		}
 		String path = this.path.trim();
 		if (StringUtils.hasLength(path)) {
 			if (!path.startsWith("/")) {

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java

@@ -302,11 +302,7 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 			if (resolver == null) {
 				return resolved;
 			}
-			Object evaluateValue = resolver.evaluate(resolved, new BeanExpressionContext(beanFactory, null));
-			if (evaluateValue != null) {
-				return String.valueOf(evaluateValue);
-			}
-			return null;
+			return String.valueOf(resolver.evaluate(resolved, new BeanExpressionContext(beanFactory, null)));
 		}
 		return value;
 	}

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/OkHttpFeignConfiguration.java

@@ -60,7 +60,7 @@ public class OkHttpFeignConfiguration {
 			FeignHttpClientProperties httpClientProperties) {
 		boolean followRedirects = httpClientProperties.isFollowRedirects();
 		int connectTimeout = httpClientProperties.getConnectionTimeout();
-		Duration reaTimeout = httpClientProperties.getOkHttp().getReadTimeout();
+		Duration reaTimeout = httpClientProperties.getOkHttpClientProperties().getReadTimeout();
 		this.okHttpClient = httpClientFactory.createBuilder(httpClientProperties.isDisableSslValidation())
 				.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).followRedirects(followRedirects)
 				.readTimeout(reaTimeout).connectionPool(connectionPool).build();

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/FeignHttpClientProperties.java

@@ -95,7 +95,7 @@ public class FeignHttpClientProperties {
 	/**
 	 * Additional {@link OkHttpClient}-specific properties.
 	 */
-	private OkHttp okHttp = new OkHttp();
+	private OkHttpClientProperties okHttpClientProperties = new OkHttpClientProperties();
 
 	public int getConnectionTimerRepeat() {
 		return connectionTimerRepeat;
@@ -169,12 +169,12 @@ public class FeignHttpClientProperties {
 		this.hc5 = hc5;
 	}
 
-	public OkHttp getOkHttp() {
-		return okHttp;
+	public OkHttpClientProperties getOkHttpClientProperties() {
+		return okHttpClientProperties;
 	}
 
-	public void setOkHttp(OkHttp okHttp) {
-		this.okHttp = okHttp;
+	public void setOkHttpClientProperties(OkHttpClientProperties okHttpClientProperties) {
+		this.okHttpClientProperties = okHttpClientProperties;
 	}
 
 	public static class Hc5Properties {
@@ -292,7 +292,7 @@ public class FeignHttpClientProperties {
 	/**
 	 * {@link OkHttpClient}-specific properties.
 	 */
-	public static class OkHttp {
+	public static class OkHttpClientProperties {
 
 		/**
 		 * {@link OkHttpClient} read timeout; defaults to 60 seconds.

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignBuilderCustomizerTests.java

@@ -17,56 +17,35 @@
 package org.springframework.cloud.openfeign;
 
 import java.lang.reflect.Field;
-import java.util.stream.Stream;
 
-import feign.Client;
 import feign.Feign;
 import feign.Logger;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.ArgumentCaptor;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.annotation.Order;
 import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doCallRealMethod;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 
 /**
  * @author Matt King
  * @author Sam Kruglov
- * @author Felix Dittrich
- * @author Olga Maciaszek-Sharma
  */
 class FeignBuilderCustomizerTests {
 
-	private static final Targeter targeterSpy = spy(DefaultTargeter.class);
-
-	private static final Client defaultClient = mock(Client.class);
-
 	@Test
 	void testBuilderCustomizer() {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				FeignBuilderCustomizerTests.SampleConfiguration2.class);
 
 		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
-		clientFactoryBean.getTarget();
+		FeignContext feignContext = context.getBean(FeignContext.class);
 
-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
-		Feign.Builder builder = feignBuilderCaptor.getValue();
+		Feign.Builder builder = clientFactoryBean.feign(feignContext);
 		assertFeignBuilderField(builder, "logLevel", Logger.Level.HEADERS);
 		assertFeignBuilderField(builder, "decode404", true);
 
@@ -83,17 +62,13 @@ class FeignBuilderCustomizerTests {
 
 	@Test
 	void testBuildCustomizerOrdered() {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				FeignBuilderCustomizerTests.SampleConfiguration3.class);
 
 		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
-		clientFactoryBean.getTarget();
+		FeignContext feignContext = context.getBean(FeignContext.class);
 
-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
-		Feign.Builder builder = feignBuilderCaptor.getValue();
+		Feign.Builder builder = clientFactoryBean.feign(feignContext);
 		assertFeignBuilderField(builder, "logLevel", Logger.Level.FULL);
 		assertFeignBuilderField(builder, "decode404", true);
 
@@ -102,19 +77,15 @@ class FeignBuilderCustomizerTests {
 
 	@Test
 	void testBuildCustomizerOrderedWithAdditional() {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				FeignBuilderCustomizerTests.SampleConfiguration3.class);
 
 		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
 		clientFactoryBean.addCustomizer(builder -> builder.logLevel(Logger.Level.BASIC));
 		clientFactoryBean.addCustomizer(Feign.Builder::doNotCloseAfterDecode);
-		clientFactoryBean.getTarget();
+		FeignContext feignContext = context.getBean(FeignContext.class);
 
-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
-		Feign.Builder builder = feignBuilderCaptor.getValue();
+		Feign.Builder builder = clientFactoryBean.feign(feignContext);
 		assertFeignBuilderField(builder, "logLevel", Logger.Level.BASIC);
 		assertFeignBuilderField(builder, "decode404", true);
 		assertFeignBuilderField(builder, "closeAfterDecode", false);
@@ -122,41 +93,16 @@ class FeignBuilderCustomizerTests {
 		context.close();
 	}
 
-	@ParameterizedTest(name = "should use custom HttpClient with config: {0}")
-	@MethodSource("testConfiguration")
-	void testBuildCustomizerWithCustomHttpClient(Class configClass) {
-		ArgumentCaptor<Feign.Builder> feignBuilderCaptor = ArgumentCaptor.forClass(Feign.Builder.class);
-		doCallRealMethod().when(targeterSpy).target(any(), feignBuilderCaptor.capture(), any(), any());
-		Client customClientMock = mock(Client.class);
-
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(configClass);
-		FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class);
-		clientFactoryBean.addCustomizer(builder -> builder.client(customClientMock));
-		clientFactoryBean.getTarget();
-
-		Assertions.assertNotNull(feignBuilderCaptor.getValue());
-		Feign.Builder builder = feignBuilderCaptor.getValue();
-		assertFeignBuilderField(builder, "client", customClientMock);
-
-		context.close();
-	}
-
-	private static FeignClientFactoryBean defaultFeignClientFactoryBean(String url) {
+	private static FeignClientFactoryBean defaultFeignClientFactoryBean() {
 		FeignClientFactoryBean feignClientFactoryBean = new FeignClientFactoryBean();
 		feignClientFactoryBean.setContextId("test");
 		feignClientFactoryBean.setName("test");
 		feignClientFactoryBean.setType(FeignClientFactoryTests.TestType.class);
 		feignClientFactoryBean.setPath("");
-		if (url != null) {
-			feignClientFactoryBean.setUrl(url);
-		}
+		feignClientFactoryBean.setUrl("http://some.absolute.url");
 		return feignClientFactoryBean;
 	}
 
-	private static Stream<Class> testConfiguration() {
-		return Stream.of(SampleConfiguration3.class, LoadBalancedSampleConfiguration.class);
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@Import(FeignClientsConfiguration.class)
 	protected static class SampleConfiguration2 {
@@ -183,12 +129,7 @@ class FeignBuilderCustomizerTests {
 
 		@Bean
 		FeignClientFactoryBean feignClientFactoryBean() {
-			return defaultFeignClientFactoryBean("http://some.absolute.url");
-		}
-
-		@Bean
-		Targeter targeter() {
-			return targeterSpy;
+			return defaultFeignClientFactoryBean();
 		}
 
 	}
@@ -226,29 +167,7 @@ class FeignBuilderCustomizerTests {
 
 		@Bean
 		FeignClientFactoryBean feignClientFactoryBean() {
-			return defaultFeignClientFactoryBean("http://some.absolute.url");
-		}
-
-		@Bean
-		Targeter targeter() {
-			return targeterSpy;
-		}
-
-		@Bean
-		Client client() {
-			return defaultClient;
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@Import(SampleConfiguration3.class)
-	protected static class LoadBalancedSampleConfiguration {
-
-		@Primary
-		@Bean
-		FeignClientFactoryBean feignClientFactoryBean() {
-			return defaultFeignClientFactoryBean(null);
+			return defaultFeignClientFactoryBean();
 		}
 
 	}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java

@@ -18,30 +18,24 @@ package org.springframework.cloud.openfeign;
 
 import java.util.Collections;
 
-import feign.Target;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
 
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.env.MockEnvironment;
-import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 
 /**
  * @author Spencer Gibb
  * @author Gang Li
  * @author Michal Domagala
  * @author Szymon Linowski
- * @author Olga Maciaszek-Sharma
  */
 class FeignClientsRegistrarTests {
 
@@ -103,39 +97,14 @@ class FeignClientsRegistrarTests {
 
 	@Test
 	void shouldPassSubLevelFeignClient() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		((DefaultListableBeanFactory) context.getBeanFactory()).setAllowBeanDefinitionOverriding(false);
-		context.register(TopLevelSubLevelTestConfig.class);
-		assertThatCode(context::refresh)
+		AnnotationConfigApplicationContext config = new AnnotationConfigApplicationContext();
+		((DefaultListableBeanFactory) config.getBeanFactory()).setAllowBeanDefinitionOverriding(false);
+		config.register(TopLevelSubLevelTestConfig.class);
+		assertThatCode(() -> config.refresh())
 				.as("Case https://github.com/spring-cloud/spring-cloud-openfeign/issues/331 should be solved")
 				.doesNotThrowAnyException();
 	}
 
-	@Test
-	@DisabledForJreRange(min = JRE.JAVA_16)
-	void shouldResolveNullUrl() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.register(NullUrlFeignClientTestConfig.class);
-		context.refresh();
-
-		Object feignClientBean = context.getBean(NullUrlFeignClient.class);
-
-		Object invocationHandlerLambda = ReflectionTestUtils.getField(feignClientBean, "h");
-		Target.HardCodedTarget<NullUrlFeignClient> target = (Target.HardCodedTarget<NullUrlFeignClient>) ReflectionTestUtils
-				.getField(invocationHandlerLambda, "arg$3");
-		assertThat(target.name()).isEqualTo("nullUrlFeignClient");
-		assertThat(target.url()).isEqualTo("http://nullUrlFeignClient");
-	}
-
-	@Test
-	void shouldResolveAndValidateNullName() {
-		assertThatIllegalStateException().isThrownBy(() -> {
-			AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-			context.register(NullExpressionNameFeignClientTestConfig.class);
-			context.refresh();
-		});
-	}
-
 	@FeignClient(name = "fallbackTestClient", url = "http://localhost:8080/", fallback = FallbackClient.class)
 	protected interface FallbackClient {
 
@@ -153,16 +122,6 @@ class FeignClientsRegistrarTests {
 
 	}
 
-	@FeignClient(name = "nullUrlFeignClient", url = "${test.url:#{null}}", path = "${test.path:#{null}}")
-	protected interface NullUrlFeignClient {
-
-	}
-
-	@FeignClient(name = "${test.name:#{null}}")
-	protected interface NullExpressionNameFeignClient {
-
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@EnableFeignClients(clients = { FeignClientsRegistrarTests.FallbackClient.class })
@@ -183,18 +142,4 @@ class FeignClientsRegistrarTests {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@EnableFeignClients(clients = NullUrlFeignClient.class)
-	protected static class NullUrlFeignClientTestConfig {
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@EnableAutoConfiguration
-	@EnableFeignClients(clients = NullExpressionNameFeignClient.class)
-	protected static class NullExpressionNameFeignClientTestConfig {
-
-	}
-
 }

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignOkHttpConfigurationTests.java

@@ -45,7 +45,7 @@ class FeignOkHttpConfigurationTests {
 	void setUp() {
 		this.context = new SpringApplicationBuilder()
 				.properties("debug=true", "feign.httpclient.disableSslValidation=true", "feign.okhttp.enabled=true",
-						"feign.httpclient.enabled=false", "feign.httpclient.okhttp.read-timeout=9s")
+						"feign.httpclient.enabled=false", "feign.httpclient.okhttp-client-properties.read-timeout=9s")
 				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
 				.run();
 	}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java

@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.openfeign.circuitbreaker;
 
-import java.io.IOException;
 import java.util.function.Function;
 
 import org.apache.commons.logging.Log;
@@ -48,7 +47,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Spencer Gibb
@@ -64,9 +62,6 @@ class CircuitBreakerTests {
 	@Autowired
 	TestClient testClient;
 
-	@Autowired
-	ExceptionClient exceptionClient;
-
 	@Autowired
 	TestClientWithFactory testClientWithFactory;
 
@@ -113,17 +108,6 @@ class CircuitBreakerTests {
 		assertThat(testClientWithFactory.getException()).isEqualTo("Fixed response");
 	}
 
-	@Test
-	void testRuntimeExceptionUnwrapped() {
-		assertThatExceptionOfType(UnsupportedOperationException.class)
-				.isThrownBy(() -> exceptionClient.getRuntimeException());
-	}
-
-	@Test
-	void testCheckedExceptionWrapped() {
-		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> exceptionClient.getCheckedException());
-	}
-
 	@FeignClient(name = "test", url = "http://localhost:${server.port}/", fallback = Fallback.class)
 	protected interface TestClient {
 
@@ -135,18 +119,6 @@ class CircuitBreakerTests {
 
 	}
 
-	@FeignClient(name = "exceptionClient", url = "http://localhost:${server.port}/",
-			fallbackFactory = ExceptionThrowingFallbackFactory.class)
-	protected interface ExceptionClient {
-
-		@GetMapping("/runtimeException")
-		Hello getRuntimeException();
-
-		@GetMapping("/runtimeException")
-		Hello getCheckedException() throws IOException;
-
-	}
-
 	@Component
 	static class Fallback implements TestClient {
 
@@ -184,25 +156,6 @@ class CircuitBreakerTests {
 
 	}
 
-	static class ExceptionThrowingFallbackFactory implements FallbackFactory<ExceptionClient> {
-
-		@Override
-		public ExceptionClient create(Throwable cause) {
-			return new ExceptionClient() {
-				@Override
-				public Hello getRuntimeException() {
-					throw new UnsupportedOperationException("Not implemented!");
-				}
-
-				@Override
-				public Hello getCheckedException() throws IOException {
-					throw new IOException();
-				}
-			};
-		}
-
-	}
-
 	static class FallbackWithFactory implements TestClientWithFactory {
 
 		@Override
@@ -220,7 +173,7 @@ class CircuitBreakerTests {
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
 	@RestController
-	@EnableFeignClients(clients = { TestClient.class, TestClientWithFactory.class, ExceptionClient.class })
+	@EnableFeignClients(clients = { TestClient.class, TestClientWithFactory.class })
 	@Import(NoSecurityConfiguration.class)
 	protected static class Application implements TestClient {
 
@@ -272,11 +225,6 @@ class CircuitBreakerTests {
 			return new TestFallbackFactory();
 		}
 
-		@Bean
-		ExceptionThrowingFallbackFactory exceptionThrowingFallbackFactory() {
-			return new ExceptionThrowingFallbackFactory();
-		}
-
 	}
 
 }

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java

@@ -59,11 +59,11 @@ class FeignLoadBalancerAutoConfigurationTests {
 	@Test
 	void shouldInstantiateOkHttpFeignClientWhenEnabled() {
 		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false",
-				"feign.okhttp.enabled=true", "spring.cloud.loadbalancer.retry.enabled=false",
-				"feign.httpclient.okhttp.read-timeout=9s");
+			"feign.okhttp.enabled=true", "spring.cloud.loadbalancer.retry.enabled=false",
+			"feign.httpclient.okhttp-client-properties.read-timeout=9s");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		Map<String, FeignBlockingLoadBalancerClient> beans = context
-				.getBeansOfType(FeignBlockingLoadBalancerClient.class);
+			.getBeansOfType(FeignBlockingLoadBalancerClient.class);
 		assertThat(beans).as("Missing bean of type %s", OkHttpClient.class).hasSize(1);
 		Client client = beans.get("feignClient").getDelegate();
 		assertThat(client).isInstanceOf(OkHttpClient.class);

spring-cloud-openfeign-dependencies/pom.xml

@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.2-SNAPSHOT</version>
+		<version>3.1.0</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.1.2-SNAPSHOT</version>
+	<version>3.1.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>

spring-cloud-starter-openfeign/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.2-SNAPSHOT</version>
+		<version>3.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>