Merge branch '1.5.x'

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationWithoutValidatorTests.java

@@ -28,7 +28,7 @@ import org.springframework.validation.beanvalidation.MethodValidationPostProcess
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Test for {{@link ValidationAutoConfiguration} when no JSR-303 provider is available.
+ * Test for {@link ValidationAutoConfiguration} when no JSR-303 provider is available.
  *
  * @author Stephane Nicoll
  */

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java

@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -141,9 +142,7 @@ public class RestartServer {
 		ClassLoader classLoader = this.classLoader;
 		while (classLoader != null) {
 			if (classLoader instanceof URLClassLoader) {
-				for (URL url : ((URLClassLoader) classLoader).getURLs()) {
-					urls.add(url);
-				}
+				Collections.addAll(urls, ((URLClassLoader) classLoader).getURLs());
 			}
 			classLoader = classLoader.getParent();
 		}

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java

@@ -536,11 +536,8 @@ public class PropertiesLauncher extends Launcher {
 		return builder.toString();
 	}
 
-	private static Object capitalize(String str) {
-		StringBuilder sb = new StringBuilder(str.length());
-		sb.append(Character.toUpperCase(str.charAt(0)));
-		sb.append(str.substring(1));
-		return sb.toString();
+	private static String capitalize(String str) {
+		return Character.toUpperCase(str.charAt(0)) + str.substring(1);
 	}
 
 	private void log(String message) {

spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java

@@ -183,9 +183,7 @@ public class ConfigurationWarningsApplicationContextInitializer
 
 		private void addPackages(Set<String> packages, String[] values) {
 			if (values != null) {
-				for (String value : values) {
-					packages.add(value);
-				}
+				Collections.addAll(packages, values);
 			}
 		}
 

spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java

@@ -162,7 +162,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
 	}
 
 	/**
-	 * Configure the application. Normally all you would need to do it add sources (e.g.
+	 * Configure the application. Normally all you would need to do is add sources (e.g.
 	 * config classes) because other settings have sensible defaults. You might choose
 	 * (for instance) to add default command line arguments, or set an active Spring
 	 * profile.