SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Olga MaciaszekSharma
2023-12-13 13:04:04 +01:00
parent 8039131cbb 93116c8507
commit fcc04f8599
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2022 the original author or authors.
* Copyright 2013-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -78,6 +78,8 @@ public class SpringEncoder implements Encoder {
private final ObjectProvider<HttpMessageConverterCustomizer> customizers;
private List<HttpMessageConverter<?>> converters;
public SpringEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
this(new SpringFormEncoder(), messageConverters, new FeignEncoderProperties(), new EmptyObjectProvider<>());
}
@@ -118,8 +120,7 @@ public class SpringEncoder implements Encoder {
private void encodeWithMessageConverter(Object requestBody, Type bodyType, RequestTemplate request,
MediaType requestContentType) {
List<HttpMessageConverter<?>> converters = messageConverters.getObject().getConverters();
customizers.forEach(customizer -> customizer.accept(converters));
initConvertersIfRequired();
for (HttpMessageConverter messageConverter : converters) {
FeignOutputMessage outputMessage;
try {
@@ -169,6 +170,13 @@ public class SpringEncoder implements Encoder {
throw new EncodeException(message);
}
private void initConvertersIfRequired() {
if (converters == null) {
converters = messageConverters.getObject().getConverters();
customizers.forEach(customizer -> customizer.accept(converters));
}
}
private boolean shouldHaveNullCharset(HttpMessageConverter messageConverter, FeignOutputMessage outputMessage) {
return binaryContentType(outputMessage) || messageConverter instanceof ByteArrayHttpMessageConverter
|| messageConverter instanceof ProtobufHttpMessageConverter && ProtobufHttpMessageConverter.PROTOBUF