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

DATAREST-577 - Removed obsolete dependency to configuration from RepositoryResourceMappings.

Browse Source 
This avoids a cyclic dependency between the configuration and the mappings that caused bootstrap issues.
This commit is contained in:
Oliver Gierke
2015-06-19 12:40:42 +02:00
parent e6f5d9bbd8
commit fcb55865bf
4 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java
View File

@@ -526,11 +526,7 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
@Bean
public ResourceMappings resourceMappings() {
Repositories repositories = repositories();
RepositoryRestConfiguration config = config();
return new RepositoryResourceMappings(config, repositories);
return new RepositoryResourceMappings(repositories());
}
/**

2
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/RepositoryTestsConfig.java
View File

@@ -94,7 +94,7 @@ public class RepositoryTestsConfig {
@Bean
public Module persistentEntityModule() {
return new PersistentEntityJackson2Module(new RepositoryResourceMappings(config(), repositories()),
return new PersistentEntityJackson2Module(new RepositoryResourceMappings(repositories()),
persistentEntities(), config(), new UriToEntityConverter(persistentEntities(), defaultConversionService()));
}