Skip to content

Commit 3168b59

Browse files
bclozelbclozel
committed
Revert temporary workaround for HttpMessageConverters
Two additional issues were fixed in spring-projects/spring-framework#33894 * ordering of the multipart converter for server apps * the classpath detection is now more static for GraalVM Fixes gh-46221
1 parent fd34f80 commit 3168b59

1 file changed

Lines changed: 2 additions & 30 deletions

File tree

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/HttpMessageConverters.java‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@
2626
import java.util.Map;
2727

2828
import org.springframework.http.converter.HttpMessageConverter;
29-
import org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter;
30-
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
3129
import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
3230
import org.springframework.http.converter.xml.AbstractXmlHttpMessageConverter;
33-
import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
3431
import org.springframework.util.ClassUtils;
3532
import org.springframework.web.client.RestTemplate;
3633
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
@@ -187,14 +184,13 @@ private List<HttpMessageConverter<?>> getDefaultConverters() {
187184
List<HttpMessageConverter<?>> converters = new ArrayList<>();
188185
if (ClassUtils.isPresent("org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport",
189186
null)) {
190-
List<HttpMessageConverter<?>> webMvcConverters = new WebMvcConfigurationSupport() {
187+
converters.addAll(new WebMvcConfigurationSupport() {
191188

192189
public List<HttpMessageConverter<?>> defaultMessageConverters() {
193190
return super.getMessageConverters();
194191
}
195192

196-
}.defaultMessageConverters();
197-
converters.addAll(reorderAllEncompassingFormHttpMessageConverterBeforeJackson(webMvcConverters));
193+
}.defaultMessageConverters());
198194
}
199195
else {
200196
converters.addAll(new RestTemplate().getMessageConverters());
@@ -203,30 +199,6 @@ public List<HttpMessageConverter<?>> defaultMessageConverters() {
203199
return converters;
204200
}
205201

206-
@SuppressWarnings("removal")
207-
private List<HttpMessageConverter<?>> reorderAllEncompassingFormHttpMessageConverterBeforeJackson(
208-
List<HttpMessageConverter<?>> converters) {
209-
List<HttpMessageConverter<?>> reordered = new ArrayList<>();
210-
for (int i = 0; i < converters.size(); i++) {
211-
HttpMessageConverter<?> converter = converters.get(i);
212-
if (converter == null) {
213-
continue;
214-
}
215-
if (converter instanceof MappingJackson2XmlHttpMessageConverter
216-
|| converter instanceof MappingJackson2HttpMessageConverter
217-
|| converter instanceof MappingJackson2CborHttpMessageConverter) {
218-
for (int j = i; j < converters.size(); j++) {
219-
if (converters.get(j) instanceof AllEncompassingFormHttpMessageConverter) {
220-
reordered.add(converters.get(j));
221-
converters.set(j, null);
222-
}
223-
}
224-
}
225-
reordered.add(converter);
226-
}
227-
return reordered;
228-
}
229-
230202
@SuppressWarnings("removal")
231203
private void reorderXmlConvertersToEnd(List<HttpMessageConverter<?>> converters) {
232204
List<HttpMessageConverter<?>> xml = new ArrayList<>();

0 commit comments

Comments
 (0)