Skip to content

Adapt to change in Spring Framework 7.0.0 snapshots #3394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+10 −10
Closed

Adapt to change in Spring Framework 7.0.0 snapshots #3394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())) {

Expand All @@ -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));
}
}
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/springframework/data/web/config/EnableSpringDataWebSupportIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}

Expand Down
12 changes: 6 additions & 6 deletions .../java/org/springframework/data/web/config/SpringDataWebConfigurationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down