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

Author: bclozel

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

@@ -26,11 +26,8 @@
 import java.util.Map;
 
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 import org.springframework.http.converter.xml.AbstractXmlHttpMessageConverter;
-import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
@@ -187,14 +184,13 @@ private List<HttpMessageConverter<?>> getDefaultConverters() {
 		List<HttpMessageConverter<?>> converters = new ArrayList<>();
 		if (ClassUtils.isPresent("org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport",
 				null)) {
-			List<HttpMessageConverter<?>> webMvcConverters = new WebMvcConfigurationSupport() {
+			converters.addAll(new WebMvcConfigurationSupport() {
 
 				public List<HttpMessageConverter<?>> defaultMessageConverters() {
 					return super.getMessageConverters();
 				}
 
-			}.defaultMessageConverters();
-			converters.addAll(reorderAllEncompassingFormHttpMessageConverterBeforeJackson(webMvcConverters));
+			}.defaultMessageConverters());
 		}
 		else {
 			converters.addAll(new RestTemplate().getMessageConverters());
@@ -203,30 +199,6 @@ public List<HttpMessageConverter<?>> defaultMessageConverters() {
 		return converters;
 	}
 
-	@SuppressWarnings("removal")
-	private List<HttpMessageConverter<?>> reorderAllEncompassingFormHttpMessageConverterBeforeJackson(
-			List<HttpMessageConverter<?>> converters) {
-		List<HttpMessageConverter<?>> reordered = new ArrayList<>();
-		for (int i = 0; i < converters.size(); i++) {
-			HttpMessageConverter<?> converter = converters.get(i);
-			if (converter == null) {
-				continue;
-			}
-			if (converter instanceof MappingJackson2XmlHttpMessageConverter
-					|| converter instanceof MappingJackson2HttpMessageConverter
-					|| converter instanceof MappingJackson2CborHttpMessageConverter) {
-				for (int j = i; j < converters.size(); j++) {
-					if (converters.get(j) instanceof AllEncompassingFormHttpMessageConverter) {
-						reordered.add(converters.get(j));
-						converters.set(j, null);
-					}
-				}
-			}
-			reordered.add(converter);
-		}
-		return reordered;
-	}
-
 	@SuppressWarnings("removal")
 	private void reorderXmlConvertersToEnd(List<HttpMessageConverter<?>> converters) {
 		List<HttpMessageConverter<?>> xml = new ArrayList<>();