Olga MaciaszekSharma
3bba08931d
Upgarde protobuf-java (security fix) and vavr.
2022-01-11 13:59:21 +01:00
Olga MaciaszekSharma
0e6b33f480
Merge remote-tracking branch 'origin/2.2.x' into 3.0.x
2021-10-21 13:04:57 +02:00
Olga MaciaszekSharma
17d0161faf
Reformat.
2021-10-21 12:40:20 +02:00
Olga MaciaszekSharma
d6783a6f1e
Block clas-level request mapping on Feign clients.
2021-10-21 12:14:19 +02:00
Olga MaciaszekSharma
548e4d55ef
Revert default circuit breaker name prefix to target.type(). Fixes gh-606.
2021-10-11 18:40:21 +02:00
Olga MaciaszekSharma
c761919bc9
Only add default query params and default headers if not already in template. Fixes gh-590.
2021-09-09 17:59:08 +02:00
Olga MaciaszekSharma
998baed0d3
Merge remote-tracking branch 'origin/3.0.x' into 3.0.x
2021-09-08 18:52:18 +02:00
Olga MaciaszekSharma
4fc80e6b01
Update docs. Fixes gh-585.
2021-09-08 18:52:11 +02:00
Olga MaciaszekSharma
71930fd9f0
Do not reset RequestAttributes. Fixes gh-572.
2021-07-26 17:03:33 +02:00
Olga MaciaszekSharma
b5283e2f88
Fix Github workflow setup.
2021-07-21 13:21:08 +02:00
Olga MaciaszekSharma
1275875ddb
Reformat.
2021-07-07 18:58:48 +02:00
Olga MaciaszekSharma
c4b9492a9b
Bumping versions to 2.2.10.BUILD-SNAPSHOT after release
...
This reverts commit f7e490c466 .
2021-07-07 18:46:53 +02:00
Olga MaciaszekSharma
3acf5f9e92
Going back to snapshots
...
This reverts commit 6479db0a54 .
2021-07-07 18:46:20 +02:00
Olga MaciaszekSharma
28b50401c5
Revert "Update SNAPSHOT to 2.2.9.RELEASE"
...
This reverts commit 1005749eb5 .
2021-07-07 14:38:12 +02:00
Olga MaciaszekSharma
6479db0a54
Revert "Going back to snapshots"
...
This reverts commit 190f5a9083 .
2021-07-07 14:37:39 +02:00
Olga MaciaszekSharma
f7e490c466
Revert "Bumping versions to 2.2.10.BUILD-SNAPSHOT after release"
...
This reverts commit d60cda824d .
2021-07-07 14:37:03 +02:00
Olga MaciaszekSharma
6de9fdd3e1
Merge remote-tracking branch 'origin/2.2.x'
2021-07-05 13:19:39 +02:00
Olga MaciaszekSharma
45861dd657
Merge remote-tracking branch 'origin/2.2.x'. Refactor.
2021-07-05 12:09:23 +02:00
Olga MaciaszekSharma
00ea88c67f
Fix typo. Refactor.
2021-07-05 11:55:41 +02:00
Olga MaciaszekSharma
d897b18e16
Add missing author tags. Refactor.
2021-07-05 11:26:06 +02:00
Olga MaciaszekSharma
1f5bdd4224
Merge remote-tracking branch 'origin/2.2.x'
2021-06-10 16:08:39 +02:00
Olga MaciaszekSharma
2f43715f6f
Change log level. Fixes gh-552.
2021-06-10 16:04:17 +02:00
Olga MaciaszekSharma
58b0c7866c
Merge remote-tracking branch 'origin/2.2.x' into main
2021-05-24 16:02:34 +02:00
Olga MaciaszekSharma
5aa1b7a529
Merge remote-tracking branch 'origin/2.2.x' into main
2021-05-12 13:56:49 +02:00
Olga MaciaszekSharma
ec1f2ad5bb
Refactor FeignHalConfiguration to use HalMediaTypeConfiguration under the hood. Fixes gh-541.
2021-05-12 13:51:43 +02:00
Olga MaciaszekSharma
fbcebb372c
Switch to a different HalInstantiator constructor for Boot 2.5 compatibility. Fixes gh-536.
2021-04-27 16:22:03 +02:00
Olga MaciaszekSharma
1a00bbf705
Merge 2.2.x
2021-04-26 19:28:17 +02:00
Olga MaciaszekSharma
5baa8c8ed5
Remove master references.
2021-04-26 19:24:36 +02:00
Olga MaciaszekSharma
d0e035b8ff
Switch from master to main.
2021-04-26 17:48:29 +02:00
Olga MaciaszekSharma
1615a5a68c
Switch GH actions to main.
2021-04-26 17:36:44 +02:00
Olga MaciaszekSharma
0c1ab36fe1
Merge remote-tracking branch 'origin/2.2.x'
2021-04-22 18:14:37 +02:00
Olga MaciaszekSharma
d738b3b224
Upgrade Feign to 10.12. Fixes gh-530.
2021-04-21 10:23:38 +02:00
Olga MaciaszekSharma
26fb4deb18
Merge remote-tracking branch 'origin/2.2.x'
2021-04-20 17:28:31 +02:00
Olga MaciaszekSharma
0bf0426f60
Update GH actions setup.
2021-04-20 16:50:36 +02:00
Olga MaciaszekSharma
96268d16da
Fix checkstyle and formatting.
2021-04-13 15:21:46 +02:00
Olga MaciaszekSharma
ac019b4af1
Merge 2.2.x
2021-04-13 15:20:29 +02:00
Olga MaciaszekSharma
4d0caec7ee
Fix checkstyle and formatting.
2021-04-13 15:17:00 +02:00
Olga MaciaszekSharma
b8aea256da
Merge remote-tracking branch 'origin/2.2.x'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2021-04-13 15:11:13 +02:00
Olga MaciaszekSharma
f653a6730d
Merge remote-tracking branch 'origin/2.2.x'
2021-04-13 15:08:50 +02:00
Olga MaciaszekSharma
92f7ba9901
Fix GH actions setup
2021-04-13 15:08:27 +02:00
Olga MaciaszekSharma
b2c208ba5f
Fix GH actions setup
2021-04-13 15:08:00 +02:00
Olga MaciaszekSharma
e2a54c1359
Fix GH actions setup
2021-04-13 15:04:10 +02:00
Olga MaciaszekSharma
cdfd3695c2
Add GH actions build icon.
2021-04-13 15:03:23 +02:00
Olga MaciaszekSharma
a5412cc872
Merge remote-tracking branch 'origin/2.2.x'
2021-04-13 14:54:18 +02:00
Olga MaciaszekSharma
59216f2f82
Switch to building the project with GH actions.
2021-04-13 14:53:48 +02:00
Olga MaciaszekSharma
aa01ccb5b2
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientBuilder.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientBuilderTests.java
2021-04-13 13:11:21 +02:00
Olga MaciaszekSharma
86713156f6
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java
2021-04-12 14:35:43 +02:00
Olga MaciaszekSharma
5e494aa196
Add more logging. Fixes gh-517.
2021-04-12 14:29:45 +02:00
Olga MaciaszekSharma
809277ef3c
Fix previous merge.
2021-03-16 12:24:04 +01:00
Olga MaciaszekSharma
7cf7051083
Embed code in doc.
2021-03-12 16:00:51 +01:00
Olga MaciaszekSharma
61aee7cb21
Fix checkstyle.
2021-03-11 16:25:45 +01:00
Olga MaciaszekSharma
fb3924ac72
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/pom.xml
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfiguration.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/HttpClientFeignLoadBalancerConfiguration.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientAutoConfiguration.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/HttpClientFeignLoadBalancedConfiguration.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientPathTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientRetryTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java
2021-03-11 16:06:21 +01:00
Olga MaciaszekSharma
dbfc255146
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/app/client/InvoiceClient.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/app/resource/InvoiceResource.java
2021-03-10 17:44:36 +01:00
Olga MaciaszekSharma
33f3841e74
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientProperties.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/FeignLoadBalancer.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClient.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignLoadBalancerTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/RetryableFeignLoadBalancerTests.java
2021-03-03 12:02:22 +01:00
Olga Maciaszek-Sharma
6b436c4133
Set followRedirects via properties. ( #500 )
2021-03-03 11:20:48 +01:00
Olga MaciaszekSharma
4b962e6170
Merge 2.2.x
2021-03-01 15:37:25 +01:00
Olga MaciaszekSharma
b4fb3fe7b4
Refactor.
2021-03-01 15:35:49 +01:00
Olga MaciaszekSharma
90d78a5d68
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java
2021-03-01 15:30:33 +01:00
Olga MaciaszekSharma
b8129f52b7
Use delegate in RetryableFeignLoadBalancer when url present. Fixes gh-494.
2021-03-01 15:19:20 +01:00
Olga MaciaszekSharma
dcc45128b9
Merge remote-tracking branch 'origin/2.2.x'
2021-02-26 18:28:56 +01:00
Olga MaciaszekSharma
4217a0c542
Merge remote-tracking branch 'origin/2.2.x'
2021-02-26 18:17:53 +01:00
Olga Maciaszek-Sharma
11fd7dc43e
Use Feign naming convention for circuit names. ( #496 )
...
Fixes gh-484.
2021-02-26 18:09:29 +01:00
Olga MaciaszekSharma
1dbf9c2d6c
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# docs/src/main/asciidoc/_configprops.adoc
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/proto/ProtobufSpringEncoderTest.java
2021-02-25 10:57:09 +01:00
Olga Maciaszek-Sharma
cf20710cad
Improve charset determination ( #491 )
2021-02-25 09:42:18 +01:00
Olga Maciaszek-Sharma
b13711f906
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientBuilderTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java
2021-02-19 11:58:31 +01:00
Olga Maciaszek-Sharma
c92849e28e
Allow using multiple qualifiers for feign clients. ( #485 )
...
* Allow using multiple qualifiers for feign clients. Fixes gh-471.
2021-02-18 13:28:18 +01:00
Olga Maciaszek-Sharma
c6e42de202
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# docs/pom.xml
# pom.xml
# spring-cloud-openfeign-core/pom.xml
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java
# spring-cloud-openfeign-dependencies/pom.xml
# spring-cloud-starter-openfeign/pom.xml
2021-02-16 17:05:15 +01:00
Olga Maciaszek-Sharma
40a2ed5030
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java
2021-02-08 18:40:33 +01:00
Olga Maciaszek-Sharma
a3db5927b3
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageJacksonModuleTests.java
# spring-cloud-openfeign-dependencies/pom.xml
2021-02-08 16:24:15 +01:00
Olga Maciaszek-Sharma
60558c46ef
Reformat.
2021-02-02 15:31:06 +01:00
Olga Maciaszek-Sharma
89db04d7d0
Fix broken reference in docs.
2021-02-02 15:30:43 +01:00
Olga Maciaszek-Sharma
5d9d99d9ea
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageJacksonModule.java
2021-02-02 15:22:34 +01:00
Olga Maciaszek-Sharma
27a3967975
Support all non-deprecated Jackson naming strategies for page deserialization. Fixes gh-170. ( #477 )
2021-02-02 14:10:46 +01:00
Olga Maciaszek-Sharma
793842a9ac
Reformat.
2021-01-27 16:54:53 +01:00
Olga Maciaszek-Sharma
ec4c935384
Merge remote-tracking branch 'origin/2.2.x'
2021-01-27 16:53:03 +01:00
Olga Maciaszek-Sharma
c672d205d7
Use case-insensitive ResponseEntity headers. Fixes gh-456. ( #472 )
2021-01-27 16:52:29 +01:00
Olga Maciaszek-Sharma
4453424bdb
Fix broken reference in docs.
2021-01-27 13:33:57 +01:00
Olga Maciaszek-Sharma
db2d07500d
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java
2021-01-26 10:03:04 +01:00
Olga Maciaszek-Sharma
252f118bba
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreaker.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CircuitBreakerTests.java
# src/checkstyle/checkstyle-suppressions.xml
2021-01-22 17:09:30 +01:00
Olga Maciaszek-Sharma
bbef08205d
Use CircuitBreaker even when no fallback. ( #466 )
2021-01-22 16:53:32 +01:00
Olga Maciaszek-Sharma
0799f3dd7c
Use org security policy.
...
(cherry picked from commit 25b8202991 )
2021-01-22 10:14:04 +01:00
Olga Maciaszek-Sharma
25b8202991
Use org security policy.
2021-01-22 10:11:22 +01:00
Olga Maciaszek-Sharma
5025285c5b
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java
2021-01-20 15:22:52 +01:00
Olga Maciaszek-Sharma
5f932b0158
Run FeignLoadBalancerAutoConfiguration after BlockingLoadBalancerClientAutoConfiguration and LoadBalancerAutoConfiguration. Fixes gh-454.
2021-01-19 13:12:39 +01:00
Olga Maciaszek-Sharma
f5461821a1
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java
2021-01-19 12:52:43 +01:00
Olga Maciaszek-Sharma
14914b4c97
Fixes gh-460. Remove unused variable.
2021-01-19 12:48:11 +01:00
Olga Maciaszek-Sharma
1b41e39740
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# docs/src/main/asciidoc/sagan-index.adoc
2021-01-18 11:25:04 +01:00
Olga Maciaszek-Sharma
6bfb1edcf1
Revert "Edit sagan-index."
...
This reverts commit 01a3898e83 .
2021-01-18 11:23:30 +01:00
Olga Maciaszek-Sharma
54a090e77b
Edit sagan-index.
2021-01-18 11:21:29 +01:00
Olga Maciaszek-Sharma
8bc9a0eb0a
Merge remote-tracking branch 'origin/2.2.x'
2021-01-18 11:20:59 +01:00
Olga Maciaszek-Sharma
01a3898e83
Edit sagan-index.
2021-01-18 11:20:41 +01:00
Olga Maciaszek-Sharma
147ef8c863
Merge remote-tracking branch 'origin/2.2.x'
2021-01-18 11:16:52 +01:00
Olga Maciaszek-Sharma
286360cf7b
Add information on contributing, community support and commercial support to project site ( #458 )
...
* Add information on contributing, community support and commercial support to project site.
* Fixes after review.
2021-01-18 11:11:32 +01:00
Olga Maciaszek-Sharma
14eb8a7bb1
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# docs/src/main/asciidoc/_configprops.adoc
2021-01-14 16:02:02 +01:00
Olga Maciaszek-Sharma
5011703eb9
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# docs/src/main/asciidoc/_configprops.adoc
2021-01-14 15:58:02 +01:00
Olga Maciaszek-Sharma
a79d82584e
Update docs.
2021-01-14 15:50:47 +01:00
Olga Maciaszek-Sharma
c508f68b85
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# docs/src/main/asciidoc/spring-cloud-openfeign.adoc
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreaker.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerDisabledConditions.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerTargeter.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClient.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/CirciutBreakerTests.java
2021-01-14 15:31:13 +01:00
Olga Maciaszek-Sharma
ae3e3efb26
Add license link to README.
2021-01-14 15:21:21 +01:00
Olga Maciaszek-Sharma
ecfba4b6e9
Support LB stats. ( #447 )
2020-12-18 18:08:01 +01:00
Olga Maciaszek-Sharma
86551041d9
Adjust to changes in commons.
2020-12-10 17:15:26 +01:00