Polish "Trim trailing whitespace from spring.server.servlet.context-path"

Closes gh-16165

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

@@ -231,16 +231,11 @@ public class ServerProperties {
 		}
 
 		private String cleanContextPath(String contextPath) {
-			if (StringUtils.hasLength(contextPath)) {
+			String candidate = StringUtils.trimWhitespace(contextPath);
-				// remove leading and trailing whitespaces if any exists
+			if (StringUtils.hasText(candidate) && candidate.endsWith("/")) {
-				String ctxPath = StringUtils.trimWhitespace(contextPath);
+				return candidate.substring(0, candidate.length() - 1);
-
-				if (ctxPath.endsWith("/")) {
-					ctxPath = ctxPath.substring(0, ctxPath.length() - 1);
-				}
-				return ctxPath;
 			}
-			return contextPath;
+			return candidate;
 		}
 
 		public String getApplicationDisplayName() {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -150,26 +150,26 @@ public class ServerPropertiesTests {
 	}
 
 	@Test
-	public void makeSureTrailingAndLeadingWhitespacesRemoved_case1() {
+	public void testContextPathWithLeadingWhitespace() {
 		bind("server.servlet.context-path", " /assets");
 		assertThat(this.properties.getServlet().getContextPath()).isEqualTo("/assets");
 	}
 
 	@Test
-	public void makeSureTrailingAndLeadingWhitespacesRemoved_case2() {
+	public void testContextPathWithTrailingWhitespace() {
-		bind("server.servlet.context-path", " /assets ");
-		assertThat(this.properties.getServlet().getContextPath()).isEqualTo("/assets");
-	}
-
-	@Test
-	public void makeSureTrailingAndLeadingWhitespacesRemoved_case3() {
 		bind("server.servlet.context-path", "/assets/copy/ ");
 		assertThat(this.properties.getServlet().getContextPath())
 				.isEqualTo("/assets/copy");
 	}
 
 	@Test
-	public void makeSureTrailingAndLeadingWhitespacesRemoved_case4() {
+	public void testContextPathWithLeadingAndTrailingWhitespace() {
+		bind("server.servlet.context-path", " /assets ");
+		assertThat(this.properties.getServlet().getContextPath()).isEqualTo("/assets");
+	}
+
+	@Test
+	public void testContextPathWithLeadingAndTrailingWhitespaceAndContextWithSpace() {
 		bind("server.servlet.context-path", "  /assets /copy/    ");
 		assertThat(this.properties.getServlet().getContextPath())
 				.isEqualTo("/assets /copy");