From e81e94924c12f9c894c132ad63a9b7b854d3bc91 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sat, 7 Jun 2014 08:54:40 +0100 Subject: [PATCH] Fix Devc->Devic (Leaving the docs changes for later) Fixes gh-1049 --- ...egatingViewResolverAutoConfiguration.java} | 4 +-- .../main/resources/META-INF/spring.factories | 2 +- ...ingViewResolverAutoConfigurationTests.java | 28 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) rename spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/{DevceDelegatingViewResolverAutoConfiguration.java => DeviceDelegatingViewResolverAutoConfiguration.java} (97%) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DevceDelegatingViewResolverAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java similarity index 97% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DevceDelegatingViewResolverAutoConfiguration.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java index 2d14e93d4c1..53abe1bb15b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DevceDelegatingViewResolverAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java @@ -53,7 +53,7 @@ import org.thymeleaf.spring4.view.ThymeleafViewResolver; @ConditionalOnWebApplication @ConditionalOnClass(LiteDeviceDelegatingViewResolver.class) @AutoConfigureAfter(WebMvcAutoConfiguration.class) -public class DevceDelegatingViewResolverAutoConfiguration { +public class DeviceDelegatingViewResolverAutoConfiguration { private static Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class); @@ -72,7 +72,7 @@ public class DevceDelegatingViewResolverAutoConfiguration { @Configuration @ConditionalOnMissingBean(name = "deviceDelegatingViewResolver") @ConditionalOnExpression("${spring.mobile.deviceDelegatingViewResolver.enabled:false}") - protected static class DevceDelegatingViewResolverConfiguration { + protected static class DeviceDelegatingViewResolverConfiguration { @Configuration @ConditionalOnBean(ThymeleafViewResolver.class) diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index c54471761b5..8516090b8f0 100644 --- a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -29,7 +29,7 @@ org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration,\ org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration,\ org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration,\ 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.mongo.MongoAutoConfiguration,\ org.springframework.boot.autoconfigure.mongo.MongoDataAutoConfiguration,\ diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java index 252681ca1f0..f6a3429a9e4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java @@ -26,7 +26,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; 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.web.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; @@ -44,7 +44,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver; import org.thymeleaf.spring4.view.ThymeleafViewResolver; /** - * Tests for {@link DevceDelegatingViewResolverAutoConfiguration}. + * Tests for {@link DeviceDelegatingViewResolverAutoConfiguration}. * * @author Roy Clarkson */ @@ -65,7 +65,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { public void deviceDelegatingViewResolverDefaultDisabled() throws Exception { this.context = new AnnotationConfigEmbeddedWebApplicationContext(); this.context.register(Config.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); this.context.getBean("deviceDelegatingViewResolver", AbstractDeviceDelegatingViewResolver.class); @@ -79,7 +79,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { this.context.register(Config.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); InternalResourceViewResolver internalResourceViewResolver = this.context.getBean(InternalResourceViewResolver.class); AbstractDeviceDelegatingViewResolver deviceDelegatingViewResolver = this.context.getBean( @@ -104,7 +104,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { this.context.register(Config.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); assertNotNull(this.context.getBean(InternalResourceViewResolver.class)); try { @@ -125,7 +125,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { ThymeleafAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); ThymeleafViewResolver thymeleafViewResolver = this.context.getBean(ThymeleafViewResolver.class); AbstractDeviceDelegatingViewResolver deviceDelegatingViewResolver = this.context.getBean( @@ -148,7 +148,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { ThymeleafAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); assertNotNull(this.context.getBean(InternalResourceViewResolver.class)); assertNotNull(this.context.getBean(ThymeleafViewResolver.class)); @@ -164,7 +164,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { this.context.register(Config.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); @@ -221,7 +221,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { this.context.register(Config.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); @@ -242,7 +242,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { this.context.register(Config.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); @@ -263,7 +263,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { this.context.register(Config.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); @@ -284,7 +284,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { this.context.register(Config.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); @@ -305,7 +305,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { this.context.register(Config.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class); @@ -326,7 +326,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { this.context.register(Config.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - DevceDelegatingViewResolverConfiguration.class); + DeviceDelegatingViewResolverConfiguration.class); this.context.refresh(); LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean( "deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);