Adapt to change in Spring Framework 7.0.0 snapshot.

Closes: #3394

Signed-off-by: Stéphane Nicoll <[email protected]>

Author: snicoll

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

@@ -165,7 +165,7 @@ public void configureMessageConverters(ServerBuilder builder) {
 				converter.setBeanFactory(context);
 				forwardBeanClassLoader(converter);
 
-				builder.customMessageConverter(converter);
+				builder.addCustomConverter(converter);
 
 			} else if (ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", context.getClassLoader())) {
 
@@ -177,13 +177,13 @@ public void configureMessageConverters(ServerBuilder builder) {
 				converter.setBeanFactory(context);
 				forwardBeanClassLoader(converter);
 
-				builder.customMessageConverter(converter);
+				builder.addCustomConverter(converter);
 			}
 		}
 
 		if (ClassUtils.isPresent("org.xmlbeam.XBProjector", context.getClassLoader())) {
 
-			builder.customMessageConverter(context.getBeanProvider(XmlBeamHttpMessageConverter.class) //
+			builder.addCustomConverter(context.getBeanProvider(XmlBeamHttpMessageConverter.class) //
 					.getIfAvailable(XmlBeamHttpMessageConverter::new));
 		}
 	}

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

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

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

@@ -63,7 +63,7 @@ void shouldNotLoadJacksonConverterWhenJacksonNotPresent() {
 				HidingClassLoader.hide(ObjectMapper.class, com.fasterxml.jackson.databind.ObjectMapper.class),
 				it -> it.configureMessageConverters(builder));
 
-		verify(builder).customMessageConverter(any(XmlBeamHttpMessageConverter.class));
+		verify(builder).addCustomConverter(any(XmlBeamHttpMessageConverter.class));
 		verifyNoMoreInteractions(builder);
 	}
 
@@ -75,7 +75,7 @@ void shouldNotLoadJacksonConverterWhenJaywayNotPresent() {
 		createConfigWithClassLoader(HidingClassLoader.hide(DocumentContext.class),
 				it -> it.configureMessageConverters(builder));
 
-		verify(builder).customMessageConverter(any(XmlBeamHttpMessageConverter.class));
+		verify(builder).addCustomConverter(any(XmlBeamHttpMessageConverter.class));
 		verifyNoMoreInteractions(builder);
 	}
 
@@ -87,7 +87,7 @@ void shouldNotLoadXBeamConverterWhenXBeamNotPresent() throws Exception {
 		ClassLoader classLoader = HidingClassLoader.hide(XBProjector.class);
 		createConfigWithClassLoader(classLoader, it -> it.configureMessageConverters(builder));
 
-		verify(builder, never()).customMessageConverter(any(XmlBeamHttpMessageConverter.class));
+		verify(builder, never()).addCustomConverter(any(XmlBeamHttpMessageConverter.class));
 	}
 
 	@Test // DATACMNS-987
@@ -97,8 +97,8 @@ void shouldLoadAllConvertersWhenDependenciesArePresent() throws Exception {
 
 		createConfigWithClassLoader(getClass().getClassLoader(), it -> it.configureMessageConverters(builder));
 
-		verify(builder).customMessageConverter(any(XmlBeamHttpMessageConverter.class));
-		verify(builder).customMessageConverter(any(ProjectingJacksonHttpMessageConverter.class));
+		verify(builder).addCustomConverter(any(XmlBeamHttpMessageConverter.class));
+		verify(builder).addCustomConverter(any(ProjectingJacksonHttpMessageConverter.class));
 	}
 
 	@Test // DATACMNS-1152
@@ -110,7 +110,7 @@ void usesCustomObjectMapper() {
 			ArgumentCaptor<HttpMessageConverter> captor = ArgumentCaptor.forClass(HttpMessageConverter.class);
 
 			it.configureMessageConverters(builder);
-			verify(builder, atLeast(1)).customMessageConverter(captor.capture());
+			verify(builder, atLeast(1)).addCustomConverter(captor.capture());
 
 			// Converters contains ProjectingJackson2HttpMessageConverter with custom ObjectMapper