Olga Maciaszek-Sharma
dd518a812b
Add support for load-balanced retries. ( #408 )
2020-10-01 20:20:24 +02:00
Olga Maciaszek-Sharma
1178739437
Merge remote-tracking branch 'origin/2.2.x'
2020-09-17 14:51:13 +02:00
Olga Maciaszek-Sharma
27e2775c5f
Upgrade protobuf-java.
2020-09-17 14:30:54 +02:00
Olga Maciaszek-Sharma
83ef242406
Upgrade vavr.
2020-09-17 14:20:29 +02:00
Olga Maciaszek-Sharma
faff6aef8a
Reformat with updated JavaFormat plugin version.
2020-09-17 13:54:45 +02:00
Olga Maciaszek-Sharma
80710a9f20
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/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java
# spring-cloud-openfeign-dependencies/pom.xml
# spring-cloud-starter-openfeign/pom.xml
2020-09-16 13:01:34 +02:00
Olga Maciaszek-Sharma
e83593651c
Clean up test.
2020-09-16 12:50:57 +02:00
Olga Maciaszek-Sharma
4cbf6da17b
Adjust test to changes in commons.
2020-09-16 12:38:22 +02:00
buildmaster
36c06c97a6
Bumping versions to 2.2.6.BUILD-SNAPSHOT after release
2020-08-28 20:04:40 +00:00
buildmaster
d6b021eaa4
Going back to snapshots
2020-08-28 20:04:40 +00:00
buildmaster
c2430c0e29
Update SNAPSHOT to 2.2.5.RELEASE
2020-08-28 20:02:41 +00:00
Olga Maciaszek-Sharma
2f13eb4816
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# docs/pom.xml
# pom.xml
# spring-cloud-openfeign-core/pom.xml
# spring-cloud-openfeign-dependencies/pom.xml
# spring-cloud-starter-openfeign/pom.xml
2020-08-03 10:05:52 +02:00
Olga Maciaszek-Sharma
4bf010e810
Ignore InvalidMediaTypeException when verifying if Multipart content. Fixes gh-363. ( #388 )
2020-08-03 10:02:05 +02:00
buildmaster
bd671efed9
Bumping versions to 2.2.5.BUILD-SNAPSHOT after release
2020-07-31 20:53:35 +00:00
buildmaster
bfd473cb8f
Going back to snapshots
2020-07-31 20:53:35 +00:00
buildmaster
2f5d63a061
Update SNAPSHOT to 2.2.4.RELEASE
2020-07-31 20:51:47 +00:00
Olga Maciaszek-Sharma
62aa76fb97
Merge remote-tracking branch 'origin/2.2.x'
2020-07-30 16:24:25 +02:00
Olga Maciaszek-Sharma
14929cbfee
Revert "Fix double @RequestMapping with empty value ( #245 )"
...
This reverts commit 0afb60a72a
2020-07-30 16:18:25 +02:00
buildmaster
5ce900828f
Going back to snapshots
2020-07-23 18:26:47 +00:00
buildmaster
48bb0cdba5
Update SNAPSHOT to 3.0.0-M3
2020-07-23 18:25:41 +00:00
spencergibb
dc5eef0125
Updates to new BlockingLoadBalancerClient constructor
2020-07-23 13:36:14 -04:00
Olga Maciaszek-Sharma
343f436b71
Merge remote-tracking branch 'origin/2.2.x'
2020-07-17 15:07:20 +02:00
Olga Maciaszek-Sharma
d3da7e16e8
Add CollectionFormat support ( #371 )
...
* Add CollectionFormat support. Fixes gh-146.
* Minor refactoring.
* Fix docs.
2020-07-17 15:05:21 +02:00
Olga Maciaszek-Sharma
f184c3f293
Merge remote-tracking branch 'origin/2.2.x'
2020-07-14 17:38:50 +02:00
Olga Maciaszek-Sharma
4e89dd1523
Annotate @FeignClient with @Inherited. Fixes gh-322. ( #370 )
2020-07-14 17:38:02 +02:00
Olga Maciaszek-Sharma
f600140004
Merge remote-tracking branch 'origin/2.2.x'
2020-07-14 16:03:00 +02:00
Olga Maciaszek-Sharma
63ba4d40ff
Fix checkstyle.
2020-07-14 16:02:28 +02:00
Olga Maciaszek-Sharma
d07c229b0e
Merge remote-tracking branch 'origin/2.2.x'
2020-07-14 15:20:23 +02:00
Olga Maciaszek-Sharma
06862ab090
Add test for @MockBean. Fixes gh-343.
2020-07-14 15:19:58 +02:00
Olga Maciaszek-Sharma
84cb74a898
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java
2020-07-13 17:23:49 +02:00
Olga Maciaszek-Sharma
72784920d8
Fix read timeout ( #369 )
...
* Fix setting readTimeout and connectionTimeout separately from each other. Fixes gh-324.
* Refactor (remove superfluous keywords) and reformat.
2020-07-13 17:19:18 +02:00
Ryan Baxter
9677353c27
Fixing broken tests
2020-07-09 11:13:05 -04:00
spencergibb
4766d95def
Adds junit-vintage-engine
2020-06-15 16:40:29 -04:00
Olga Maciaszek-Sharma
4a4da0e2d1
Merge remote-tracking branch 'origin/2.2.x'
2020-06-05 18:27:15 +02:00
Olga Maciaszek-Sharma
bf13ae95c9
Remove superfluous conditional. Fixes gh-323. ( #350 )
2020-06-05 18:26:34 +02:00
buildmaster
fa5162c2fc
Going back to snapshots
2020-05-29 18:40:30 +00:00
buildmaster
6d3181e718
Update SNAPSHOT to 3.0.0-M2
2020-05-29 18:39:55 +00:00
buildmaster
3002643ee7
Bumping versions to 2.2.4.BUILD-SNAPSHOT after release
2020-05-28 17:53:50 +00:00
buildmaster
b1ec55cb01
Going back to snapshots
2020-05-28 17:53:50 +00:00
buildmaster
f0e0e7ea64
Update SNAPSHOT to 2.2.3.RELEASE
2020-05-28 17:52:11 +00:00
Olga Maciaszek-Sharma
afb0b436c0
Merge remote-tracking branch 'origin/2.2.x'
2020-05-14 12:16:01 +02:00
Olga Maciaszek-Sharma
c85853ac9d
Merge remote-tracking branch 'origin/2.2.x' into 2.2.x
2020-05-14 12:14:42 +02:00
Olga Maciaszek-Sharma
21986f5e92
Upgrade Feign. Fixes gh-333.
2020-05-14 12:14:31 +02:00
spencergibb
f857cca5b3
Merge branch '2.2.x'
2020-05-13 15:29:43 -04:00
spencergibb
1929dae2d2
Adds FactoryBean.OBJECT_TYPE_ATTRIBUTE to registered feign clients.
...
Fixes gh-337
2020-05-13 15:27:12 -04:00
Olga Maciaszek-Sharma
94ad7066a6
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java
2020-05-11 13:39:15 +02:00
Olga Maciaszek-Sharma
e7932a6aae
Merge branch '2.2.x' of https://github.com/cbezmen/spring-cloud-openfeign into cbezmen-2.2.x
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java
2020-05-11 13:34:03 +02:00
Olga Maciaszek-Sharma
1b66594ed4
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/HystrixTargeter.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/CachingSpringLoadBalancerFactory.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/DefaultFeignLoadBalancedConfiguration.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/FeignRetryPolicy.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/main/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClient.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/OkHttpFeignLoadBalancedConfiguration.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/RetryableFeignLoadBalancer.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/ribbon/RibbonResponseStatusCodeException.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/FallbackCommand.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/SpringRetryDisabledTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringRetryEnabledTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityApplication.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/CustomConcurrenyStrategy.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/ProxyUsernameController.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/TestInterceptor.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/UsernameController.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/CachingSpringLoadBalancerFactoryTests.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/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/ribbon/FeignRibbonClientTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonHttpClientConfigurationTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonOkHttpClientConfigurationTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/LoadBalancerFeignClientOverrideTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/RetryableFeignLoadBalancerTests.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/RibbonResponseStatusCodeExceptionTest.java
2020-05-11 13:27:20 +02:00
Olga Maciaszek-Sharma
25a988e1bf
Add documentation for gh-132.
2020-05-11 13:25:39 +02:00
matt62king
af103e0137
Ignore parent config option 2.2.x ( #326 )
...
* added support to disable feign parent configurations, fixes gh-132
* added feign context test
* added feign context test class
* fix documentation on feign client
* removed inherit parent setting from annotation gh-132
* fix cherry pick commits gh-132
* add unit test gh-132
* add unit test gh-132
2020-05-11 13:10:58 +02:00
