From bdcbaa7f3b1e65f69137c7ae246a30d96d1930d8 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 5 Sep 2022 16:37:12 +0200 Subject: [PATCH] Allow overriding binary content types. Fixes gh-734. --- .../cloud/openfeign/support/SpringEncoder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java index ef2624ae..5dea96f3 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java @@ -247,12 +247,12 @@ public class SpringEncoder implements Encoder { return Objects.equals(APPLICATION_FORM_URLENCODED, requestContentType); } - private boolean binaryContentType(FeignOutputMessage outputMessage) { + protected boolean binaryContentType(FeignOutputMessage outputMessage) { MediaType contentType = outputMessage.getHeaders().getContentType(); return contentType == null || Stream - .of(MediaType.APPLICATION_CBOR, MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_PDF, - MediaType.IMAGE_GIF, MediaType.IMAGE_JPEG, MediaType.IMAGE_PNG) - .anyMatch(mediaType -> mediaType.includes(contentType)); + .of(MediaType.APPLICATION_CBOR, MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_PDF, + MediaType.IMAGE_GIF, MediaType.IMAGE_JPEG, MediaType.IMAGE_PNG) + .anyMatch(mediaType -> mediaType.includes(contentType)); } private final class FeignOutputMessage implements HttpOutputMessage {