SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,380 Commits 28 Branches 0 Tags
d492fe0742e73e3fb43ef286044352bff788cd60
Commit Graph

146 Commits

Author SHA1 Message Date
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
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
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
nekkiy
0afb60a72a 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 11:58:26 +01:00
Olga Maciaszek-Sharma
a77bd2bdf1 Remove unnecessary exception clause. 2020-03-24 17:17:25 +01:00
Olga Maciaszek-Sharma
56bee946d8 Merge remote-tracking branch 'origin/2.2.x' 2020-03-24 17:13:36 +01:00
Michael Cramer
c281800ccd add support for an FeignErrorDecoderFactory in 2.2.x (#310) 
* add support for an FeignErrorDecoderFactory
this factory will be used if no ErrorDecoder was found. This factory allows to create a ErrorDecoder based on the type. This fixes #308

* add assertions to make it more readable

* add test for checking to not overwrite an existing ErrorDecoder when provided in the configuration

* add test for checking to not overwrite an existing ErrorDecoder when provided in the configuration

* add test for checking to not overwrite an existing ErrorDecoder when provided in the configuration
 2020-03-24 17:12:29 +01:00
Olga Maciaszek-Sharma
6b9be3f513 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-03-20 20:02:12 +01:00
Olga Maciaszek-Sharma
db2e84ef06 Add test for passing @MatrixVariable without specified name. Add documentation for @MatrixVariable support. Fixes gh-307. 2020-03-20 19:58:47 +01:00
Olga Maciaszek-Sharma
efe264d2bb Adjust to ribbon changes in commons (#300) 
* Adjust to Ribbon changes in commons.

* Switch to using LoadBalancerClient bean instead of BlockingLoadBalancerClient bean following changes in commons. Remove references of Ribbon from docs and javadocs.
 2020-02-22 14:11:30 +01:00
Olga Maciaszek-Sharma
ffa18c4346 Fix after merge. 2020-02-05 14:59:35 +01:00
Olga Maciaszek-Sharma
d6e1a9f6a1 Merge branch '2.2.x' 
# Conflicts:
#	spring-cloud-openfeign-core/.flattened-pom.xml
#	spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java
#	spring-cloud-openfeign-dependencies/pom.xml
#	spring-cloud-starter-openfeign/.flattened-pom.xml
 2020-02-05 14:41:11 +01:00
Olga Maciaszek-Sharma
c82b577d00 Upgrade feign to 10.7.4. (#292) 2020-02-05 14:37:35 +01:00
buildmaster
186711914a Bumping versions 2020-01-24 11:37:05 +00:00
Spencer Gibb
569dd54ccc Moves multipart tests and un-ignores them. 
fixes gh-287
 2020-01-23 16:12:06 -05:00
Spencer Gibb
91895278bf Renames test classes to be unique 2020-01-23 16:08:58 -05:00
Spencer Gibb
8683a04048 Moves multipart tests and un-ignores them. 
fixes gh-287
 2020-01-23 16:07:30 -05:00
Spencer Gibb
7c531d9dae Restores ignored tests. 
fixes gh-280
 2020-01-23 15:46:12 -05:00
Olga Maciaszek-Sharma
487390fc20 Merge branch '2.2.x' 
# Conflicts:
#	spring-cloud-openfeign-core/.flattened-pom.xml
#	spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java
#	spring-cloud-openfeign-dependencies/pom.xml
#	spring-cloud-starter-openfeign/.flattened-pom.xml
 2020-01-23 15:33:04 +01:00
Aaron Whiteside
892e65e303 Fix GH-201: Multiple @RequestPart not Working (#258) 
Summary of changes follows:

- Delegate ALL requestBody encoding where Content-Type is multipart/form-data to the SpringFormEncoder.
- Introduce RequestPartParameterProcessor to deal with @RequestPart annotations, adds parameters to MethodMetadata.formParams().
- Wrap HttpMessageConversionException in EncodeException.
- Add tests to verify expected behaviour.

However there still exists a gap in functionality where any user defined pojo will be serialized as a Map<String,String>, as there is currently no way for SpringFormEncoder to know about the Content-Type of the individual parts beyond MultipartFile, boxed primitive types (which are treated as text/plain) and other built-in types inherited from FormEncoder.
 2020-01-23 15:02:21 +01:00
Spencer Gibb
826c9e9699 Makes constuctor public 2020-01-22 16:55:35 -05:00
Spencer Gibb
87ebb3cbdf Removes ribbon from auto config 2020-01-22 12:51:07 -05:00
Spencer Gibb
08f0fe4ae1 Ignores broken tests. 
See gh-280
 2020-01-21 12:40:22 -05:00
buildmaster
422dda0a75 Bumping versions 2020-01-21 14:06:45 +00:00
Olga Maciaszek-Sharma
3eabb0237e Add comment. 2020-01-20 17:32:19 +01:00
Olga Maciaszek-Sharma
ada2cb7913 Revert "Add public delegate modifiers in order to avoid reflection in SC Sleuth." 
This reverts commit 05b58e087e.
 2020-01-20 17:31:13 +01:00