removed duplicate feign ApacheHttpClient configuration

This commit is contained in:
Spencer Gibb
2016-08-31 12:02:25 -06:00
parent 9b550f7293
commit 959b007269
3 changed files with 3 additions and 19 deletions

View File

@@ -79,7 +79,7 @@ public class FeignAutoConfiguration {
// the following configuration is for alternate feign clients if
// ribbon is not on the class path.
// see corresponding confiurations in FeignRibbonClientAutoConfiguration
// see corresponding configurations in FeignRibbonClientAutoConfiguration
// for load balanced ribbon clients.
@Configuration
@ConditionalOnClass(ApacheHttpClient.class)

View File

@@ -108,20 +108,4 @@ public class FeignClientsConfiguration {
return Feign.builder();
}
@Configuration
@ConditionalOnClass(ApacheHttpClient.class)
protected static class HttpClientConfiguration {
@Autowired(required = false)
private HttpClient httpClient;
@ConditionalOnMissingBean
@Bean
public Client feignClient() {
if (this.httpClient != null) {
return new ApacheHttpClient(this.httpClient);
}
return new ApacheHttpClient();
}
}
}

View File

@@ -157,7 +157,7 @@ public class FeignClientOverrideDefaultsTests {
}
}
@FeignClient(value = "foo", configuration = FooConfiguration.class)
@FeignClient(name = "foo", url = "http://foo", configuration = FooConfiguration.class)
interface FooClient {
@RequestLine("GET /")
String get();
@@ -191,7 +191,7 @@ public class FeignClientOverrideDefaultsTests {
}
}
@FeignClient(value = "bar", configuration = BarConfiguration.class)
@FeignClient(name = "bar", url = "http://bar", configuration = BarConfiguration.class)
interface BarClient {
@RequestMapping(value = "/", method = RequestMethod.GET)
String get();