Skip to content

Commit e81e949

Browse files
author
Dave Syer
committed
Fix Devc->Devic
(Leaving the docs changes for later) Fixes gh-1049
1 parent 918536a commit e81e949

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DevceDelegatingViewResolverAutoConfiguration.java renamed to ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
@ConditionalOnWebApplication
5454
@ConditionalOnClass(LiteDeviceDelegatingViewResolver.class)
5555
@AutoConfigureAfter(WebMvcAutoConfiguration.class)
56-
public class DevceDelegatingViewResolverAutoConfiguration {
56+
public class DeviceDelegatingViewResolverAutoConfiguration {
5757

5858
private static Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class);
5959

@@ -72,7 +72,7 @@ public class DevceDelegatingViewResolverAutoConfiguration {
7272
@Configuration
7373
@ConditionalOnMissingBean(name = "deviceDelegatingViewResolver")
7474
@ConditionalOnExpression("${spring.mobile.deviceDelegatingViewResolver.enabled:false}")
75-
protected static class DevceDelegatingViewResolverConfiguration {
75+
protected static class DeviceDelegatingViewResolverConfiguration {
7676

7777
@Configuration
7878
@ConditionalOnBean(ThymeleafViewResolver.class)

‎spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration,\
2929
org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration,\
3030
org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration,\
3131
org.springframework.boot.autoconfigure.mobile.DeviceResolverAutoConfiguration,\
32-
org.springframework.boot.autoconfigure.mobile.DevceDelegatingViewResolverAutoConfiguration,\
32+
org.springframework.boot.autoconfigure.mobile.DeviceDelegatingViewResolverAutoConfiguration,\
3333
org.springframework.boot.autoconfigure.mobile.SitePreferenceAutoConfiguration,\
3434
org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration,\
3535
org.springframework.boot.autoconfigure.mongo.MongoDataAutoConfiguration,\

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.Test;
2727
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
2828
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
29-
import org.springframework.boot.autoconfigure.mobile.DevceDelegatingViewResolverAutoConfiguration.DevceDelegatingViewResolverConfiguration;
29+
import org.springframework.boot.autoconfigure.mobile.DeviceDelegatingViewResolverAutoConfiguration.DeviceDelegatingViewResolverConfiguration;
3030
import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
3131
import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration;
3232
import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
@@ -44,7 +44,7 @@
4444
import org.thymeleaf.spring4.view.ThymeleafViewResolver;
4545

4646
/**
47-
* Tests for {@link DevceDelegatingViewResolverAutoConfiguration}.
47+
* Tests for {@link DeviceDelegatingViewResolverAutoConfiguration}.
4848
*
4949
* @author Roy Clarkson
5050
*/
@@ -65,7 +65,7 @@ public void close() {
6565
public void deviceDelegatingViewResolverDefaultDisabled() throws Exception {
6666
this.context = new AnnotationConfigEmbeddedWebApplicationContext();
6767
this.context.register(Config.class,
68-
DevceDelegatingViewResolverConfiguration.class);
68+
DeviceDelegatingViewResolverConfiguration.class);
6969
this.context.refresh();
7070
this.context.getBean("deviceDelegatingViewResolver",
7171
AbstractDeviceDelegatingViewResolver.class);
@@ -79,7 +79,7 @@ public void deviceDelegatingInternalResourceViewResolverEnabled() throws Excepti
7979
this.context.register(Config.class, WebMvcAutoConfiguration.class,
8080
HttpMessageConvertersAutoConfiguration.class,
8181
PropertyPlaceholderAutoConfiguration.class,
82-
DevceDelegatingViewResolverConfiguration.class);
82+
DeviceDelegatingViewResolverConfiguration.class);
8383
this.context.refresh();
8484
InternalResourceViewResolver internalResourceViewResolver = this.context.getBean(InternalResourceViewResolver.class);
8585
AbstractDeviceDelegatingViewResolver deviceDelegatingViewResolver = this.context.getBean(
@@ -104,7 +104,7 @@ public void deviceDelegatingInternalResourceViewResolverDisabled() throws Except
104104
this.context.register(Config.class, WebMvcAutoConfiguration.class,
105105
HttpMessageConvertersAutoConfiguration.class,
106106
PropertyPlaceholderAutoConfiguration.class,
107-
DevceDelegatingViewResolverConfiguration.class);
107+
DeviceDelegatingViewResolverConfiguration.class);
108108
this.context.refresh();
109109
assertNotNull(this.context.getBean(InternalResourceViewResolver.class));
110110
try {
@@ -125,7 +125,7 @@ public void deviceDelegatingThymeleafViewResolverEnabled() throws Exception {
125125
ThymeleafAutoConfiguration.class,
126126
HttpMessageConvertersAutoConfiguration.class,
127127
PropertyPlaceholderAutoConfiguration.class,
128-
DevceDelegatingViewResolverConfiguration.class);
128+
DeviceDelegatingViewResolverConfiguration.class);
129129
this.context.refresh();
130130
ThymeleafViewResolver thymeleafViewResolver = this.context.getBean(ThymeleafViewResolver.class);
131131
AbstractDeviceDelegatingViewResolver deviceDelegatingViewResolver = this.context.getBean(
@@ -148,7 +148,7 @@ public void deviceDelegatingThymeleafViewResolverDisabled() throws Exception {
148148
ThymeleafAutoConfiguration.class,
149149
HttpMessageConvertersAutoConfiguration.class,
150150
PropertyPlaceholderAutoConfiguration.class,
151-
DevceDelegatingViewResolverConfiguration.class);
151+
DeviceDelegatingViewResolverConfiguration.class);
152152
this.context.refresh();
153153
assertNotNull(this.context.getBean(InternalResourceViewResolver.class));
154154
assertNotNull(this.context.getBean(ThymeleafViewResolver.class));
@@ -164,7 +164,7 @@ public void defaultPropertyValues() throws Exception {
164164
this.context.register(Config.class, WebMvcAutoConfiguration.class,
165165
HttpMessageConvertersAutoConfiguration.class,
166166
PropertyPlaceholderAutoConfiguration.class,
167-
DevceDelegatingViewResolverConfiguration.class);
167+
DeviceDelegatingViewResolverConfiguration.class);
168168
this.context.refresh();
169169
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
170170
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@@ -221,7 +221,7 @@ public void overrideNormalPrefix() throws Exception {
221221
this.context.register(Config.class, WebMvcAutoConfiguration.class,
222222
HttpMessageConvertersAutoConfiguration.class,
223223
PropertyPlaceholderAutoConfiguration.class,
224-
DevceDelegatingViewResolverConfiguration.class);
224+
DeviceDelegatingViewResolverConfiguration.class);
225225
this.context.refresh();
226226
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
227227
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@@ -242,7 +242,7 @@ public void overrideMobilePrefix() throws Exception {
242242
this.context.register(Config.class, WebMvcAutoConfiguration.class,
243243
HttpMessageConvertersAutoConfiguration.class,
244244
PropertyPlaceholderAutoConfiguration.class,
245-
DevceDelegatingViewResolverConfiguration.class);
245+
DeviceDelegatingViewResolverConfiguration.class);
246246
this.context.refresh();
247247
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
248248
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@@ -263,7 +263,7 @@ public void overrideTabletPrefix() throws Exception {
263263
this.context.register(Config.class, WebMvcAutoConfiguration.class,
264264
HttpMessageConvertersAutoConfiguration.class,
265265
PropertyPlaceholderAutoConfiguration.class,
266-
DevceDelegatingViewResolverConfiguration.class);
266+
DeviceDelegatingViewResolverConfiguration.class);
267267
this.context.refresh();
268268
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
269269
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@@ -284,7 +284,7 @@ public void overrideNormalSuffix() throws Exception {
284284
this.context.register(Config.class, WebMvcAutoConfiguration.class,
285285
HttpMessageConvertersAutoConfiguration.class,
286286
PropertyPlaceholderAutoConfiguration.class,
287-
DevceDelegatingViewResolverConfiguration.class);
287+
DeviceDelegatingViewResolverConfiguration.class);
288288
this.context.refresh();
289289
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
290290
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@@ -305,7 +305,7 @@ public void overrideMobileSuffix() throws Exception {
305305
this.context.register(Config.class, WebMvcAutoConfiguration.class,
306306
HttpMessageConvertersAutoConfiguration.class,
307307
PropertyPlaceholderAutoConfiguration.class,
308-
DevceDelegatingViewResolverConfiguration.class);
308+
DeviceDelegatingViewResolverConfiguration.class);
309309
this.context.refresh();
310310
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
311311
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);
@@ -326,7 +326,7 @@ public void overrideTabletSuffix() throws Exception {
326326
this.context.register(Config.class, WebMvcAutoConfiguration.class,
327327
HttpMessageConvertersAutoConfiguration.class,
328328
PropertyPlaceholderAutoConfiguration.class,
329-
DevceDelegatingViewResolverConfiguration.class);
329+
DeviceDelegatingViewResolverConfiguration.class);
330330
this.context.refresh();
331331
LiteDeviceDelegatingViewResolver liteDeviceDelegatingViewResolver = this.context.getBean(
332332
"deviceDelegatingViewResolver", LiteDeviceDelegatingViewResolver.class);

0 commit comments

Comments
 (0)