From 5ed49462c44d448a9e57c7a823ff64b605889803 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 3 Apr 2014 14:07:55 +0100 Subject: [PATCH] Add spring.messages.cacheSeconds to global config Fixes gh-625 --- .../boot/autoconfigure/MessageSourceAutoConfiguration.java | 2 ++ .../src/main/asciidoc/appendix-application-properties.adoc | 1 + 2 files changed, 3 insertions(+) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java index 3ed0dd3286b..c597ea02401 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfiguration.java @@ -58,6 +58,8 @@ public class MessageSourceAutoConfiguration implements EnvironmentAware { } String encoding = this.environment.getProperty("encoding", "utf-8"); messageSource.setDefaultEncoding(encoding); + messageSource.setCacheSeconds(this.environment.getProperty("cacheSeconds", + Integer.class, -1)); return messageSource; } diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 605fadb8143..c8d0d8a961d 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -81,6 +81,7 @@ content into your application; rather pick only the properties that you need. # INTERNATIONALIZATION ({sc-spring-boot-autoconfigure}/MessageSourceAutoConfiguration.{sc-ext}[MessageSourceAutoConfiguration]) spring.messages.basename=messages spring.messages.encoding=UTF-8 + spring.messages.cacheSeconds=-1 [[common-application-properties-security]] # SECURITY ({sc-spring-boot-autoconfigure}/security/SecurityProperties.{sc-ext}[SecurityProperties])