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 Devc->Devic 

(Leaving the docs changes for later)

Fixes gh-1049
This commit is contained in:
Dave Syer 2014-06-07 08:54:40 +01:00
parent 918536ae79
commit e81e94924c
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DevceDelegatingViewResolverAutoConfiguration.java → spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java
View File

@ -53,7 +53,7 @@ import org.thymeleaf.spring4.view.ThymeleafViewResolver;
@ConditionalOnWebApplication @ConditionalOnWebApplication
@ConditionalOnClass(LiteDeviceDelegatingViewResolver.class) @ConditionalOnClass(LiteDeviceDelegatingViewResolver.class)
@AutoConfigureAfter(WebMvcAutoConfiguration.class) @AutoConfigureAfter(WebMvcAutoConfiguration.class)
public class DevceDelegatingViewResolverAutoConfiguration { public class DeviceDelegatingViewResolverAutoConfiguration {
private static Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class); private static Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class);
@ -72,7 +72,7 @@ public class DevceDelegatingViewResolverAutoConfiguration {
@Configuration @Configuration
@ConditionalOnMissingBean(name = "deviceDelegatingViewResolver") @ConditionalOnMissingBean(name = "deviceDelegatingViewResolver")
@ConditionalOnExpression("${spring.mobile.deviceDelegatingViewResolver.enabled:false}") @ConditionalOnExpression("${spring.mobile.deviceDelegatingViewResolver.enabled:false}")
protected static class DevceDelegatingViewResolverConfiguration { protected static class DeviceDelegatingViewResolverConfiguration {
@Configuration @Configuration
@ConditionalOnBean(ThymeleafViewResolver.class) @ConditionalOnBean(ThymeleafViewResolver.class)

2
spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
View File

@ -29,7 +29,7 @@ org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration,\
org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration,\ org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration,\
org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration,\ org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration,\
org.springframework.boot.autoconfigure.mobile.DeviceResolverAutoConfiguration,\ org.springframework.boot.autoconfigure.mobile.DeviceResolverAutoConfiguration,\
org.springframework.boot.autoconfigure.mobile.DevceDelegatingViewResolverAutoConfiguration,\ org.springframework.boot.autoconfigure.mobile.DeviceDelegatingViewResolverAutoConfiguration,\
org.springframework.boot.autoconfigure.mobile.SitePreferenceAutoConfiguration,\ org.springframework.boot.autoconfigure.mobile.SitePreferenceAutoConfiguration,\
org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration,\ org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration,\
org.springframework.boot.autoconfigure.mongo.MongoDataAutoConfiguration,\ org.springframework.boot.autoconfigure.mongo.MongoDataAutoConfiguration,\

28
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java
View File

@ -26,7 +26,7 @@ import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.autoconfigure.mobile.DevceDelegatingViewResolverAutoConfiguration.DevceDelegatingViewResolverConfiguration; import org.springframework.boot.autoconfigure.mobile.DeviceDelegatingViewResolverAutoConfiguration.DeviceDelegatingViewResolverConfiguration;
import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration; import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration;
import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
@ -44,7 +44,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.thymeleaf.spring4.view.ThymeleafViewResolver; import org.thymeleaf.spring4.view.ThymeleafViewResolver;
/** /**
* Tests for {@link DevceDelegatingViewResolverAutoConfiguration}. * Tests for {@link DeviceDelegatingViewResolverAutoConfiguration}.
* *
* @author Roy Clarkson * @author Roy Clarkson
*/ */
@ -65,7 +65,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
public void deviceDelegatingViewResolverDefaultDisabled() throws Exception { public void deviceDelegatingViewResolverDefaultDisabled() throws Exception {
this.context = new AnnotationConfigEmbeddedWebApplicationContext(); this.context = new AnnotationConfigEmbeddedWebApplicationContext();
this.context.register(Config.class, this.context.register(Config.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
this.context.getBean("deviceDelegatingViewResolver", this.context.getBean("deviceDelegatingViewResolver",
AbstractDeviceDelegatingViewResolver.class); AbstractDeviceDelegatingViewResolver.class);
@ -79,7 +79,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
this.context.register(Config.class, WebMvcAutoConfiguration.class, this.context.register(Config.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
InternalResourceViewResolver internalResourceViewResolver = this.context.getBean(InternalResourceViewResolver.class); InternalResourceViewResolver internalResourceViewResolver = this.context.getBean(InternalResourceViewResolver.class);
AbstractDeviceDelegatingViewResolver deviceDelegatingViewResolver = this.context.getBean( AbstractDeviceDelegatingViewResolver deviceDelegatingViewResolver = this.context.getBean(
@ -104,7 +104,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
this.context.register(Config.class, WebMvcAutoConfiguration.class, this.context.register(Config.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
assertNotNull(this.context.getBean(InternalResourceViewResolver.class)); assertNotNull(this.context.getBean(InternalResourceViewResolver.class));
try { try {
@ -125,7 +125,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
ThymeleafAutoConfiguration.class, ThymeleafAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
ThymeleafViewResolver thymeleafViewResolver = this.context.getBean(ThymeleafViewResolver.class); ThymeleafViewResolver thymeleafViewResolver = this.context.getBean(ThymeleafViewResolver.class);
AbstractDeviceDelegatingViewResolver deviceDelegatingViewResolver = this.context.getBean( AbstractDeviceDelegatingViewResolver deviceDelegatingViewResolver = this.context.getBean(
@ -148,7 +148,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
ThymeleafAutoConfiguration.class, ThymeleafAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
assertNotNull(this.context.getBean(InternalResourceViewResolver.class)); assertNotNull(this.context.getBean(InternalResourceViewResolver.class));
assertNotNull(this.context.getBean(ThymeleafViewResolver.class)); assertNotNull(this.context.getBean(ThymeleafViewResolver.class));
@ -164,7 +164,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
this.context.register(Config.class, WebMvcAutoConfiguration.class, this.context.register(Config.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@ -221,7 +221,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
this.context.register(Config.class, WebMvcAutoConfiguration.class, this.context.register(Config.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@ -242,7 +242,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
this.context.register(Config.class, WebMvcAutoConfiguration.class, this.context.register(Config.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@ -263,7 +263,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
this.context.register(Config.class, WebMvcAutoConfiguration.class, this.context.register(Config.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@ -284,7 +284,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
this.context.register(Config.class, WebMvcAutoConfiguration.class, this.context.register(Config.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@ -305,7 +305,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
this.context.register(Config.class, WebMvcAutoConfiguration.class, this.context.register(Config.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@ -326,7 +326,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
this.context.register(Config.class, WebMvcAutoConfiguration.class, this.context.register(Config.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class,
DevceDelegatingViewResolverConfiguration.class); DeviceDelegatingViewResolverConfiguration.class);
this.context.refresh(); this.context.refresh();
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);