Browse Source

Adapt to change in Spring Framework 7.0.0 snapshot.

Closes: #3394

Signed-off-by: Stéphane Nicoll <stephane.nicoll@broadcom.com>
pull/3399/head
Stéphane Nicoll 2 months ago committed by Christoph Strobl
parent
commit
3af57ca8bd
No known key found for this signature in database
GPG Key ID: E6054036D0C37A4B
  1. 6
      src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java
  2. 2
      src/test/java/org/springframework/data/web/config/EnableSpringDataWebSupportIntegrationTests.java
  3. 12
      src/test/java/org/springframework/data/web/config/SpringDataWebConfigurationIntegrationTests.java

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

@ -165,7 +165,7 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo @@ -165,7 +165,7 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo
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 class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo @@ -177,13 +177,13 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo
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));
}
}

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

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

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

@ -63,7 +63,7 @@ class SpringDataWebConfigurationIntegrationTests { @@ -63,7 +63,7 @@ class SpringDataWebConfigurationIntegrationTests {
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 @@ class SpringDataWebConfigurationIntegrationTests { @@ -75,7 +75,7 @@ class SpringDataWebConfigurationIntegrationTests {
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 @@ class SpringDataWebConfigurationIntegrationTests { @@ -87,7 +87,7 @@ class SpringDataWebConfigurationIntegrationTests {
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 @@ class SpringDataWebConfigurationIntegrationTests { @@ -97,8 +97,8 @@ class SpringDataWebConfigurationIntegrationTests {
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 @@ class SpringDataWebConfigurationIntegrationTests { @@ -110,7 +110,7 @@ class SpringDataWebConfigurationIntegrationTests {
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

Loading…
Cancel
Save