Skip to content

Fix default StringHttpMessageConverter #43640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix default StringHttpMessageConverter #43640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ...gure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.Map;

import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
import org.springframework.http.converter.xml.AbstractXmlHttpMessageConverter;
import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
Expand Down Expand Up @@ -121,14 +122,24 @@ private List<HttpMessageConverter<?>> getCombinedConverters(Collection<HttpMessa
List<HttpMessageConverter<?>> processing = new ArrayList<>(converters);
for (HttpMessageConverter<?> defaultConverter : defaultConverters) {
Iterator<HttpMessageConverter<?>> iterator = processing.iterator();
boolean skipDefault = false;
while (iterator.hasNext()) {
HttpMessageConverter<?> candidate = iterator.next();
if (isReplacement(defaultConverter, candidate)) {
combined.add(candidate);
iterator.remove();

if (defaultConverter instanceof StringHttpMessageConverter
&& defaultConverter.getSupportedMediaTypes().equals(candidate.getSupportedMediaTypes())) {
skipDefault = true;
}
}
}
combined.add(defaultConverter);

if (!skipDefault) {
combined.add(defaultConverter);
}

if (defaultConverter instanceof AllEncompassingFormHttpMessageConverter allEncompassingConverter) {
configurePartConverters(allEncompassingConverter, converters);
}
Expand Down
16 changes: 16 additions & 0 deletions ...src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.boot.autoconfigure.http;

import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
Expand Down Expand Up @@ -163,4 +164,19 @@ private AllEncompassingFormHttpMessageConverter findFormConverter(Collection<Htt
return null;
}

@Test
void replaceDefaultStringHttpConverter() {
StringHttpMessageConverter converter = new StringHttpMessageConverter(StandardCharsets.UTF_8);
HttpMessageConverters converters = new HttpMessageConverters(converter);
assertThat(converters.getConverters()).contains(converter);
List<StringHttpMessageConverter> httpConverters = new ArrayList<>();
for (HttpMessageConverter<?> candidate : converters) {
if (candidate instanceof StringHttpMessageConverter) {
httpConverters.add((StringHttpMessageConverter) candidate);
}
}

assertThat(httpConverters).hasSize(1);
assertThat(httpConverters.get(0)).isEqualTo(converter);
}
}
Loading