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
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
Can Bezmen
b538d7f88c
Checkstyle bug for license fixed.
2020-04-29 10:08:37 +03:00
Can Bezmen
525bb603f7
Fix sort problem for serialize and deserialize. Unit test added.
2020-04-29 08:52:13 +03:00
Can Bezmen
ea3fb86690
Sort Support for feign pagination
2020-04-29 08:31:54 +03:00
Olga Maciaszek-Sharma
9a335536bc
Update copyright comments dates.
2020-04-21 16:59:54 +02:00
Olga Maciaszek-Sharma
f6cf14f257
Update copyright comments dates.
2020-04-21 16:48:35 +02:00
buildmaster
6ac428b21c
Bumping versions
2020-04-17 02:55:34 +00:00
Olga Maciaszek-Sharma
147136b85b
Remove elements that are no longer valid from tests.
2020-04-16 14:10:09 +02:00
matt62king
45589b7977
exposed client factory bean and targeter ( #282 )
2020-04-16 13:50:36 +02:00
matt62king
f4b49d5542
add customizer for feign builder ( #289 )
...
* add customizer for feign builder
* support @Order for customizers
* switch to annotation aware comparator for @Order support
* remove intermediate instances
* removed default feign builder customizer
2020-04-15 13:55:27 +02:00
Olga Maciaszek-Sharma
a6b5663c69
Merge branch '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/valid/ValidFeignClientTests.java
2020-04-14 16:47:36 +02:00
Darren Foong
59ba6b1bc6
Allow @RequestPart user-defined POJOs ( #314 )
...
* Add Pojo and failing test to FeignClientTests
* Add SpringPojoFormEncoder
* Fix configuration
* Update Pojo
* Implement multipartPojo
* Does not work if Pojo has one field: this is crazy
* Disable expansion for multipart/form-data
* Remove Pojo
* Tidy code
* Add testSinglePojoRequestPart
* Update testMultiplePojoRequestPart
* Update testMultiplePojoRequestPart
* Add testRequestPartWithListOfPojosAndListOfMultipartFiles
* Fix Checkstyle errors
* Update license year and authors
* Tidy isApplicable
* Refactor isApplicable
* Rename classes and methods
* Change variable names
* Rename PojoFormWriter to AbstractFormWriter
* Rename method
* Use ObjectProvider
* Change constructor of SpringEncoder to move SpringPojoFormEncoder to FeignClientsConfiguration
* Rename variables
* Remove unused variable
* Extract springEncoder() method
* Restore previous constructor
* Extract isMultipartFormData() method
2020-04-14 16:28:03 +02:00
Ryan Baxter
8f421ced21
Merge remote-tracking branch 'origin/2.2.x'
2020-04-13 16:59:00 -04:00
rvervaek
dd91dcdf8d
Use property 'number' in JSON Page representation instead of 'page' ( #320 )
...
Fixes gh-237
Co-authored-by: rvvaeke <ruben.vervaeke@liantis.be >
2020-04-13 16:58:15 -04:00
buildmaster
78653c3e8e
Going back to snapshots
2020-04-09 22:28:42 +00:00
buildmaster
1f3ee5cfec
Update SNAPSHOT to 3.0.0.M1
2020-04-09 22:28:08 +00:00
nekkiy
f49db7233a
Fix double @RequestMapping with empty value ( #245 )
...
* Fix double @RequestMapping with empty value
* Fix code style
* Fix for review
* add author to SpringMvcContract
* split SpringMvcContractTests#testDoubleRequestMapping() test
2020-03-27 12:00:16 +01:00