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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2018-01-03 11:41:27 -08:00
parent 6bac365a72
commit bee5fa7fc6
24 changed files with 334 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelector.java
View File

@@ -217,10 +217,11 @@ public class AutoConfigurationImportSelector
private List<String> getExcludeAutoConfigurationsProperty() {
if (getEnvironment() instanceof ConfigurableEnvironment) {
Binder binder = Binder.get(getEnvironment());
return binder.bind(PROPERTY_NAME_AUTOCONFIGURE_EXCLUDE, String[].class).map(Arrays::asList)
.orElse(Collections.emptyList());
return binder.bind(PROPERTY_NAME_AUTOCONFIGURE_EXCLUDE, String[].class)
.map(Arrays::asList).orElse(Collections.emptyList());
}
String[] excludes = getEnvironment().getProperty(PROPERTY_NAME_AUTOCONFIGURE_EXCLUDE, String[].class);
String[] excludes = getEnvironment()
.getProperty(PROPERTY_NAME_AUTOCONFIGURE_EXCLUDE, String[].class);
return (excludes == null ? Collections.emptyList() : Arrays.asList(excludes));
}

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
View File

@@ -487,8 +487,8 @@ public class ResourceProperties {
return CacheControl.noCache();
}
if (this.maxAge != null) {
return CacheControl
.maxAge(this.maxAge.getSeconds(), TimeUnit.SECONDS);
return CacheControl.maxAge(this.maxAge.getSeconds(),
TimeUnit.SECONDS);
}
return CacheControl.empty();
}

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DefaultServletWebServerFactoryCustomizer.java
View File

@@ -390,15 +390,13 @@ public class DefaultServletWebServerFactoryCustomizer
}
private static void customizeRedirectContextRoot(
TomcatServletWebServerFactory factory,
boolean redirectContextRoot) {
TomcatServletWebServerFactory factory, boolean redirectContextRoot) {
factory.addContextCustomizers((context) -> context
.setMapperContextRootRedirectEnabled(redirectContextRoot));
}
private static void customizeUseRelativeRedirects(
TomcatServletWebServerFactory factory,
boolean useRelativeRedirects) {
TomcatServletWebServerFactory factory, boolean useRelativeRedirects) {
factory.addContextCustomizers(
(context) -> context.setUseRelativeRedirects(useRelativeRedirects));
}

7
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMapping.java
View File

@@ -36,8 +36,8 @@ import org.springframework.web.servlet.mvc.ParameterizableViewController;
/**
* An {@link AbstractUrlHandlerMapping} for an application's welcome page. Supports both
* static and templated files. If both a static and templated index page are available, the
* static page is preferred.
* static and templated files. If both a static and templated index page are available,
* the static page is preferred.
*
* @author Andy Wilkinson
* @author Bruce Brouwer
@@ -46,7 +46,8 @@ final class WelcomePageHandlerMapping extends AbstractUrlHandlerMapping {
private static final Log logger = LogFactory.getLog(WelcomePageHandlerMapping.class);
private static final List<MediaType> MEDIA_TYPES_ALL = Collections.singletonList(MediaType.ALL);
private static final List<MediaType> MEDIA_TYPES_ALL = Collections
.singletonList(MediaType.ALL);
WelcomePageHandlerMapping(TemplateAvailabilityProviders templateAvailabilityProviders,
ApplicationContext applicationContext, Optional<Resource> welcomePage,

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/web/SpringDataWebAutoConfigurationTests.java
View File

@@ -106,7 +106,8 @@ public class SpringDataWebAutoConfigurationTests {
load();
PageableHandlerMethodArgumentResolver argumentResolver = this.context
.getBean(PageableHandlerMethodArgumentResolver.class);
SpringDataWebProperties.Pageable properties = new SpringDataWebProperties().getPageable();
SpringDataWebProperties.Pageable properties = new SpringDataWebProperties()
.getPageable();
assertThat(ReflectionTestUtils.getField(argumentResolver, "pageParameterName"))
.isEqualTo(properties.getPageParameter());
assertThat(ReflectionTestUtils.getField(argumentResolver, "sizeParameterName"))

52
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationReactiveIntegrationTests.java
View File

@@ -69,46 +69,53 @@ public class FreeMarkerAutoConfigurationReactiveIntegrationTests {
@Test
public void customPrefix() {
this.contextRunner.withPropertyValues("spring.freemarker.prefix:prefix/").run(context -> {
MockServerWebExchange exchange = render(context, "prefixed");
String result = exchange.getResponse().getBodyAsString().block();
assertThat(result).contains("prefixed");
});
this.contextRunner.withPropertyValues("spring.freemarker.prefix:prefix/")
.run(context -> {
MockServerWebExchange exchange = render(context, "prefixed");
String result = exchange.getResponse().getBodyAsString().block();
assertThat(result).contains("prefixed");
});
}
@Test
public void customSuffix() {
this.contextRunner.withPropertyValues("spring.freemarker.suffix:.freemarker").run(context -> {
MockServerWebExchange exchange = render(context, "suffixed");
String result = exchange.getResponse().getBodyAsString().block();
assertThat(result).contains("suffixed");
});
this.contextRunner.withPropertyValues("spring.freemarker.suffix:.freemarker")
.run(context -> {
MockServerWebExchange exchange = render(context, "suffixed");
String result = exchange.getResponse().getBodyAsString().block();
assertThat(result).contains("suffixed");
});
}
@Test
public void customTemplateLoaderPath() {
this.contextRunner.withPropertyValues("spring.freemarker.templateLoaderPath:classpath:/custom-templates/").run(context -> {
MockServerWebExchange exchange = render(context, "custom");
String result = exchange.getResponse().getBodyAsString().block();
assertThat(result).contains("custom");
});
this.contextRunner
.withPropertyValues(
"spring.freemarker.templateLoaderPath:classpath:/custom-templates/")
.run(context -> {
MockServerWebExchange exchange = render(context, "custom");
String result = exchange.getResponse().getBodyAsString().block();
assertThat(result).contains("custom");
});
}
@SuppressWarnings("deprecation")
@Test
public void customFreeMarkerSettings() {
this.contextRunner.withPropertyValues("spring.freemarker.settings.boolean_format:yup,nope")
.run(context -> assertThat(context.getBean(FreeMarkerConfigurer.class).getConfiguration()
.getSetting("boolean_format")).isEqualTo("yup,nope"));
this.contextRunner
.withPropertyValues("spring.freemarker.settings.boolean_format:yup,nope")
.run(context -> assertThat(context.getBean(FreeMarkerConfigurer.class)
.getConfiguration().getSetting("boolean_format"))
.isEqualTo("yup,nope"));
}
@Test
public void renderTemplate() {
this.contextRunner.withPropertyValues().run(context -> {
FreeMarkerConfigurer freemarker = context
.getBean(FreeMarkerConfigurer.class);
FreeMarkerConfigurer freemarker = context.getBean(FreeMarkerConfigurer.class);
StringWriter writer = new StringWriter();
freemarker.getConfiguration().getTemplate("message.ftl").process(this, writer);
freemarker.getConfiguration().getTemplate("message.ftl").process(this,
writer);
assertThat(writer.toString()).contains("Hello World");
});
}
@@ -118,8 +125,7 @@ public class FreeMarkerAutoConfigurationReactiveIntegrationTests {
}
private MockServerWebExchange render(ApplicationContext context, String viewName) {
FreeMarkerViewResolver resolver = context
.getBean(FreeMarkerViewResolver.class);
FreeMarkerViewResolver resolver = context.getBean(FreeMarkerViewResolver.class);
Mono<View> view = resolver.resolveViewName(viewName, Locale.UK);
MockServerWebExchange exchange = MockServerWebExchange
.from(MockServerHttpRequest.get("/path"));

18
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java
View File

@@ -60,9 +60,11 @@ public class FreeMarkerAutoConfigurationTests {
@Test
public void nonExistentTemplateLocation() {
this.contextRunner.withPropertyValues("spring.freemarker.templateLoaderPath:"
+ "classpath:/does-not-exist/,classpath:/also-does-not-exist")
.run(context -> this.output.expect(containsString("Cannot find template location")));
this.contextRunner
.withPropertyValues("spring.freemarker.templateLoaderPath:"
+ "classpath:/does-not-exist/,classpath:/also-does-not-exist")
.run(context -> this.output
.expect(containsString("Cannot find template location")));
}
@Test
@@ -70,15 +72,17 @@ public class FreeMarkerAutoConfigurationTests {
new File("target/test-classes/templates/empty-directory").mkdir();
this.contextRunner.withPropertyValues("spring.freemarker.templateLoaderPath:"
+ "classpath:/templates/empty-directory/").run(context -> {
});
});
}
@Test
public void nonExistentLocationAndEmptyLocation() {
new File("target/test-classes/templates/empty-directory").mkdir();
this.contextRunner.withPropertyValues("spring.freemarker.templateLoaderPath:"
+ "classpath:/does-not-exist/,classpath:/templates/empty-directory/").run(context -> {
});
this.contextRunner
.withPropertyValues("spring.freemarker.templateLoaderPath:"
+ "classpath:/does-not-exist/,classpath:/templates/empty-directory/")
.run(context -> {
});
}
}

293
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
View File

@@ -90,11 +90,14 @@ public class JacksonAutoConfigurationTests {
@Test
public void doubleModuleRegistration() {
this.contextRunner.withUserConfiguration(DoubleModulesConfig.class).withConfiguration(AutoConfigurations.of(
HttpMessageConvertersAutoConfiguration.class)).run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(mapper.writeValueAsString(new Foo())).isEqualTo("{\"foo\":\"bar\"}");
});
this.contextRunner.withUserConfiguration(DoubleModulesConfig.class)
.withConfiguration(AutoConfigurations
.of(HttpMessageConvertersAutoConfiguration.class))
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(mapper.writeValueAsString(new Foo()))
.isEqualTo("{\"foo\":\"bar\"}");
});
}
/*
@@ -113,34 +116,42 @@ public class JacksonAutoConfigurationTests {
@Test
public void customDateFormat() {
this.contextRunner.withPropertyValues("spring.jackson.date-format:yyyyMMddHHmmss").run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
DateFormat dateFormat = mapper.getDateFormat();
assertThat(dateFormat).isInstanceOf(SimpleDateFormat.class);
assertThat(((SimpleDateFormat) dateFormat).toPattern())
.isEqualTo("yyyyMMddHHmmss");
});
this.contextRunner.withPropertyValues("spring.jackson.date-format:yyyyMMddHHmmss")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
DateFormat dateFormat = mapper.getDateFormat();
assertThat(dateFormat).isInstanceOf(SimpleDateFormat.class);
assertThat(((SimpleDateFormat) dateFormat).toPattern())
.isEqualTo("yyyyMMddHHmmss");
});
}
@Test
public void customJodaDateTimeFormat() throws Exception {
this.contextRunner.withPropertyValues("spring.jackson.date-format:yyyyMMddHHmmss",
"spring.jackson.joda-date-time-format:yyyy-MM-dd HH:mm:ss").run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
DateTime dateTime = new DateTime(1988, 6, 25, 20, 30, DateTimeZone.UTC);
assertThat(mapper.writeValueAsString(dateTime))
.isEqualTo("\"1988-06-25 20:30:00\"");
Date date = dateTime.toDate();
assertThat(mapper.writeValueAsString(date)).isEqualTo("\"19880625203000\"");
});
this.contextRunner
.withPropertyValues("spring.jackson.date-format:yyyyMMddHHmmss",
"spring.jackson.joda-date-time-format:yyyy-MM-dd HH:mm:ss")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
DateTime dateTime = new DateTime(1988, 6, 25, 20, 30,
DateTimeZone.UTC);
assertThat(mapper.writeValueAsString(dateTime))
.isEqualTo("\"1988-06-25 20:30:00\"");
Date date = dateTime.toDate();
assertThat(mapper.writeValueAsString(date))
.isEqualTo("\"19880625203000\"");
});
}
@Test
public void customDateFormatClass() {
this.contextRunner.withPropertyValues("spring.jackson.date-format:org.springframework.boot.autoconfigure.jackson.JacksonAutoConfigurationTests.MyDateFormat").run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(mapper.getDateFormat()).isInstanceOf(MyDateFormat.class);
});
this.contextRunner
.withPropertyValues(
"spring.jackson.date-format:org.springframework.boot.autoconfigure.jackson.JacksonAutoConfigurationTests.MyDateFormat")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(mapper.getDateFormat()).isInstanceOf(MyDateFormat.class);
});
}
@Test
@@ -153,16 +164,20 @@ public class JacksonAutoConfigurationTests {
@Test
public void customPropertyNamingStrategyField() {
this.contextRunner.withPropertyValues("spring.jackson.property-naming-strategy:SNAKE_CASE").run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(mapper.getPropertyNamingStrategy())
.isInstanceOf(SnakeCaseStrategy.class);
});
this.contextRunner
.withPropertyValues("spring.jackson.property-naming-strategy:SNAKE_CASE")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(mapper.getPropertyNamingStrategy())
.isInstanceOf(SnakeCaseStrategy.class);
});
}
@Test
public void customPropertyNamingStrategyClass() {
this.contextRunner.withPropertyValues("spring.jackson.property-naming-strategy:com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy")
this.contextRunner
.withPropertyValues(
"spring.jackson.property-naming-strategy:com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(mapper.getPropertyNamingStrategy())
@@ -172,123 +187,151 @@ public class JacksonAutoConfigurationTests {
@Test
public void enableSerializationFeature() {
this.contextRunner.withPropertyValues("spring.jackson.serialization.indent_output:true")
this.contextRunner
.withPropertyValues("spring.jackson.serialization.indent_output:true")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(SerializationFeature.INDENT_OUTPUT.enabledByDefault()).isFalse();
assertThat(mapper.getSerializationConfig()
.hasSerializationFeatures(SerializationFeature.INDENT_OUTPUT.getMask()))
.isTrue();
assertThat(SerializationFeature.INDENT_OUTPUT.enabledByDefault())
.isFalse();
assertThat(mapper.getSerializationConfig().hasSerializationFeatures(
SerializationFeature.INDENT_OUTPUT.getMask())).isTrue();
});
}
@Test
public void disableSerializationFeature() {
this.contextRunner.withPropertyValues("spring.jackson.serialization.write_dates_as_timestamps:false")
this.contextRunner
.withPropertyValues(
"spring.jackson.serialization.write_dates_as_timestamps:false")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS.enabledByDefault())
.isTrue();
assertThat(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS
.enabledByDefault()).isTrue();
assertThat(mapper.getSerializationConfig().hasSerializationFeatures(
SerializationFeature.WRITE_DATES_AS_TIMESTAMPS.getMask())).isFalse();
SerializationFeature.WRITE_DATES_AS_TIMESTAMPS.getMask()))
.isFalse();
});
}
@Test
public void enableDeserializationFeature() {
this.contextRunner.withPropertyValues("spring.jackson.deserialization.use_big_decimal_for_floats:true")
this.contextRunner
.withPropertyValues(
"spring.jackson.deserialization.use_big_decimal_for_floats:true")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS.enabledByDefault())
.isFalse();
assertThat(mapper.getDeserializationConfig().hasDeserializationFeatures(
DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS.getMask())).isTrue();
assertThat(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS
.enabledByDefault()).isFalse();
assertThat(
mapper.getDeserializationConfig().hasDeserializationFeatures(
DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS
.getMask())).isTrue();
});
}
@Test
public void disableDeserializationFeature() {
this.contextRunner.withPropertyValues("spring.jackson.deserialization.fail-on-unknown-properties:false")
this.contextRunner
.withPropertyValues(
"spring.jackson.deserialization.fail-on-unknown-properties:false")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES.enabledByDefault())
.isTrue();
assertThat(mapper.getDeserializationConfig().hasDeserializationFeatures(
DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES.getMask())).isFalse();
assertThat(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES
.enabledByDefault()).isTrue();
assertThat(
mapper.getDeserializationConfig().hasDeserializationFeatures(
DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES
.getMask())).isFalse();
});
}
@Test
public void enableMapperFeature() {
this.contextRunner.withPropertyValues("spring.jackson.mapper.require_setters_for_getters:true")
this.contextRunner
.withPropertyValues(
"spring.jackson.mapper.require_setters_for_getters:true")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(MapperFeature.REQUIRE_SETTERS_FOR_GETTERS.enabledByDefault())
.isFalse();
assertThat(mapper.getSerializationConfig()
.hasMapperFeatures(MapperFeature.REQUIRE_SETTERS_FOR_GETTERS.getMask()))
.isTrue();
assertThat(mapper.getDeserializationConfig()
.hasMapperFeatures(MapperFeature.REQUIRE_SETTERS_FOR_GETTERS.getMask()))
.isTrue();
assertThat(
MapperFeature.REQUIRE_SETTERS_FOR_GETTERS.enabledByDefault())
.isFalse();
assertThat(mapper.getSerializationConfig().hasMapperFeatures(
MapperFeature.REQUIRE_SETTERS_FOR_GETTERS.getMask()))
.isTrue();
assertThat(mapper.getDeserializationConfig().hasMapperFeatures(
MapperFeature.REQUIRE_SETTERS_FOR_GETTERS.getMask()))
.isTrue();
});
}
@Test
public void disableMapperFeature() {
this.contextRunner.withPropertyValues("spring.jackson.mapper.use_annotations:false")
this.contextRunner
.withPropertyValues("spring.jackson.mapper.use_annotations:false")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(MapperFeature.USE_ANNOTATIONS.enabledByDefault()).isTrue();
assertThat(mapper.getDeserializationConfig()
.hasMapperFeatures(MapperFeature.USE_ANNOTATIONS.getMask())).isFalse();
.hasMapperFeatures(MapperFeature.USE_ANNOTATIONS.getMask()))
.isFalse();
assertThat(mapper.getSerializationConfig()
.hasMapperFeatures(MapperFeature.USE_ANNOTATIONS.getMask())).isFalse();
.hasMapperFeatures(MapperFeature.USE_ANNOTATIONS.getMask()))
.isFalse();
});
}
@Test
public void enableParserFeature() {
this.contextRunner.withPropertyValues("spring.jackson.parser.allow_single_quotes:true")
this.contextRunner
.withPropertyValues("spring.jackson.parser.allow_single_quotes:true")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(JsonParser.Feature.ALLOW_SINGLE_QUOTES.enabledByDefault()).isFalse();
assertThat(mapper.getFactory().isEnabled(JsonParser.Feature.ALLOW_SINGLE_QUOTES))
.isTrue();
assertThat(JsonParser.Feature.ALLOW_SINGLE_QUOTES.enabledByDefault())
.isFalse();
assertThat(mapper.getFactory()
.isEnabled(JsonParser.Feature.ALLOW_SINGLE_QUOTES)).isTrue();
});
}
@Test
public void disableParserFeature() {
this.contextRunner.withPropertyValues("spring.jackson.parser.auto_close_source:false")
this.contextRunner
.withPropertyValues("spring.jackson.parser.auto_close_source:false")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(JsonParser.Feature.AUTO_CLOSE_SOURCE.enabledByDefault()).isTrue();
assertThat(mapper.getFactory().isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE))
.isFalse();
assertThat(JsonParser.Feature.AUTO_CLOSE_SOURCE.enabledByDefault())
.isTrue();
assertThat(mapper.getFactory()
.isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE)).isFalse();
});
}
@Test
public void enableGeneratorFeature() {
this.contextRunner.withPropertyValues("spring.jackson.generator.write_numbers_as_strings:true")
this.contextRunner
.withPropertyValues(
"spring.jackson.generator.write_numbers_as_strings:true")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS.enabledByDefault())
.isFalse();
assertThat(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS
.enabledByDefault()).isFalse();
assertThat(mapper.getFactory()
.isEnabled(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS)).isTrue();
.isEnabled(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS))
.isTrue();
});
}
@Test
public void disableGeneratorFeature() {
this.contextRunner.withPropertyValues("spring.jackson.generator.auto_close_target:false")
this.contextRunner
.withPropertyValues("spring.jackson.generator.auto_close_target:false")
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(JsonGenerator.Feature.AUTO_CLOSE_TARGET.enabledByDefault()).isTrue();
assertThat(mapper.getFactory().isEnabled(JsonGenerator.Feature.AUTO_CLOSE_TARGET))
.isFalse();
assertThat(JsonGenerator.Feature.AUTO_CLOSE_TARGET.enabledByDefault())
.isTrue();
assertThat(mapper.getFactory()
.isEnabled(JsonGenerator.Feature.AUTO_CLOSE_TARGET))
.isFalse();
});
}
@@ -306,18 +349,20 @@ public class JacksonAutoConfigurationTests {
.isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)).isFalse();
assertThat(mapper.getSerializationConfig()
.isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)).isFalse();
assertThat(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES.enabledByDefault())
.isTrue();
assertThat(
DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES.enabledByDefault())
.isTrue();
assertThat(mapper.getDeserializationConfig()
.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)).isFalse();
.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES))
.isFalse();
});
}
@Test
public void moduleBeansAndWellKnownModulesAreRegisteredWithTheObjectMapperBuilder() {
this.contextRunner.withUserConfiguration(ModuleConfig.class).run(context -> {
ObjectMapper objectMapper = context
.getBean(Jackson2ObjectMapperBuilder.class).build();
ObjectMapper objectMapper = context.getBean(Jackson2ObjectMapperBuilder.class)
.build();
assertThat(context.getBean(CustomModule.class).getOwners())
.contains((ObjectCodec) objectMapper);
assertThat(objectMapper.canSerialize(LocalDateTime.class)).isTrue();
@@ -328,8 +373,8 @@ public class JacksonAutoConfigurationTests {
@Test
public void defaultSerializationInclusion() {
this.contextRunner.run(context -> {
ObjectMapper objectMapper = context
.getBean(Jackson2ObjectMapperBuilder.class).build();
ObjectMapper objectMapper = context.getBean(Jackson2ObjectMapperBuilder.class)
.build();
assertThat(objectMapper.getSerializationConfig().getDefaultPropertyInclusion()
.getValueInclusion()).isEqualTo(JsonInclude.Include.USE_DEFAULTS);
});
@@ -337,56 +382,65 @@ public class JacksonAutoConfigurationTests {
@Test
public void customSerializationInclusion() {
this.contextRunner.withPropertyValues("spring.jackson.default-property-inclusion:non_null")
this.contextRunner
.withPropertyValues("spring.jackson.default-property-inclusion:non_null")
.run(context -> {
ObjectMapper objectMapper = context
.getBean(Jackson2ObjectMapperBuilder.class).build();
assertThat(objectMapper.getSerializationConfig().getDefaultPropertyInclusion()
.getValueInclusion()).isEqualTo(JsonInclude.Include.NON_NULL);
assertThat(objectMapper.getSerializationConfig()
.getDefaultPropertyInclusion().getValueInclusion())
.isEqualTo(JsonInclude.Include.NON_NULL);
});
}
@Test
public void customTimeZoneFormattingADateTime() {
this.contextRunner.withPropertyValues("spring.jackson.time-zone:America/Los_Angeles",
"spring.jackson.date-format:zzzz", "spring.jackson.locale:en").run(context -> {
ObjectMapper objectMapper = context
.getBean(Jackson2ObjectMapperBuilder.class).build();
DateTime dateTime = new DateTime(1436966242231L, DateTimeZone.UTC);
assertThat(objectMapper.writeValueAsString(dateTime))
.isEqualTo("\"Pacific Daylight Time\"");
});
this.contextRunner
.withPropertyValues("spring.jackson.time-zone:America/Los_Angeles",
"spring.jackson.date-format:zzzz", "spring.jackson.locale:en")
.run(context -> {
ObjectMapper objectMapper = context
.getBean(Jackson2ObjectMapperBuilder.class).build();
DateTime dateTime = new DateTime(1436966242231L, DateTimeZone.UTC);
assertThat(objectMapper.writeValueAsString(dateTime))
.isEqualTo("\"Pacific Daylight Time\"");
});
}
@Test
public void customTimeZoneFormattingADate() throws JsonProcessingException {
this.contextRunner.withPropertyValues("spring.jackson.time-zone:GMT+10",
"spring.jackson.date-format:z").run(context -> {
ObjectMapper objectMapper = context
.getBean(Jackson2ObjectMapperBuilder.class).build();
Date date = new Date(1436966242231L);
assertThat(objectMapper.writeValueAsString(date)).isEqualTo("\"GMT+10:00\"");
});
ObjectMapper objectMapper = context
.getBean(Jackson2ObjectMapperBuilder.class).build();
Date date = new Date(1436966242231L);
assertThat(objectMapper.writeValueAsString(date))
.isEqualTo("\"GMT+10:00\"");
});
}
@Test
public void customLocaleWithJodaTime() throws JsonProcessingException {
this.contextRunner.withPropertyValues("spring.jackson.locale:de_DE", "spring.jackson.date-format:zzzz",
"spring.jackson.serialization.write-dates-with-zone-id:true").run(context -> {
ObjectMapper objectMapper = context.getBean(ObjectMapper.class);
DateTime jodaTime = new DateTime(1478424650000L,
DateTimeZone.forID("Europe/Rome"));
assertThat(objectMapper.writeValueAsString(jodaTime))
.startsWith("\"Mitteleuropäische ");
});
this.contextRunner
.withPropertyValues("spring.jackson.locale:de_DE",
"spring.jackson.date-format:zzzz",
"spring.jackson.serialization.write-dates-with-zone-id:true")
.run(context -> {
ObjectMapper objectMapper = context.getBean(ObjectMapper.class);
DateTime jodaTime = new DateTime(1478424650000L,
DateTimeZone.forID("Europe/Rome"));
assertThat(objectMapper.writeValueAsString(jodaTime))
.startsWith("\"Mitteleuropäische ");
});
}
@Test
public void additionalJacksonBuilderCustomization() {
this.contextRunner.withUserConfiguration(ObjectMapperBuilderCustomConfig.class).run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(mapper.getDateFormat()).isInstanceOf(MyDateFormat.class);
});
this.contextRunner.withUserConfiguration(ObjectMapperBuilderCustomConfig.class)
.run(context -> {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
assertThat(mapper.getDateFormat()).isInstanceOf(MyDateFormat.class);
});
}
@Test
@@ -407,9 +461,9 @@ public class JacksonAutoConfigurationTests {
ObjectMapper mapper = context.getBean(ObjectMapper.class);
DateTime dateTime = new DateTime(1988, 6, 25, 20, 30, DateTimeZone.UTC);
String expected = FormatConfig.DEFAULT_DATETIME_PRINTER.rawFormatter()
.withZone(DateTimeZone.UTC)
.print(dateTime);
assertThat(mapper.writeValueAsString(dateTime)).isEqualTo("\"" + expected + "\"");
.withZone(DateTimeZone.UTC).print(dateTime);
assertThat(mapper.writeValueAsString(dateTime))
.isEqualTo("\"" + expected + "\"");
});
}
@@ -420,8 +474,8 @@ public class JacksonAutoConfigurationTests {
.getBean(ObjectMapper.class).getDeserializationConfig();
AnnotationIntrospector annotationIntrospector = deserializationConfig
.getAnnotationIntrospector().allIntrospectors().iterator().next();
assertThat(ReflectionTestUtils.getField(annotationIntrospector, "creatorBinding"))
.isEqualTo(expectedMode);
assertThat(ReflectionTestUtils.getField(annotationIntrospector,
"creatorBinding")).isEqualTo(expectedMode);
});
}
@@ -465,8 +519,7 @@ public class JacksonAutoConfigurationTests {
@Override
public void serialize(Foo value, JsonGenerator jgen,
SerializerProvider provider)
throws IOException {
SerializerProvider provider) throws IOException {
jgen.writeStartObject();
jgen.writeStringField("foo", "bar");
jgen.writeEndObject();

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java
View File

@@ -74,8 +74,8 @@ public class ResourcePropertiesTests {
@Test
public void emptyCacheControl() {
CacheControl cacheControl = this.properties.getCache()
.getCachecontrol().toHttpCacheControl();
CacheControl cacheControl = this.properties.getCache().getCachecontrol()
.toHttpCacheControl();
assertThat(cacheControl.getHeaderValue()).isNull();
}