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

Fix issues with DeviceDelegatingViewResolverAutoConfiguration 

- Log to the correct class
- Set Auto-configure after Thymeleaf hint on main class instead of
  internal static class
- Use 'thymeleafViewResolver' bean name instead of class for
  conditional bean checks
- Fix class name in properties documentation

Fixes gh-1052
This commit is contained in:
Roy Clarkson 2014-06-09 15:43:17 +03:00 committed by Dave Syer
parent b7d94d1364
commit 1a32a6a06b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java
View File

@ -36,7 +36,6 @@ import org.springframework.core.Ordered;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.mobile.device.view.LiteDeviceDelegatingViewResolver; import org.springframework.mobile.device.view.LiteDeviceDelegatingViewResolver;
import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.ViewResolver;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.view.InternalResourceViewResolver; import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.thymeleaf.spring4.view.ThymeleafViewResolver; import org.thymeleaf.spring4.view.ThymeleafViewResolver;
@ -52,10 +51,10 @@ import org.thymeleaf.spring4.view.ThymeleafViewResolver;
@Configuration @Configuration
@ConditionalOnWebApplication @ConditionalOnWebApplication
@ConditionalOnClass(LiteDeviceDelegatingViewResolver.class) @ConditionalOnClass(LiteDeviceDelegatingViewResolver.class)
@AutoConfigureAfter(WebMvcAutoConfiguration.class) @AutoConfigureAfter({ WebMvcAutoConfiguration.class, ThymeleafAutoConfiguration.class })
public class DeviceDelegatingViewResolverAutoConfiguration { public class DeviceDelegatingViewResolverAutoConfiguration {
private static Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class); private static Log logger = LogFactory.getLog(DeviceDelegatingViewResolverAutoConfiguration.class);
private static abstract class AbstractDelegateConfiguration implements private static abstract class AbstractDelegateConfiguration implements
EnvironmentAware { EnvironmentAware {
@ -103,8 +102,7 @@ public class DeviceDelegatingViewResolverAutoConfiguration {
protected static class DeviceDelegatingViewResolverConfiguration { protected static class DeviceDelegatingViewResolverConfiguration {
@Configuration @Configuration
@ConditionalOnBean(ThymeleafViewResolver.class) @ConditionalOnBean(name = "thymeleafViewResolver")
@AutoConfigureAfter(ThymeleafAutoConfiguration.class)
protected static class ThymeleafViewResolverViewResolverDelegateConfiguration protected static class ThymeleafViewResolverViewResolverDelegateConfiguration
extends AbstractDelegateConfiguration { extends AbstractDelegateConfiguration {
@ -124,7 +122,7 @@ public class DeviceDelegatingViewResolverAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnMissingBean(ThymeleafViewResolver.class) @ConditionalOnMissingBean(name = "thymeleafViewResolver")
@ConditionalOnBean(InternalResourceViewResolver.class) @ConditionalOnBean(InternalResourceViewResolver.class)
protected static class InternalResourceViewResolverDelegateConfiguration extends protected static class InternalResourceViewResolverDelegateConfiguration extends
AbstractDelegateConfiguration { AbstractDelegateConfiguration {

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@ -292,7 +292,7 @@ content into your application; rather pick only the properties that you need.
# SPRING MOBILE SITE PREFERENCE ({sc-spring-boot-autoconfigure}/mobile/SitePreferenceAutoConfiguration.{sc-ext}[SitePreferenceAutoConfiguration]) # SPRING MOBILE SITE PREFERENCE ({sc-spring-boot-autoconfigure}/mobile/SitePreferenceAutoConfiguration.{sc-ext}[SitePreferenceAutoConfiguration])
spring.mobile.sitepreference.enabled=true # enabled by default spring.mobile.sitepreference.enabled=true # enabled by default
# SPRING MOBILE DEVICE VIEWS ({sc-spring-boot-autoconfigure}/mobile/DevceDelegatingViewResolverAutoConfiguration.{sc-ext}[DevceDelegatingViewResolverAutoConfiguration]) # SPRING MOBILE DEVICE VIEWS ({sc-spring-boot-autoconfigure}/mobile/DeviceDelegatingViewResolverAutoConfiguration.{sc-ext}[DeviceDelegatingViewResolverAutoConfiguration])
spring.mobile.devicedelegatingviewresolver.enabled=true # disabled by default spring.mobile.devicedelegatingviewresolver.enabled=true # disabled by default
spring.mobile.devicedelegatingviewresolver.normalPrefix= spring.mobile.devicedelegatingviewresolver.normalPrefix=
spring.mobile.devicedelegatingviewresolver.normalSuffix= spring.mobile.devicedelegatingviewresolver.normalSuffix=