From c2430c0e295627df196ad28f41f55393b6a85900 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 20:02:41 +0000 Subject: [PATCH 1/6] Update SNAPSHOT to 2.2.5.RELEASE --- 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 3debe40d..9e20ae4a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index 709baa48..4bc39220 100644 --- a/pom.xml +++ b/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"> 4.0.0 spring-cloud-openfeign - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE @@ -26,8 +26,8 @@ ${basedir} 2.7.3 - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE + 2.2.5.RELEASE 3.6.1 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 588b7167..77af9c02 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 384a48b1..e78ba2a6 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-openfeign-dependencies - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE 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 97e1cc23..0d6eaa60 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-starter-openfeign From d6b021eaa422b346831b28d744ccc0b552a9a65b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 20:04:40 +0000 Subject: [PATCH 2/6] 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 9e20ae4a..3debe40d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index 4bc39220..709baa48 100644 --- a/pom.xml +++ b/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"> 4.0.0 spring-cloud-openfeign - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT @@ -26,8 +26,8 @@ ${basedir} 2.7.3 - 2.2.5.RELEASE - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT 3.6.1 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 77af9c02..588b7167 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index e78ba2a6..384a48b1 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-openfeign-dependencies - 2.2.5.RELEASE + 2.2.5.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 0d6eaa60..97e1cc23 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-starter-openfeign From 36c06c97a615327a861ab5e11a26f29687773a91 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 20:04:40 +0000 Subject: [PATCH 3/6] Bumping versions to 2.2.6.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 2 +- spring-cloud-starter-openfeign/pom.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3debe40d..04a53db1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index 709baa48..362d4178 100644 --- a/pom.xml +++ b/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"> 4.0.0 spring-cloud-openfeign - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE @@ -26,8 +26,8 @@ ${basedir} 2.7.3 - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT 3.6.1 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 588b7167..4ec0e865 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 384a48b1..aff93012 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-openfeign-dependencies - 2.2.5.BUILD-SNAPSHOT + 2.2.6.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 97e1cc23..83e778f0 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-starter-openfeign From 5fea4f3b35aed2fb0f651165b6ea84a5b332a553 Mon Sep 17 00:00:00 2001 From: liuzeyanga Date: Thu, 9 Jul 2020 14:14:22 +0800 Subject: [PATCH 4/6] =?UTF-8?q?change=20"Sprig=20Cloud"=20to=C2=A0=20"Spri?= =?UTF-8?q?ng=20Cloud"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 de543470..596faa94 100644 --- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc +++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc @@ -565,7 +565,7 @@ If a map is passed as the method argument, the `@MatrixVariable` path segment is If a different object is passed, either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name is joined with the provided method argument using `=`. -IMPORTANT:: Even though, on the server side, Spring does not require the users to name the path segment placeholder same as the matrix variable name, since it would be too ambiguous on the client side, Sprig Cloud OpenFeign requires that you add a path segment placeholder with a name matching either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name. +IMPORTANT:: Even though, on the server side, Spring does not require the users to name the path segment placeholder same as the matrix variable name, since it would be too ambiguous on the client side, Spring Cloud OpenFeign requires that you add a path segment placeholder with a name matching either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name. For example: From 4cbf6da17b4a7ffeb9a2a69759ac0e25647b53a6 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 16 Sep 2020 12:38:22 +0200 Subject: [PATCH 5/6] Adjust test to changes in commons. --- .../cloud/openfeign/FeignClientOverrideDefaultsTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d4fdb677..595e5566 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 @@ -155,7 +155,7 @@ public class FeignClientOverrideDefaultsTests { @Test public void exceptionPropagationPolicy() { assertThat(this.context.getInstances("foo", ExceptionPropagationPolicy.class)) - .isNull(); + .isEmpty(); assertThat(this.context.getInstances("bar", ExceptionPropagationPolicy.class)) .containsValues(ExceptionPropagationPolicy.UNWRAP); } From e83593651c789d83f40d4d0b42d933242e875eaf Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 16 Sep 2020 12:50:57 +0200 Subject: [PATCH 6/6] Clean up test. --- .../FeignClientOverrideDefaultsTests.java | 94 +++++++++---------- 1 file changed, 42 insertions(+), 52 deletions(-) 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 595e5566..98aedc86 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 @@ -24,7 +24,6 @@ import feign.QueryMapEncoder; import feign.Request; import feign.RequestInterceptor; import feign.RequestLine; -import feign.RequestTemplate; import feign.Retryer; import feign.auth.BasicAuthRequestInterceptor; import feign.codec.Decoder; @@ -34,8 +33,7 @@ import feign.hystrix.HystrixFeign; import feign.optionals.OptionalDecoder; import feign.querymap.BeanQueryMapEncoder; import feign.slf4j.Slf4jLogger; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; @@ -47,7 +45,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -56,10 +53,9 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Spencer Gibb */ -@RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = FeignClientOverrideDefaultsTests.TestConfiguration.class) @DirtiesContext -public class FeignClientOverrideDefaultsTests { +class FeignClientOverrideDefaultsTests { @Autowired private FeignContext context; @@ -71,92 +67,89 @@ public class FeignClientOverrideDefaultsTests { private BarClient bar; @Test - public void clientsAvailable() { - assertThat(this.foo).isNotNull(); - assertThat(this.bar).isNotNull(); + void clientsAvailable() { + assertThat(foo).isNotNull(); + assertThat(bar).isNotNull(); } @Test - public void overrideDecoder() { - Decoder.Default.class.cast(this.context.getInstance("foo", Decoder.class)); - OptionalDecoder.class.cast(this.context.getInstance("bar", Decoder.class)); + void overrideDecoder() { + Decoder.Default.class.cast(context.getInstance("foo", Decoder.class)); + OptionalDecoder.class.cast(context.getInstance("bar", Decoder.class)); } @Test - public void overrideEncoder() { - Encoder.Default.class.cast(this.context.getInstance("foo", Encoder.class)); - PageableSpringEncoder.class.cast(this.context.getInstance("bar", Encoder.class)); + void overrideEncoder() { + Encoder.Default.class.cast(context.getInstance("foo", Encoder.class)); + PageableSpringEncoder.class.cast(context.getInstance("bar", Encoder.class)); } @Test - public void overrideLogger() { - Logger.JavaLogger.class.cast(this.context.getInstance("foo", Logger.class)); - Slf4jLogger.class.cast(this.context.getInstance("bar", Logger.class)); + void overrideLogger() { + Logger.JavaLogger.class.cast(context.getInstance("foo", Logger.class)); + Slf4jLogger.class.cast(context.getInstance("bar", Logger.class)); } @Test - public void overrideContract() { - Contract.Default.class.cast(this.context.getInstance("foo", Contract.class)); - SpringMvcContract.class.cast(this.context.getInstance("bar", Contract.class)); + void overrideContract() { + Contract.Default.class.cast(context.getInstance("foo", Contract.class)); + SpringMvcContract.class.cast(context.getInstance("bar", Contract.class)); } @Test - public void overrideLoggerLevel() { - assertThat(this.context.getInstance("foo", Logger.Level.class)).isNull(); - assertThat(this.context.getInstance("bar", Logger.Level.class)) + void overrideLoggerLevel() { + assertThat(context.getInstance("foo", Logger.Level.class)).isNull(); + assertThat(context.getInstance("bar", Logger.Level.class)) .isEqualTo(Logger.Level.HEADERS); } @Test - public void overrideRetryer() { - assertThat(this.context.getInstance("foo", Retryer.class)) + void overrideRetryer() { + assertThat(context.getInstance("foo", Retryer.class)) .isEqualTo(Retryer.NEVER_RETRY); - Retryer.Default.class.cast(this.context.getInstance("bar", Retryer.class)); + Retryer.Default.class.cast(context.getInstance("bar", Retryer.class)); } @Test - public void overrideErrorDecoder() { - assertThat(this.context.getInstance("foo", ErrorDecoder.class)).isNull(); - ErrorDecoder.Default.class - .cast(this.context.getInstance("bar", ErrorDecoder.class)); + void overrideErrorDecoder() { + assertThat(context.getInstance("foo", ErrorDecoder.class)).isNull(); + ErrorDecoder.Default.class.cast(context.getInstance("bar", ErrorDecoder.class)); } @Test - public void overrideBuilder() { - HystrixFeign.Builder.class - .cast(this.context.getInstance("foo", Feign.Builder.class)); - Feign.Builder.class.cast(this.context.getInstance("bar", Feign.Builder.class)); + void overrideBuilder() { + HystrixFeign.Builder.class.cast(context.getInstance("foo", Feign.Builder.class)); + Feign.Builder.class.cast(context.getInstance("bar", Feign.Builder.class)); } @Test - public void overrideRequestOptions() { - assertThat(this.context.getInstance("foo", Request.Options.class)).isNull(); - Request.Options options = this.context.getInstance("bar", Request.Options.class); + void overrideRequestOptions() { + assertThat(context.getInstance("foo", Request.Options.class)).isNull(); + Request.Options options = context.getInstance("bar", Request.Options.class); assertThat(options.connectTimeoutMillis()).isEqualTo(1); assertThat(options.readTimeoutMillis()).isEqualTo(1); } @Test - public void overrideQueryMapEncoder() { + void overrideQueryMapEncoder() { QueryMapEncoder.Default.class - .cast(this.context.getInstance("foo", QueryMapEncoder.class)); - BeanQueryMapEncoder.class - .cast(this.context.getInstance("bar", QueryMapEncoder.class)); + .cast(context.getInstance("foo", QueryMapEncoder.class)); + BeanQueryMapEncoder.class.cast(context.getInstance("bar", QueryMapEncoder.class)); } @Test - public void addRequestInterceptor() { - assertThat(this.context.getInstances("foo", RequestInterceptor.class).size()) + void addRequestInterceptor() { + assertThat(context.getInstances("foo", RequestInterceptor.class).size()) .isEqualTo(1); - assertThat(this.context.getInstances("bar", RequestInterceptor.class).size()) + assertThat(context.getInstances("bar", RequestInterceptor.class).size()) .isEqualTo(2); } @Test - public void exceptionPropagationPolicy() { - assertThat(this.context.getInstances("foo", ExceptionPropagationPolicy.class)) + void exceptionPropagationPolicy() { + assertThat(context.getInstances("foo", ExceptionPropagationPolicy.class)) .isEmpty(); - assertThat(this.context.getInstances("bar", ExceptionPropagationPolicy.class)) + assertThat(context.getInstances("bar", ExceptionPropagationPolicy.class)) .containsValues(ExceptionPropagationPolicy.UNWRAP); } @@ -186,10 +179,7 @@ public class FeignClientOverrideDefaultsTests { @Bean RequestInterceptor defaultRequestInterceptor() { - return new RequestInterceptor() { - @Override - public void apply(RequestTemplate template) { - } + return template -> { }; }