wyl/spring-cloud-openfeign
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1.x'

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2022-09-05 16:43:41 +02:00
parent 5bddccf720 bdcbaa7f3b
commit 5a21e22002
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/LoadBalancerFeignRequestTransformer.java
+2 -1
View File
@@ -36,7 +36,8 @@ public interface LoadBalancerFeignRequestTransformer {
int DEFAULT_ORDER = 0; int DEFAULT_ORDER = 0;
/** /**
* Allows transforming load-balanced requests based on the provided {@link ServiceInstance}. * Allows transforming load-balanced requests based on the provided
* {@link ServiceInstance}.
* @param request Original request. * @param request Original request.
* @param instance ServiceInstance returned from LoadBalancer. * @param instance ServiceInstance returned from LoadBalancer.
* @return New request or original request * @return New request or original request
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java
+1 -1
View File
@@ -247,7 +247,7 @@ public class SpringEncoder implements Encoder {
return Objects.equals(APPLICATION_FORM_URLENCODED, requestContentType); return Objects.equals(APPLICATION_FORM_URLENCODED, requestContentType);
} }
private boolean binaryContentType(FeignOutputMessage outputMessage) { protected boolean binaryContentType(FeignOutputMessage outputMessage) {
MediaType contentType = outputMessage.getHeaders().getContentType(); MediaType contentType = outputMessage.getHeaders().getContentType();
return contentType == null || Stream return contentType == null || Stream
.of(MediaType.APPLICATION_CBOR, MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_PDF, .of(MediaType.APPLICATION_CBOR, MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_PDF,