root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Use enum for MessageCodesResolver format 

Fixes gh-670
This commit is contained in:
Dave Syer 2014-04-30 15:58:46 +01:00
parent 1cbef02236
commit 537b0c3ff3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
View File

@ -31,6 +31,7 @@ import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
@ -137,7 +138,7 @@ public class WebMvcAutoConfiguration {
private Integer cachePeriod; private Integer cachePeriod;
@Value("${spring.mvc.message-codes-resolver.format:}") @Value("${spring.mvc.message-codes-resolver.format:}")
private String messageCodesResolverFormat = ""; private DefaultMessageCodesResolver.Format messageCodesResolverFormat = null;
@Value("${spring.mvc.locale:}") @Value("${spring.mvc.locale:}")
private String locale = ""; private String locale = "";
@ -204,10 +205,10 @@ public class WebMvcAutoConfiguration {
@ConditionalOnExpression("'${spring.mvc.message-codes-resolver.format:}' != ''") @ConditionalOnExpression("'${spring.mvc.message-codes-resolver.format:}' != ''")
public MessageCodesResolver messageCodesResolver() { public MessageCodesResolver messageCodesResolver() {
DefaultMessageCodesResolver resolver = new DefaultMessageCodesResolver(); DefaultMessageCodesResolver resolver = new DefaultMessageCodesResolver();
resolver.setMessageCodeFormatter(DefaultMessageCodesResolver.Format.valueOf(messageCodesResolverFormat)); resolver.setMessageCodeFormatter(this.messageCodesResolverFormat);
return resolver; return resolver;
} }
@Override @Override
public void addFormatters(FormatterRegistry registry) { public void addFormatters(FormatterRegistry registry) {
for (Converter<?, ?> converter : getBeansOfType(Converter.class)) { for (Converter<?, ?> converter : getBeansOfType(Converter.class)) {