From 67f0b1986cf8c107803f90e8702544e54f7b6bcd Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Wed, 10 Aug 2016 14:18:41 +0200
Subject: [PATCH] Consistent spelling for StandaloneMockMvcBuilder's
 addPlaceholderValue (cherry picked from commit a4b6682)

---
 .../setup/StandaloneMockMvcBuilder.java       | 26 +++++++++++-----
 .../setup/StandaloneMockMvcBuilderTests.java  | 30 +++++++------------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
index bf965cca42..a57a84d7f6 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
@@ -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;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
index a0763af521..d8146dc7d2 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
@@ -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.
@@ -23,6 +23,8 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ser.impl.UnknownSerializer;
 import org.junit.Test;
 
 import org.springframework.http.converter.json.SpringHandlerInstantiator;
@@ -36,9 +38,6 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.ser.impl.UnknownSerializer;
-
 import static org.junit.Assert.*;
 
 /**
@@ -50,12 +49,10 @@ import static org.junit.Assert.*;
  */
 public class StandaloneMockMvcBuilderTests {
 
-	// SPR-10825
-
-	@Test
+	@Test  // SPR-10825
 	public void placeHoldersInRequestMapping() throws Exception {
 		TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PlaceholderController());
-		builder.addPlaceHolderValue("sys.login.ajax", "/foo");
+		builder.addPlaceholderValue("sys.login.ajax", "/foo");
 		builder.build();
 
 		RequestMappingHandlerMapping hm = builder.wac.getBean(RequestMappingHandlerMapping.class);
@@ -67,9 +64,7 @@ public class StandaloneMockMvcBuilderTests {
 		assertEquals("handleWithPlaceholders", ((HandlerMethod) chain.getHandler()).getMethod().getName());
 	}
 
-	// SPR-13637
-
-	@Test
+	@Test  // SPR-13637
 	public void suffixPatternMatch() throws Exception {
 		TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PersonController());
 		builder.setUseSuffixPatternMatch(false);
@@ -87,18 +82,15 @@ public class StandaloneMockMvcBuilderTests {
 		assertNull(chain);
 	}
 
-	// SPR-12553
-
-	@Test
+	@Test  // SPR-12553
 	public void applicationContextAttribute() {
 		TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PlaceholderController());
-		builder.addPlaceHolderValue("sys.login.ajax", "/foo");
+		builder.addPlaceholderValue("sys.login.ajax", "/foo");
 		WebApplicationContext  wac = builder.initWebAppContext();
 		assertEquals(wac, WebApplicationContextUtils
 				.getRequiredWebApplicationContext(wac.getServletContext()));
 	}
 
-
 	@Test(expected = IllegalArgumentException.class)
 	public void addFiltersFiltersNull() {
 		StandaloneMockMvcBuilder builder = MockMvcBuilders.standaloneSetup(new PersonController());
@@ -123,9 +115,7 @@ public class StandaloneMockMvcBuilderTests {
 		builder.addFilter(new ContinueFilter(), (String) null);
 	}
 
-	// SPR-13375
-
-	@Test
+	@Test  // SPR-13375
 	@SuppressWarnings("rawtypes")
 	public void springHandlerInstantiator() {
 		TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PersonController());
@@ -159,6 +149,7 @@ public class StandaloneMockMvcBuilderTests {
 		}
 	}
 
+
 	@Controller
 	private static class PersonController {
 
@@ -173,6 +164,7 @@ public class StandaloneMockMvcBuilderTests {
 		}
 	}
 
+
 	private class ContinueFilter extends OncePerRequestFilter {
 
 		@Override