Commit Graph

2347 Commits

Author SHA1 Message Date
buildmaster
1f3ee5cfec Update SNAPSHOT to 3.0.0.M1 2020-04-09 22:28:08 +00:00
Marcin Grzejszczak
e4a8b0a6a6 Updated docs 2020-04-01 13:43:38 +02:00
Olga Maciaszek-Sharma
c87e5f2dbf Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	docs/src/main/asciidoc/spring-cloud-openfeign.adoc
2020-03-27 13:04:51 +01:00
Olga Maciaszek-Sharma
397130a935 Add information on SimpleDiscoveryClient. Fixes gh-295. 2020-03-27 13:02:07 +01: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
1de832e472 Fix typo. 2020-03-20 20:10:45 +01:00
Olga Maciaszek-Sharma
90181f34c0 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:05:09 +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
Spencer Gibb
cd1cead7fd bumps build to 2.3.0.BUILD-SNAPSHOT 2020-03-19 12:00:35 -04:00
Spencer Gibb
1ad9a8a24f bumps build to 2.2.4.BUILD-SNAPSHOT 2020-03-18 18:16:24 -04:00
Spencer Gibb
06769c4705 Updates docs branches 2020-03-06 12:53:34 -05:00
Spencer Gibb
f3c3b9073b ignores .flattened-pom.xml 2020-03-06 12:53:34 -05:00
Spencer Gibb
df5d1d5079 removes .flattened-pom.xml 2020-03-06 12:53:34 -05:00
buildmaster
8666006bf4 Bumping versions to 2.2.3.BUILD-SNAPSHOT after release 2020-03-04 16:30:43 +00:00
buildmaster
b5c8e6619e Going back to snapshots 2020-03-04 16:30:43 +00:00
buildmaster
6f09ae0824 Update SNAPSHOT to 2.2.2.RELEASE 2020-03-04 16:28:48 +00: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
Ryan Baxter
a2e968465a Merge remote-tracking branch 'origin/2.2.x' 2020-01-29 11:00:53 -05:00
Ryan Baxter
eca40256d8 Merge remote-tracking branch 'origin/2.1.x' into 2.2.x 2020-01-29 11:00:20 -05:00
Ryan Baxter
a85294a835 Add documentation about early initialization errors. Fixes #221 2020-01-29 10:57:58 -05:00
Ryan Baxter
6b656195ce Merge remote-tracking branch 'origin/2.2.x' 2020-01-29 10:39:48 -05:00
Ryan Baxter
db778b5c74 Merge remote-tracking branch 'origin/2.1.x' into 2.2.x 2020-01-29 10:38:31 -05:00
Ryan Baxter
73a75fd8b2 Add appendix.adoc. Fixes #255 2020-01-29 10:38:13 -05: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
Olga Maciaszek-Sharma
c187ff8792 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClient.java
2020-01-23 15:09:14 +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
14a43f976d Merge branch 'master' of github.com:spring-cloud/spring-cloud-openfeign 2020-01-21 12:41:37 -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
Olga Maciaszek-Sharma
05b58e087e Add public delegate modifiers in order to avoid reflection in SC Sleuth. 2020-01-20 17:00:56 +01:00
Olga Maciaszek-Sharma
80ecc9ac09 Make constructor public. Required for SC Sleuth gh-1528. 2020-01-20 14:28:30 +01:00
buildmaster
bee97b8611 Bumping versions 2020-01-19 11:37:13 +00:00
Spencer Gibb
8a08e1ec4b Removes ribbon and hystrix support 2020-01-17 19:28:33 -05:00