Adapt to changes in HttpMessageConverter customization API in latest Framework.

Author: odrotbohm

src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java

@@ -41,7 +41,7 @@
 import org.springframework.format.FormatterRegistry;
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.HttpMessageConverters;
+import org.springframework.http.converter.HttpMessageConverters.ServerBuilder;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
@@ -153,13 +153,13 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentRes
 	}
 
 	@Override
-	public void configureMessageConverters(HttpMessageConverters.Builder builder) {
+	public void configureMessageConverters(ServerBuilder builder) {
 
 		List<HttpMessageConverter<?>> converters = new ArrayList<>();
 		configureMessageConverters(converters);
 
 		for (HttpMessageConverter<?> converter : converters) {
-			builder.additionalMessageConverter(converter);
+			builder.customMessageConverter(converter);
 		}
 	}
 

src/test/java/org/springframework/data/web/config/EnableSpringDataWebSupportIntegrationTests.java

@@ -134,7 +134,7 @@ PageSampleController controller() {
 		}
 
 		@Override
-		protected void configureMessageConverters(HttpMessageConverters.Builder builder) {
+		protected void configureMessageConverters(HttpMessageConverters.ServerBuilder builder) {
 			builder.jsonMessageConverter(new JacksonJsonHttpMessageConverter(
 					JsonMapper.builder().addModules(modules.toArray(new JacksonModule[0])).build()));
 		}

src/test/java/org/springframework/data/web/config/SpringDataWebConfigurationIntegrationTests.java

@@ -55,60 +55,60 @@ class SpringDataWebConfigurationIntegrationTests {
 	@Test // DATACMNS-987
 	void shouldNotLoadJacksonConverterWhenJacksonNotPresent() {
 
-		HttpMessageConverters.Builder builder = mock(HttpMessageConverters.Builder.class);
+		HttpMessageConverters.ServerBuilder builder = mock(HttpMessageConverters.ServerBuilder.class);
 
 		createConfigWithClassLoader(
 				HidingClassLoader.hide(ObjectMapper.class, com.fasterxml.jackson.databind.ObjectMapper.class),
 				it -> it.configureMessageConverters(builder));
 
-		verify(builder).additionalMessageConverter(any(XmlBeamHttpMessageConverter.class));
+		verify(builder).customMessageConverter(any(XmlBeamHttpMessageConverter.class));
 		verifyNoMoreInteractions(builder);
 	}
 
 	@Test // DATACMNS-987
 	void shouldNotLoadJacksonConverterWhenJaywayNotPresent() {
 
-		HttpMessageConverters.Builder builder = mock(HttpMessageConverters.Builder.class);
+		HttpMessageConverters.ServerBuilder builder = mock(HttpMessageConverters.ServerBuilder.class);
 
 		createConfigWithClassLoader(HidingClassLoader.hide(DocumentContext.class),
 				it -> it.configureMessageConverters(builder));
 
-		verify(builder).additionalMessageConverter(any(XmlBeamHttpMessageConverter.class));
+		verify(builder).customMessageConverter(any(XmlBeamHttpMessageConverter.class));
 		verifyNoMoreInteractions(builder);
 	}
 
 	@Test // DATACMNS-987
 	void shouldNotLoadXBeamConverterWhenXBeamNotPresent() throws Exception {
 
-		HttpMessageConverters.Builder builder = mock(HttpMessageConverters.Builder.class);
+		HttpMessageConverters.ServerBuilder builder = mock(HttpMessageConverters.ServerBuilder.class);
 
 		ClassLoader classLoader = HidingClassLoader.hide(XBProjector.class);
 		createConfigWithClassLoader(classLoader, it -> it.configureMessageConverters(builder));
 
-		verify(builder, never()).additionalMessageConverter(any(XmlBeamHttpMessageConverter.class));
+		verify(builder, never()).customMessageConverter(any(XmlBeamHttpMessageConverter.class));
 	}
 
 	@Test // DATACMNS-987
 	void shouldLoadAllConvertersWhenDependenciesArePresent() throws Exception {
 
-		HttpMessageConverters.Builder builder = mock(HttpMessageConverters.Builder.class);
+		HttpMessageConverters.ServerBuilder builder = mock(HttpMessageConverters.ServerBuilder.class);
 
 		createConfigWithClassLoader(getClass().getClassLoader(), it -> it.configureMessageConverters(builder));
 
-		verify(builder).additionalMessageConverter(any(XmlBeamHttpMessageConverter.class));
-		verify(builder).additionalMessageConverter(any(ProjectingJacksonHttpMessageConverter.class));
+		verify(builder).customMessageConverter(any(XmlBeamHttpMessageConverter.class));
+		verify(builder).customMessageConverter(any(ProjectingJacksonHttpMessageConverter.class));
 	}
 
 	@Test // DATACMNS-1152
 	void usesCustomObjectMapper() {
 
 		createConfigWithClassLoader(getClass().getClassLoader(), it -> {
 
-			HttpMessageConverters.Builder builder = mock(HttpMessageConverters.Builder.class);
+			HttpMessageConverters.ServerBuilder builder = mock(HttpMessageConverters.ServerBuilder.class);
 			ArgumentCaptor<HttpMessageConverter> captor = ArgumentCaptor.forClass(HttpMessageConverter.class);
 
 			it.configureMessageConverters(builder);
-			verify(builder, atLeast(1)).additionalMessageConverter(captor.capture());
+			verify(builder, atLeast(1)).customMessageConverter(captor.capture());
 
 			// Converters contains ProjectingJackson2HttpMessageConverter with custom ObjectMapper