From 18111801d3fe71d8909973a97985e1ae97b5a4bb Mon Sep 17 00:00:00 2001 From: Gerasimov Gennady Date: Thu, 24 May 2018 18:41:38 +0300 Subject: [PATCH 1/4] Misspelling fix according to https://github.com/spring-cloud/spring-cloud-openfeign/issues/24 (#25) --- docs/src/main/asciidoc/spring-cloud-openfeign.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc index f6b455b1..ad50b38c 100644 --- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc +++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc @@ -112,7 +112,7 @@ Spring Cloud Netflix provides the following beans by default for feign (`BeanTyp * `Client` feignClient: if Ribbon is enabled it is a `LoadBalancerFeignClient`, otherwise the default feign client is used. The OkHttpClient and ApacheHttpClient feign clients can be used by setting `feign.okhttp.enabled` or `feign.httpclient.enabled` to `true`, respectively, and having them on the classpath. -You can customize the HTTP client used by providing a bean of either `ClosableHttpClient` when using Apache or `OkHttpClient` whe using OK HTTP. +You can customize the HTTP client used by providing a bean of either `ClosableHttpClient` when using Apache or `OkHttpClient` when using OK HTTP. Spring Cloud Netflix _does not_ provide the following beans by default for feign, but still looks up beans of these types from the application context to create the feign client: From 21be1e129cc0190bde8f7a00531007be25328a1c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 24 May 2018 23:55:25 +0000 Subject: [PATCH 2/4] Update SNAPSHOT to 2.0.0.RC2 --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- spring-cloud-starter-openfeign/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 18d453df..097be5cd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.0.0.BUILD-SNAPSHOT + 2.0.0.RC2 spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index 24720503..963f7854 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-openfeign - 2.0.0.BUILD-SNAPSHOT + 2.0.0.RC2 pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.0.0.BUILD-SNAPSHOT + 2.0.1.RELEASE @@ -22,8 +22,8 @@ ${basedir} 2.7.3 - 2.0.0.BUILD-SNAPSHOT - 2.0.0.BUILD-SNAPSHOT + 2.0.0.RC2 + 2.0.0.RC2 3.6.1 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index d191c0da..01ae3ab3 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.0.0.BUILD-SNAPSHOT + 2.0.0.RC2 .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index b8c18265..a595cc7e 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.0.BUILD-SNAPSHOT + 2.0.1.RELEASE spring-cloud-openfeign-dependencies - 2.0.0.BUILD-SNAPSHOT + 2.0.0.RC2 pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index a9262118..aded06cc 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.0.0.BUILD-SNAPSHOT + 2.0.0.RC2 .. spring-cloud-starter-openfeign From af02a8c692fa325fe2aff79e26204d44dcbd332f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 24 May 2018 23:56:03 +0000 Subject: [PATCH 3/4] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- spring-cloud-starter-openfeign/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 097be5cd..18d453df 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.0.0.RC2 + 2.0.0.BUILD-SNAPSHOT spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index 963f7854..24720503 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-openfeign - 2.0.0.RC2 + 2.0.0.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.0.1.RELEASE + 2.0.0.BUILD-SNAPSHOT @@ -22,8 +22,8 @@ ${basedir} 2.7.3 - 2.0.0.RC2 - 2.0.0.RC2 + 2.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT 3.6.1 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 01ae3ab3..d191c0da 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.0.0.RC2 + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index a595cc7e..b8c18265 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.1.RELEASE + 2.0.0.BUILD-SNAPSHOT spring-cloud-openfeign-dependencies - 2.0.0.RC2 + 2.0.0.BUILD-SNAPSHOT pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index aded06cc..a9262118 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.0.0.RC2 + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-starter-openfeign From 569628689b1e9c4caebdd75329a93b4d7f69cbcc Mon Sep 17 00:00:00 2001 From: Rafael Renan Pacheco Date: Tue, 29 May 2018 12:09:05 -0300 Subject: [PATCH 4/4] Format "Creating Feign Clients Manually" snippet (#29) --- docs/src/main/asciidoc/spring-cloud-openfeign.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc index ad50b38c..28f26e97 100644 --- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc +++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc @@ -224,14 +224,14 @@ class FooController { private FooClient adminClient; @Autowired - public FooController( - Decoder decoder, Encoder encoder, Client client, Contract contract) { + public FooController(Decoder decoder, Encoder encoder, Client client, Contract contract) { this.fooClient = Feign.builder().client(client) .encoder(encoder) .decoder(decoder) - .contract(contract) + .contract(contract) .requestInterceptor(new BasicAuthRequestInterceptor("user", "user")) .target(FooClient.class, "http://PROD-SVC"); + this.adminClient = Feign.builder().client(client) .encoder(encoder) .decoder(decoder)