mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '2.0.x'
This commit is contained in:
commit
39f8b685df
@ -26,7 +26,7 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
|
||||
* configuration.
|
||||
* <p>
|
||||
* For customization of the {@link DataSource} used by Quartz, use of
|
||||
* {@link QuartzDataSource @QuartDataSource} is preferred. It will ensure consistent
|
||||
* {@link QuartzDataSource @QuartzDataSource} is preferred. It will ensure consistent
|
||||
* customization of both the {@link SchedulerFactoryBean} and the
|
||||
* {@link QuartzDataSourceInitializer}.
|
||||
*
|
||||
|
@ -2000,7 +2000,7 @@ Jackson is the preferred and default library.
|
||||
[[boot-features-json-jackson]]
|
||||
=== Jackson
|
||||
Auto-configuration for Jackson is provided and Jackson is part of
|
||||
`spring-boot-starer-json`. When Jackson is on the classpath an `ObjectMapper`
|
||||
`spring-boot-starter-json`. When Jackson is on the classpath an `ObjectMapper`
|
||||
bean is automatically configured. Several configuration properties are provided for
|
||||
<<howto.adoc#howto-customize-the-jackson-objectmapper,customizing the configuration of the
|
||||
`ObjectMapper`>>.
|
||||
|
@ -43,7 +43,7 @@ public class WebMvcTestServletFilterRegistrationDisabledIntegrationTests {
|
||||
private MockMvc mvc;
|
||||
|
||||
@Test
|
||||
public void shouldApplyFilter() throws Exception {
|
||||
public void shouldNotApplyFilter() throws Exception {
|
||||
this.mvc.perform(get("/one")).andExpect(header().string("x-test", (String) null));
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user