Browse Source

removed duplicate feign ApacheHttpClient configuration

pull/6/head
Spencer Gibb 9 years ago
parent
commit
959b007269
No known key found for this signature in database
GPG Key ID: 7788A47380690861
  1. 2
      spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java
  2. 16
      spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java
  3. 4
      spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientOverrideDefaultsTests.java

2
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java

@ -79,7 +79,7 @@ public class FeignAutoConfiguration { @@ -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)

16
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java

@ -108,20 +108,4 @@ public class FeignClientsConfiguration { @@ -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();
}
}
}

4
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientOverrideDefaultsTests.java

@ -157,7 +157,7 @@ public class FeignClientOverrideDefaultsTests { @@ -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 { @@ -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();

Loading…
Cancel
Save