Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent spelling for StandaloneMockMvcBuilder's addPlaceholderValue

Browse Source 
(cherry picked from commit a4b6682)
This commit is contained in:
Juergen Hoeller
2016-08-10 14:18:41 +02:00
parent 60e0177d00
commit 67f0b1986c
2 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -119,7 +119,7 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
private Boolean removeSemicolonContent;
private Map<String, String> placeHolderValues = new HashMap<String, String>();
private Map<String, String> placeholderValues = new HashMap<String, String>();
/**
@@ -317,9 +317,19 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
* request mappings. This method allows manually provided placeholder values so they
* can be resolved. Alternatively consider creating a test that initializes a
* {@link WebApplicationContext}.
* @since 4.2.8
*/
public StandaloneMockMvcBuilder addPlaceholderValue(String name, String value) {
this.placeholderValues.put(name, value);
return this;
}
/**
* @deprecated as of 4.2.8, in favor of {@link #addPlaceholderValue(String, String)}
*/
@Deprecated
public StandaloneMockMvcBuilder addPlaceHolderValue(String name, String value) {
this.placeHolderValues.put(name, value);
this.placeholderValues.put(name, value);
return this;
}
@@ -364,8 +374,8 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
}
private List<ViewResolver> initViewResolvers(WebApplicationContext wac) {
this.viewResolvers = (this.viewResolvers == null) ?
Arrays.<ViewResolver>asList(new InternalResourceViewResolver()) : this.viewResolvers;
this.viewResolvers = (this.viewResolvers != null ? this.viewResolvers :
Collections.<ViewResolver>singletonList(new InternalResourceViewResolver()));
for (Object viewResolver : this.viewResolvers) {
if (viewResolver instanceof WebApplicationObjectSupport) {
((WebApplicationObjectSupport) viewResolver).setApplicationContext(wac);
@@ -380,7 +390,7 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
public StaticRequestMappingHandlerMapping getHandlerMapping() {
StaticRequestMappingHandlerMapping handlerMapping = new StaticRequestMappingHandlerMapping();
handlerMapping.setEmbeddedValueResolver(new StaticStringValueResolver(placeHolderValues));
handlerMapping.setEmbeddedValueResolver(new StaticStringValueResolver(placeholderValues));
handlerMapping.setUseSuffixPatternMatch(useSuffixPatternMatch);
handlerMapping.setUseTrailingSlashMatch(useTrailingSlashPatternMatch);
handlerMapping.setOrder(0);
@@ -440,8 +450,8 @@ public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneM
try {
((InitializingBean) mvcValidator).afterPropertiesSet();
}
catch (Exception e) {
throw new BeanInitializationException("Failed to initialize Validator", e);
catch (Exception ex) {
throw new BeanInitializationException("Failed to initialize Validator", ex);
}
}
return mvcValidator;