Commit b39ecdf0 authored by Andy Wilkinson's avatar Andy Wilkinson

Rename preferred-mapper property so its clear it only applies to JSON

preferred-mapper has been renamed to preferred-json-mapper to make it
clear that it only affects the JSON mapper and that the XML mapper
that will be used (if any) is unaffected

See gh-2247
parent 230048ae
......@@ -52,7 +52,7 @@ import org.springframework.http.converter.StringHttpMessageConverter;
GsonHttpMessageConvertersConfiguration.class })
public class HttpMessageConvertersAutoConfiguration {
static final String PREFERRED_MAPPER_PROPERTY = "spring.http.converters.preferred-mapper";
static final String PREFERRED_MAPPER_PROPERTY = "spring.http.converters.preferred-json-mapper";
@Autowired(required = false)
private final List<HttpMessageConverter<?>> converters = Collections.emptyList();
......
......@@ -148,7 +148,7 @@ public class HttpMessageConvertersAutoConfigurationTests {
JacksonAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class);
EnvironmentTestUtils.addEnvironment(this.context,
"spring.http.converters.preferred-mapper:gson");
"spring.http.converters.preferred-json-mapper:gson");
this.context.refresh();
assertConverterBeanExists(GsonHttpMessageConverter.class,
"gsonHttpMessageConverter");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment