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

DATAREST-651 - Upgraded to Spring HATEOAS 0.19.

Browse Source 
Upgraded to snapshots of Spring HATEOAS to use the now extended constructor of HalHandlerInstantiator to be able to render title attributes for links.
This commit is contained in:
Oliver Gierke
2015-08-19 19:10:46 +02:00
parent 52a8d837f0
commit 39eb338025
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-rest-core/pom.xml
View File

@@ -16,7 +16,7 @@
</parent>
<properties>
<spring.hateoas>0.18.0.RELEASE</spring.hateoas>
<spring.hateoas>0.19.0.BUILD-SNAPSHOT</spring.hateoas>
<springplugin>1.2.0.RELEASE</springplugin>
<evoinflector>1.2.1</evoinflector>
</properties>

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

@@ -477,7 +477,8 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
RelProvider defaultedRelProvider = this.relProvider != null ? this.relProvider : new EvoInflectorRelProvider();
HalHandlerInstantiator instantiator = new HalHandlerInstantiator(defaultedRelProvider, curieProvider);
HalHandlerInstantiator instantiator = new HalHandlerInstantiator(defaultedRelProvider, curieProvider,
resourceDescriptionMessageSourceAccessor());
ObjectMapper mapper = basicObjectMapper();
mapper.registerModule(persistentEntityJackson2Module());

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

@@ -58,7 +58,7 @@ import com.jayway.jsonpath.JsonPath;
@ContextConfiguration(classes = { MongoDbRepositoryConfig.class, TestConfiguration.class })
public class PersistentEntityToJsonSchemaConverterUnitTests {
@Autowired MessageSourceAccessor accessor;
@Autowired @Qualifier("resourceDescriptionMessageSourceAccessor") MessageSourceAccessor accessor;
@Autowired RepositoryResourceMappings mappings;
@Autowired RepositoryRestConfiguration configuration;
@Autowired PersistentEntities entities;

5
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/ProjectionJacksonIntegrationTests.java
View File

@@ -48,7 +48,7 @@ public class ProjectionJacksonIntegrationTests {
this.mapper = new ObjectMapper();
this.mapper.registerModule(new Jackson2HalModule());
this.mapper.setHandlerInstantiator(new HalHandlerInstantiator(new EvoInflectorRelProvider(), null));
this.mapper.setHandlerInstantiator(new HalHandlerInstantiator(new EvoInflectorRelProvider(), null, null));
}
/**
@@ -76,7 +76,8 @@ public class ProjectionJacksonIntegrationTests {
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new Jackson2HalModule());
mapper.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(new EvoInflectorRelProvider(), null));
mapper.setHandlerInstantiator(
new Jackson2HalModule.HalHandlerInstantiator(new EvoInflectorRelProvider(), null, null));
Customer customer = new Customer();
customer.firstname = "Dave";

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

@@ -109,8 +109,8 @@ public class RepositoryTestsConfig {
mock(PagingAndSortingTemplateVariables.class),
OrderAwarePluginRegistry.<Class<?>, BackendIdConverter> create(Arrays.asList(DefaultIdConverter.INSTANCE)));
return new PersistentEntityJackson2Module(mappings, persistentEntities(), config(), new UriToEntityConverter(
persistentEntities(), defaultConversionService()), entityLinks);
return new PersistentEntityJackson2Module(mappings, persistentEntities(), config(),
new UriToEntityConverter(persistentEntities(), defaultConversionService()), entityLinks);
}
@Bean
@@ -121,7 +121,7 @@ public class RepositoryTestsConfig {
mapper.registerModule(new Jackson2HalModule());
mapper.registerModule(persistentEntityModule());
mapper.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(relProvider, null));
mapper.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(relProvider, null, null));
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
mapper.setSerializationInclusion(Include.NON_EMPTY);