Olga Maciaszek-Sharma
82de713d06
Remove unnecessary test configuration.
2020-11-03 11:46:15 +01:00
Michal Domagala
a8a2a0155f
Fix for @EnableFeignClients(clients) scans classes in nested packages ( #422 )
...
* Test to verify sub level client error
Error is described in https://github.com/spring-cloud/spring-cloud-openfeign/issues/331
Application fails when one Feign client is `org.TopClient` and second is in subpackage: `org.sub.SubClient`
The error reason is that `SubClient` is registered twice
* Fix for @EnableFeignClients(clients) scans classes in nested packages twice
https://github.com/spring-cloud/spring-cloud-openfeign/issues/331
(cherry picked from commit fe62b0db9002052a72e5bbb9fdc5458993c16951)
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java
* delete unused code
(cherry picked from commit 4df865d1d64fc0a9b5e37ea4c6466a0dbe485141)
* add file header
* Apply review
Co-authored-by: michal <michal@michal-desktop>
2020-11-03 10:31:23 +01:00
Olga Maciaszek-Sharma
ffb17a4552
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientProperties.java
2020-10-29 16:54:47 +01:00
Ilia Ilinykh
93327fcace
Ability to configure client to send default headers #284 at 2.2.x ( #420 )
...
* Implemented ability to provide default query parameters and headers to feign clients.
Issue was mentioned in №284
* Removed wrong names of test data. Replaced with correct ones.
* Thread sleep was repalced with more verbose TimeUnit sleep
* Fixed more names of the clients.
2020-10-29 15:58:38 +01:00
Olga Maciaszek-Sharma
20e2548a5d
Automatic reformat.
2020-10-28 18:39:20 +01:00
Olga Maciaszek-Sharma
d93defe1c1
Merge remote-tracking branch 'origin/2.2.x'
2020-10-28 18:37:15 +01:00
Olga Maciaszek-Sharma
bc6c3b7bf2
Sort request interceptors. ( #419 )
2020-10-28 18:36:46 +01:00
Olga Maciaszek-Sharma
3f0c2850ee
Extract duplicate method to utility class.
2020-10-27 17:02:04 +01:00
Olga Maciaszek-Sharma
77a1367796
Add LoadBalancerLifecycle support.
2020-10-23 16:04:03 +02:00
Olga Maciaszek-Sharma
3c3b9a5a14
Add support for passing hints to LoadBalancer. ( #412 )
2020-10-02 17:15:20 +02:00
Olga Maciaszek-Sharma
582e4c0175
Merge remote-tracking branch 'origin/2.2.x'
...
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/DefaultFeignLoadBalancerConfiguration.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/loadbalancer/OkHttpFeignLoadBalancerConfiguration.java
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java
2020-10-02 15:32:53 +02:00
Olga Maciaszek-Sharma
a5ab3383c9
Rename new class.
2020-10-02 15:25:18 +02:00
Olga Maciaszek-Sharma
db3513b97b
Merge remote-tracking branch 'origin/2.2.x'
...
Fixes gh-286.
# Conflicts:
# spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/DefaultFeignLoadBalancerConfiguration.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/loadbalancer/OkHttpFeignLoadBalancerConfiguration.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/RetryableFeignLoadBalancer.java
# spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java
2020-10-02 15:15:43 +02:00
Olga Maciaszek-Sharma
dd518a812b
Add support for load-balanced retries. ( #408 )
2020-10-01 20:20:24 +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
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
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
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
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
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
Can Bezmen
06a55b8bcd
Review changes.
2020-05-08 21:11:27 +03:00
Can Bezmen
88633c7f54
Change type of exception
2020-04-29 18:18:41 +03:00
Can Bezmen
bb499ea823
Revert some code for code coverage and change test to mockito
2020-04-29 18:04:20 +03:00
Can Bezmen
0e1a579de5
Error log added for serialization and throw exception before serializing other sort objects
2020-04-29 16:18:22 +03:00
