Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow customization of LinkCollector.

Browse Source 
LinkCollector is now an interface. The actual implementation has been moved to DefaultLinkCollector. RepositoryRestConfigurer now has a customizeLinkCollector(…) callback method to tweak or even completely replace the LinkCollector instance.

Fixes #2042.
This commit is contained in:
Oliver Drotbohm
2021-07-15 08:15:20 +02:00
parent 0c24113484
commit 161a3a9499
8 changed files with 311 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvConfigurationIntegrationTests.java
View File

@@ -47,6 +47,7 @@ import org.springframework.data.rest.webmvc.RepositoryLinksResource;
import org.springframework.data.rest.webmvc.RestMediaTypes;
import org.springframework.data.rest.webmvc.alps.AlpsJsonHttpMessageConverter;
import org.springframework.data.rest.webmvc.json.PersistentEntityJackson2Module;
import org.springframework.data.rest.webmvc.mapping.LinkCollector;
import org.springframework.data.util.Lazy;
import org.springframework.data.util.Streamable;
import org.springframework.data.web.HateoasPageableHandlerMethodArgumentResolver;
@@ -221,6 +222,14 @@ public class RepositoryRestMvConfigurationIntegrationTests {
assertThat(factory).isEqualTo(ExtendingConfiguration.auditableBeanWrapperFactory);
}
@Test // #2042
public void appliesLinkCollectorCustomizer() {
LinkCollector factory = context.getBean(LinkCollector.class);
assertThat(factory).isEqualTo(ExtendingConfiguration.collector);
}
private static ObjectMapper getObjectMapper() {
AbstractJackson2HttpMessageConverter converter = context.getBean("halJacksonHttpMessageConverter",
@@ -233,6 +242,7 @@ public class RepositoryRestMvConfigurationIntegrationTests {
static class ExtendingConfiguration {
static AuditableBeanWrapperFactory auditableBeanWrapperFactory = mock(AuditableBeanWrapperFactory.class);
static LinkCollector collector = mock(LinkCollector.class);
@Bean
DefaultLinkRelationProvider relProvider() {
@@ -265,8 +275,8 @@ public class RepositoryRestMvConfigurationIntegrationTests {
}
@Bean
@Order(300) // #2040
RepositoryRestConfigurer auditingBeanWrapperCustomizer() {
@Order(300) // #2040, #2042
RepositoryRestConfigurer customizer() {
return new RepositoryRestConfigurer() {
@@ -274,6 +284,11 @@ public class RepositoryRestMvConfigurationIntegrationTests {
public AuditableBeanWrapperFactory customizeAuditableBeanWrapperFactory(AuditableBeanWrapperFactory factory) {
return auditableBeanWrapperFactory;
}
@Override
public LinkCollector customizeLinkCollector(LinkCollector collector) {
return ExtendingConfiguration.collector;
}
};
}
}