From fe43b6c52b239d62fe4c5f65ac545817845e468d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 24 Feb 2022 10:52:51 +0000 Subject: [PATCH 01/26] Bumping versions --- README.adoc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++- pom.xml | 2 +- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 1637c57e..cb097fff 100644 --- a/README.adoc +++ b/README.adoc @@ -40,7 +40,8 @@ and binding to the Spring Environment and other Spring programming model idioms. == Building -:jdkversion: 1.8 + +:jdkversion: 17 === Basic Compile and Test @@ -303,6 +304,57 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. +=== Duplicate Finder + +Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath. + +==== Duplicate Finder configuration + +Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`. + +.pom.xml +[source,xml] +---- + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + +---- + +For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation]. + +You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build. + +If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project: + +[source,xml] +---- + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + org.joda.time.base.BaseDateTime + .*module-info + + + changelog.txt + + + + + + + +---- + + == License The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-openfeign/main/LICENSE.txt[here]. diff --git a/pom.xml b/pom.xml index afbf00cd..87319686 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 3.0.5 + 3.0.6-SNAPSHOT From 86a2f28a9ea90c203e13b9979165b9603a24c4d6 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 16:00:40 +0000 Subject: [PATCH 02/26] Update SNAPSHOT to 3.1.2 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 3da8838a..069bf766 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index bb395696..a05efcb2 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 - 3.1.2-SNAPSHOT + 3.1.2 pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.2-SNAPSHOT + 3.1.2 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 10865ee1..1af1508c 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index bf008436..ec51eed6 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 - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-openfeign-dependencies - 3.1.2-SNAPSHOT + 3.1.2 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 65d55e91..63a61712 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-openfeign From 4cd0c363be6b730c50d77b489b8eeff61e235b0f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 16:02:51 +0000 Subject: [PATCH 03/26] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 069bf766..3da8838a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index a05efcb2..bb395696 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 - 3.1.2 + 3.1.2-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.2 + 3.1.2-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 1af1508c..10865ee1 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index ec51eed6..bf008436 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 - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-openfeign-dependencies - 3.1.2 + 3.1.2-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 63a61712..65d55e91 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-starter-openfeign From 909da0afdf94580faaee80e04f4e0dce7390face Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 16:02:51 +0000 Subject: [PATCH 04/26] Bumping versions to 3.1.3-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 3da8838a..019e8334 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index bb395696..409bc69a 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 10865ee1..a20f3f13 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index bf008436..a4815cf0 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-openfeign-dependencies - 3.1.2-SNAPSHOT + 3.1.3-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 65d55e91..b3296335 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-starter-openfeign From 6704982bcd1d3be22b396cc745483b3f40ab56f7 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 11:09:30 +0200 Subject: [PATCH 05/26] Revert "Bumping versions to 3.1.3-SNAPSHOT after release" This reverts commit 909da0afdf94580faaee80e04f4e0dce7390face. --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 019e8334..3da8838a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index 409bc69a..bb395696 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 - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index a20f3f13..10865ee1 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 - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index a4815cf0..bf008436 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 - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-openfeign-dependencies - 3.1.3-SNAPSHOT + 3.1.2-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 b3296335..65d55e91 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 - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-starter-openfeign From 1ff643f4c199dd3f261bd486d8b3f93447535a64 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 11:09:33 +0200 Subject: [PATCH 06/26] Revert "Going back to snapshots" This reverts commit 4cd0c363be6b730c50d77b489b8eeff61e235b0f. --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 3da8838a..069bf766 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index bb395696..a05efcb2 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 - 3.1.2-SNAPSHOT + 3.1.2 pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.2-SNAPSHOT + 3.1.2 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 10865ee1..1af1508c 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index bf008436..ec51eed6 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 - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-openfeign-dependencies - 3.1.2-SNAPSHOT + 3.1.2 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 65d55e91..63a61712 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-openfeign From a3f270d3b44983ca780f8322d261b7108d73af86 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 11:09:37 +0200 Subject: [PATCH 07/26] Revert "Update SNAPSHOT to 3.1.2" This reverts commit 86a2f28a9ea90c203e13b9979165b9603a24c4d6. --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 069bf766..3da8838a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index a05efcb2..bb395696 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 - 3.1.2 + 3.1.2-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.2 + 3.1.2-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 1af1508c..10865ee1 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index ec51eed6..bf008436 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 - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-openfeign-dependencies - 3.1.2 + 3.1.2-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 63a61712..65d55e91 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-starter-openfeign From 9f160e7688437a51edce3c66107b8aed386082dc Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 10:51:06 +0000 Subject: [PATCH 08/26] Update SNAPSHOT to 3.1.2 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 3da8838a..069bf766 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index bb395696..a05efcb2 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 - 3.1.2-SNAPSHOT + 3.1.2 pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.2-SNAPSHOT + 3.1.2 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 10865ee1..1af1508c 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index bf008436..ec51eed6 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 - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-openfeign-dependencies - 3.1.2-SNAPSHOT + 3.1.2 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 65d55e91..63a61712 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-starter-openfeign From 434ce223286c51eb0cca1cbcbf090b27fb677b6e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 10:53:18 +0000 Subject: [PATCH 09/26] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 069bf766..3da8838a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index a05efcb2..bb395696 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 - 3.1.2 + 3.1.2-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.2 + 3.1.2-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 1af1508c..10865ee1 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index ec51eed6..bf008436 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 - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-openfeign-dependencies - 3.1.2 + 3.1.2-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 63a61712..65d55e91 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-starter-openfeign From a142f6f2c07fd05b244486f9527ce53c10ae6983 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 10:53:18 +0000 Subject: [PATCH 10/26] Bumping versions to 3.1.3-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 3da8838a..019e8334 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index bb395696..b44ead6d 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 10865ee1..a20f3f13 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index bf008436..a4815cf0 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-openfeign-dependencies - 3.1.2-SNAPSHOT + 3.1.3-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 65d55e91..b3296335 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-starter-openfeign From 1bed516e03ac19474c104f6a9cf0b4646363c0e1 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 Apr 2022 10:56:37 +0000 Subject: [PATCH 11/26] Bumping versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b44ead6d..409bc69a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.3-SNAPSHOT From 4cba1de153b748f483784eaf5eb57287770c9f61 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 26 May 2022 12:08:43 -0400 Subject: [PATCH 12/26] don't upload docs to maven central --- docs/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index 019e8334..33fef54c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -17,6 +17,8 @@ ${basedir}/.. feign.* deploy + + none From bc7d39fa0413f517120c7208ce67fc8d135f762f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 26 May 2022 20:27:01 +0000 Subject: [PATCH 13/26] Update SNAPSHOT to 3.1.3 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 33fef54c..46875be7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index 409bc69a..30b222aa 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 - 3.1.3-SNAPSHOT + 3.1.3 pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.3-SNAPSHOT + 3.1.3 @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.3-SNAPSHOT + 3.1.3 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index a20f3f13..32896f2e 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 - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index a4815cf0..34b87671 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 - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-openfeign-dependencies - 3.1.3-SNAPSHOT + 3.1.3 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 b3296335..08c9ea7e 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 - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-starter-openfeign From f8b3ed971e19b90a7c5a74a7ff492f6978505ea2 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 27 May 2022 13:45:43 -0400 Subject: [PATCH 14/26] Bumps to next snapshot version --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 46875be7..c3e75e94 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index 30b222aa..4e5102c5 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 - 3.1.3 + 3.1.4-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.3 + 3.1.4-SNAPSHOT @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.3 + 3.1.4-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 32896f2e..1ce746f3 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 - 3.1.3 + 3.1.4-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 34b87671..a5028d5a 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 - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-openfeign-dependencies - 3.1.3 + 3.1.4-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 08c9ea7e..72253452 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 - 3.1.3 + 3.1.4-SNAPSHOT .. spring-cloud-starter-openfeign From 6c3b8c257e60c4cae69b0e0601675c19242945c2 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 25 Feb 2022 13:14:16 +0100 Subject: [PATCH 15/26] Fixes gh-680. --- .../openfeign/support/PageJacksonModule.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageJacksonModule.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageJacksonModule.java index a2c54baf..d3c60849 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageJacksonModule.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageJacksonModule.java @@ -194,6 +194,21 @@ public class PageJacksonModule extends Module { return delegate.isEmpty(); } + @Override + public int hashCode() { + return delegate.hashCode(); + } + + @Override + public boolean equals(Object obj) { + return delegate.equals(obj); + } + + @Override + public String toString() { + return delegate.toString(); + } + } } From 9023cc2dc55e7871f16a1e3f1970a6a9b5b03fab Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 23 Feb 2022 17:22:13 +0100 Subject: [PATCH 16/26] Unwarap InvocationTargetException and NoFallbackAvailableException. --- .../FeignCircuitBreakerInvocationHandler.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java index da76d175..9f0701aa 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java @@ -17,6 +17,7 @@ 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; @@ -29,6 +30,7 @@ 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; @@ -95,15 +97,26 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler { try { return this.fallbackMethodMap.get(method).invoke(fallback, args); } - catch (Exception e) { - throw new IllegalStateException(e); + catch (Exception exception) { + unwrapAndRethrow(exception); } + 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; + } + throw new IllegalStateException(exception); + } + } + private Supplier asSupplier(final Method method, final Object[] args) { final RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); return () -> { From ff96850ec0570ef2190ba388111c5e717bffe9a7 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 24 Feb 2022 12:02:11 +0100 Subject: [PATCH 17/26] Wrap underlying checked exception with IllegalStateException. Add tests. --- .../FeignCircuitBreakerInvocationHandler.java | 3 ++ .../circuitbreaker/CircuitBreakerTests.java | 54 ++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java index 9f0701aa..a85cf471 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java @@ -113,6 +113,9 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler { if (underlyingException instanceof RuntimeException) { throw (RuntimeException) underlyingException; } + if (underlyingException != null) { + throw new IllegalStateException(underlyingException); + } throw new IllegalStateException(exception); } } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java index 4194aaa6..ecc598bb 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java @@ -16,6 +16,7 @@ package org.springframework.cloud.openfeign.circuitbreaker; +import java.io.IOException; import java.util.function.Function; import org.apache.commons.logging.Log; @@ -49,6 +50,7 @@ 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 @@ -65,6 +67,9 @@ public class CircuitBreakerTests { @Autowired TestClient testClient; + @Autowired + ExceptionClient exceptionClient; + @Autowired TestClientWithFactory testClientWithFactory; @@ -111,6 +116,17 @@ public 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 { @@ -122,6 +138,18 @@ public 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 { @@ -159,6 +187,25 @@ public class CircuitBreakerTests { } + static class ExceptionThrowingFallbackFactory implements FallbackFactory { + + @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 @@ -176,7 +223,7 @@ public class CircuitBreakerTests { @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @RestController - @EnableFeignClients(clients = { TestClient.class, TestClientWithFactory.class }) + @EnableFeignClients(clients = { TestClient.class, TestClientWithFactory.class, ExceptionClient.class }) @Import(NoSecurityConfiguration.class) protected static class Application implements TestClient { @@ -228,6 +275,11 @@ public class CircuitBreakerTests { return new TestFallbackFactory(); } + @Bean + ExceptionThrowingFallbackFactory exceptionThrowingFallbackFactory() { + return new ExceptionThrowingFallbackFactory(); + } + } } From d4832788f6f69c7f52fbef54d1795f44b9e64eb5 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 28 Jun 2022 15:02:16 +0200 Subject: [PATCH 18/26] Resolve conflicts for backport. --- .../cloud/openfeign/circuitbreaker/CircuitBreakerTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java index ecc598bb..3dc1cad5 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java @@ -117,13 +117,13 @@ public class CircuitBreakerTests { } @Test - void testRuntimeExceptionUnwrapped() { + public void testRuntimeExceptionUnwrapped() { assertThatExceptionOfType(UnsupportedOperationException.class) .isThrownBy(() -> exceptionClient.getRuntimeException()); } @Test - void testCheckedExceptionWrapped() { + public void testCheckedExceptionWrapped() { assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> exceptionClient.getCheckedException()); } From 24d9b08d5c3de3f45cd15c139330fefb113f150c Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Mon, 17 Jan 2022 12:41:20 +0100 Subject: [PATCH 19/26] Backport bugfix and resolve conflicts. --- .../openfeign/FeignClientFactoryBean.java | 3 ++ .../openfeign/FeignClientsRegistrar.java | 6 ++- .../openfeign/FeignClientsRegistrarTests.java | 53 +++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java index ef9971ee..004b9a0d 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java @@ -443,6 +443,9 @@ public class FeignClientFactoryBean } private String cleanPath() { + if (path == null) { + return ""; + } String path = this.path.trim(); if (StringUtils.hasLength(path)) { if (!path.startsWith("/")) { diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java index fa1495be..4fe4b8d8 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java @@ -302,7 +302,11 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo if (resolver == null) { return resolved; } - return String.valueOf(resolver.evaluate(resolved, new BeanExpressionContext(beanFactory, null))); + Object evaluateValue = resolver.evaluate(resolved, new BeanExpressionContext(beanFactory, null)); + if (evaluateValue != null) { + return String.valueOf(evaluateValue); + } + return null; } return value; } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java index 483c5bb7..fc310985 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java @@ -18,6 +18,7 @@ package org.springframework.cloud.openfeign; import java.util.Collections; +import feign.Target; import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; @@ -25,15 +26,19 @@ 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.assertThatIllegalStateException; /** * @author Spencer Gibb * @author Gang Li * @author Michal Domagala + * @author Szymon Linowski + * @author Olga Maciaszek-Sharma */ public class FeignClientsRegistrarTests { @@ -101,6 +106,30 @@ public class FeignClientsRegistrarTests { .doesNotThrowAnyException(); } + @Test + public 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 target = (Target.HardCodedTarget) ReflectionTestUtils + .getField(invocationHandlerLambda, "arg$4"); + assertThat(target.name()).isEqualTo("nullUrlFeignClient"); + assertThat(target.url()).isEqualTo("http://nullUrlFeignClient"); + } + + @Test + public 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 { @@ -118,6 +147,16 @@ public 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 }) @@ -138,4 +177,18 @@ public 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 { + + } + } From 10fefea29b9bf30ee091120309a59dd0ca427d72 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 28 Jun 2022 15:46:11 +0200 Subject: [PATCH 20/26] Remove incompatible test. --- .../openfeign/FeignClientsRegistrarTests.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java index fc310985..a1a7900f 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java @@ -18,7 +18,6 @@ package org.springframework.cloud.openfeign; import java.util.Collections; -import feign.Target; import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; @@ -26,7 +25,6 @@ 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; @@ -106,21 +104,6 @@ public class FeignClientsRegistrarTests { .doesNotThrowAnyException(); } - @Test - public 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 target = (Target.HardCodedTarget) ReflectionTestUtils - .getField(invocationHandlerLambda, "arg$4"); - assertThat(target.name()).isEqualTo("nullUrlFeignClient"); - assertThat(target.url()).isEqualTo("http://nullUrlFeignClient"); - } - @Test public void shouldResolveAndValidateNullName() { assertThatIllegalStateException().isThrownBy(() -> { From ae63aae6ebf562af45c3c2fa243e316658bcd5fc Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 29 Jun 2022 17:40:23 +0200 Subject: [PATCH 21/26] Add deprecations for OAuth2. --- .../cloud/openfeign/FeignAutoConfiguration.java | 1 + .../openfeign/security/OAuth2FeignRequestInterceptor.java | 1 + spring-cloud-openfeign-dependencies/pom.xml | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java index e8cfcd9f..ef395718 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java @@ -312,6 +312,7 @@ public class FeignAutoConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(OAuth2ClientContext.class) @ConditionalOnProperty("feign.oauth2.enabled") + @Deprecated // spring-security-oauth2 reached EOL protected static class Oauth2FeignConfiguration { @Bean diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/security/OAuth2FeignRequestInterceptor.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/security/OAuth2FeignRequestInterceptor.java index 6b5302d5..2d26df89 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/security/OAuth2FeignRequestInterceptor.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/security/OAuth2FeignRequestInterceptor.java @@ -43,6 +43,7 @@ import org.springframework.security.oauth2.common.OAuth2AccessToken; * @author Tim Ysewyn * @since 3.0.0 */ +@Deprecated // spring-security-oauth2 reached EOL public class OAuth2FeignRequestInterceptor implements RequestInterceptor { /** diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 1be252fe..cb4644b9 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -17,7 +17,8 @@ 10.12 3.8.0 - 2.1.2.RELEASE + + 2.5.2 From e321e72e3d002753dea6758c78cec3f505ba1826 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 29 Jun 2022 22:14:15 +0000 Subject: [PATCH 22/26] Update SNAPSHOT to 3.0.7 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 11a834bc..0aa805c8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.0.7-SNAPSHOT + 3.0.7 spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index 87319686..ca5d333a 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 - 3.0.7-SNAPSHOT + 3.0.7 pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.0.6-SNAPSHOT + 3.0.5 @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.0.6-SNAPSHOT + 3.0.6 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index c59bb4d5..8d895077 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 - 3.0.7-SNAPSHOT + 3.0.7 .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index cb4644b9..40d47375 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 - 3.0.6-SNAPSHOT + 3.0.5 spring-cloud-openfeign-dependencies - 3.0.7-SNAPSHOT + 3.0.7 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 968e863a..75c24552 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 - 3.0.7-SNAPSHOT + 3.0.7 .. spring-cloud-starter-openfeign From fc459044b5973ac493556e95b34e0fbab3088f1a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 29 Jun 2022 22:15:46 +0000 Subject: [PATCH 23/26] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- 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 0aa805c8..11a834bc 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.0.7 + 3.0.7-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index ca5d333a..87319686 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 - 3.0.7 + 3.0.7-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.0.5 + 3.0.6-SNAPSHOT @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.0.6 + 3.0.6-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 8d895077..c59bb4d5 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 - 3.0.7 + 3.0.7-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 40d47375..cb4644b9 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 - 3.0.5 + 3.0.6-SNAPSHOT spring-cloud-openfeign-dependencies - 3.0.7 + 3.0.7-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 75c24552..968e863a 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 - 3.0.7 + 3.0.7-SNAPSHOT .. spring-cloud-starter-openfeign From 7e013553175e0f489fd5f35db383f313ea0ad1c5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 29 Jun 2022 22:15:46 +0000 Subject: [PATCH 24/26] Bumping versions to 3.0.8-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 2 +- spring-cloud-starter-openfeign/pom.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 11a834bc..b5a25b37 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.0.7-SNAPSHOT + 3.0.8-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index 87319686..8df93e24 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 - 3.0.7-SNAPSHOT + 3.0.8-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.0.6-SNAPSHOT + 3.0.5 @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.0.6-SNAPSHOT + 3.0.7-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index c59bb4d5..b05d6632 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 - 3.0.7-SNAPSHOT + 3.0.8-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index cb4644b9..5af8e20c 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-openfeign-dependencies - 3.0.7-SNAPSHOT + 3.0.8-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 968e863a..8e99ec86 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 - 3.0.7-SNAPSHOT + 3.0.8-SNAPSHOT .. spring-cloud-starter-openfeign From 1e70aec75cdeec3e7432e6e457d62742b889a03f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 30 Jun 2022 10:59:53 +0000 Subject: [PATCH 25/26] Bumping versions --- docs/src/main/asciidoc/_configprops.adoc | 56 ++++++++++++------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 14058c51..80207091 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,38 +1,38 @@ |=== |Name | Default | Description -|feign.autoconfiguration.jackson.enabled | `false` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding. -|feign.circuitbreaker.alphanumeric-ids.enabled | `false` | If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties. -|feign.circuitbreaker.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker. -|feign.circuitbreaker.group.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker with with group. +|feign.autoconfiguration.jackson.enabled | `+++false+++` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding. +|feign.circuitbreaker.alphanumeric-ids.enabled | `+++false+++` | If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties. +|feign.circuitbreaker.enabled | `+++false+++` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker. +|feign.circuitbreaker.group.enabled | `+++false+++` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker with with group. |feign.client.config | | -|feign.client.decode-slash | `true` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`. -|feign.client.default-config | `default` | -|feign.client.default-to-properties | `true` | -|feign.client.refresh-enabled | `false` | Enables options value refresh capability for Feign. -|feign.compression.request.enabled | `false` | Enables the request sent by Feign to be compressed. -|feign.compression.request.mime-types | `[text/xml, application/xml, application/json]` | The list of supported mime types. -|feign.compression.request.min-request-size | `2048` | The minimum threshold content size. -|feign.compression.response.enabled | `false` | Enables the response from Feign to be compressed. -|feign.encoder.charset-from-content-type | `false` | Indicates whether the charset should be derived from the {@code Content-Type} header. -|feign.httpclient.connection-timeout | `2000` | -|feign.httpclient.connection-timer-repeat | `3000` | -|feign.httpclient.disable-ssl-validation | `false` | -|feign.httpclient.enabled | `true` | Enables the use of the Apache HTTP Client by Feign. -|feign.httpclient.follow-redirects | `true` | -|feign.httpclient.hc5.enabled | `false` | Enables the use of the Apache HTTP Client 5 by Feign. +|feign.client.decode-slash | `+++true+++` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`. +|feign.client.default-config | `+++default+++` | +|feign.client.default-to-properties | `+++true+++` | +|feign.client.refresh-enabled | `+++false+++` | Enables options value refresh capability for Feign. +|feign.compression.request.enabled | `+++false+++` | Enables the request sent by Feign to be compressed. +|feign.compression.request.mime-types | `+++[text/xml, application/xml, application/json]+++` | The list of supported mime types. +|feign.compression.request.min-request-size | `+++2048+++` | The minimum threshold content size. +|feign.compression.response.enabled | `+++false+++` | Enables the response from Feign to be compressed. +|feign.encoder.charset-from-content-type | `+++false+++` | Indicates whether the charset should be derived from the {@code Content-Type} header. +|feign.httpclient.connection-timeout | `+++2000+++` | +|feign.httpclient.connection-timer-repeat | `+++3000+++` | +|feign.httpclient.disable-ssl-validation | `+++false+++` | +|feign.httpclient.enabled | `+++true+++` | Enables the use of the Apache HTTP Client by Feign. +|feign.httpclient.follow-redirects | `+++true+++` | +|feign.httpclient.hc5.enabled | `+++false+++` | Enables the use of the Apache HTTP Client 5 by Feign. |feign.httpclient.hc5.pool-concurrency-policy | | Pool concurrency policies. |feign.httpclient.hc5.pool-reuse-policy | | Pool connection re-use policies. -|feign.httpclient.hc5.socket-timeout | `5` | Default value for socket timeout. +|feign.httpclient.hc5.socket-timeout | `+++5+++` | Default value for socket timeout. |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.time-to-live | `900` | +|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.time-to-live | `+++900+++` | |feign.httpclient.time-to-live-unit | | -|feign.metrics.enabled | `true` | Enables metrics capability for Feign. -|feign.oauth2.enabled | `false` | Enables feign interceptor for managing oauth2 access token. -|feign.oauth2.load-balanced | `false` | Enables load balancing for oauth2 access token provider. -|feign.okhttp.enabled | `false` | Enables the use of the OK HTTP Client by Feign. +|feign.metrics.enabled | `+++true+++` | Enables metrics capability for Feign. +|feign.oauth2.enabled | `+++false+++` | Enables feign interceptor for managing oauth2 access token. +|feign.oauth2.load-balanced | `+++false+++` | Enables load balancing for oauth2 access token provider. +|feign.okhttp.enabled | `+++false+++` | Enables the use of the OK HTTP Client by Feign. |=== \ No newline at end of file From a29f28506f98b5b87780e6c72f36e686e4143a35 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 1 Jul 2022 16:38:55 +0200 Subject: [PATCH 26/26] Remove vulnerable transitive dependency. --- spring-cloud-openfeign-core/pom.xml | 17 +++++++++++++++++ src/checkstyle/checkstyle-suppressions.xml | 1 + 2 files changed, 18 insertions(+) diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 1ce746f3..3353bf54 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -99,6 +99,13 @@ io.github.openfeign.form feign-form-spring + + + + commons-io + commons-io + + io.github.openfeign @@ -148,6 +155,10 @@ javax.activation javax.activation-api + + com.sun.activation + jakarta.activation + @@ -208,6 +219,12 @@ spring-cloud-loadbalancer true + + commons-io + commons-io + 2.11.0 + test + diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 7fe5b1ca..81b1ab02 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -12,6 +12,7 @@ +