DATAREST-686 - Set default encoding for resource description message …

…source to UTF-8.

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

@@ -398,6 +398,7 @@ public MessageSourceAccessor resourceDescriptionMessageSourceAccessor() {
 			ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
 			messageSource.setBasename("classpath:rest-messages");
 			messageSource.setCommonMessages(propertiesFactoryBean.getObject());
+			messageSource.setDefaultEncoding("UTF-8");
 
 			return new MessageSourceAccessor(messageSource);
 

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

@@ -33,6 +33,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort.Direction;
@@ -53,6 +54,7 @@
 import org.springframework.hateoas.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -207,6 +209,19 @@ public void hasConvertersForPointAndDistance() {
 		assertThat(service.canConvert(Distance.class, String.class), is(true));
 	}
 
+	/**
+	 * @see DATAREST-686
+	 */
+	@Test
+	public void defaultsEncodingForMessageSourceToUtfEight() {
+
+		MessageSourceAccessor accessor = context.getBean("resourceDescriptionMessageSourceAccessor",
+				MessageSourceAccessor.class);
+		Object messageSource = ReflectionTestUtils.getField(accessor, "messageSource");
+
+		assertThat((String) ReflectionTestUtils.getField(messageSource, "defaultEncoding"), is("UTF-8"));
+	}
+
 	@Configuration
 	@Import(RepositoryRestMvcConfiguration.class)
 	static class ExtendingConfiguration extends RepositoryRestConfigurerAdapter {