Merge branch '1.5.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -234,7 +234,7 @@ public class ConfigurationPropertiesReportEndpoint
 	private Map<String, Object> sanitize(String prefix, Map<String, Object> map) {
 		for (Map.Entry<String, Object> entry : map.entrySet()) {
 			String key = entry.getKey();
-			String qualifiedKey = (prefix.length() == 0 ? prefix : prefix + ".") + key;
+			String qualifiedKey = (prefix.isEmpty() ? prefix : prefix + ".") + key;
 			Object value = entry.getValue();
 			if (value instanceof Map) {
 				map.put(key, sanitize(qualifiedKey, (Map<String, Object>) value));

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AbstractMvcEndpoint.java

@@ -69,7 +69,7 @@ public abstract class AbstractMvcEndpoint extends WebMvcConfigurerAdapter
 	@PostConstruct
 	private void validate() {
 		Assert.notNull(this.path, "Path must not be null");
-		Assert.isTrue(this.path.length() == 0 || this.path.startsWith("/"),
+		Assert.isTrue(this.path.isEmpty() || this.path.startsWith("/"),
 				"Path must start with / or be empty");
 	}
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.java

@@ -139,7 +139,7 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
 	private HttpStatus getStatus(Health health) {
 		String code = health.getStatus().getCode();
 		if (code != null) {
-			code = code.toLowerCase().replace("_", "-");
+			code = code.toLowerCase().replace('_', '-');
 			for (String candidate : RelaxedNames.forCamelCase(code)) {
 				HttpStatus status = this.statusMapping.get(candidate);
 				if (status != null) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -770,7 +770,7 @@ public class RabbitProperties {
 			int hostIndex = input.indexOf("/");
 			if (hostIndex >= 0) {
 				this.virtualHost = input.substring(hostIndex + 1);
-				if (this.virtualHost.length() == 0) {
+				if (this.virtualHost.isEmpty()) {
 					this.virtualHost = "/";
 				}
 				input = input.substring(0, hostIndex);

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheCondition.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ class CacheCondition extends SpringBootCondition {
 		}
 		CacheType cacheType = CacheConfigurations
 				.getType(((AnnotationMetadata) metadata).getClassName());
-		String value = resolver.getProperty("type").replace("-", "_").toUpperCase();
+		String value = resolver.getProperty("type").replace('-', '_').toUpperCase();
 		if (value.equals(cacheType.name())) {
 			return ConditionOutcome.match(message.because(value + " cache type"));
 		}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java

@@ -47,7 +47,7 @@ public class H2ConsoleProperties {
 	@PostConstruct
 	private void validate() {
 		Assert.notNull(this.path, "Path must not be null");
-		Assert.isTrue(this.path.length() == 0 || this.path.startsWith("/"),
+		Assert.isTrue(this.path.isEmpty() || this.path.startsWith("/"),
 				"Path must start with / or be empty");
 	}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionCondition.java

@@ -45,7 +45,7 @@ class SessionCondition extends SpringBootCondition {
 			return ConditionOutcome.noMatch(
 					message.didNotFind("spring.session.store-type property").atAll());
 		}
-		String value = resolver.getProperty("store-type").replace("-", "_").toUpperCase();
+		String value = resolver.getProperty("store-type").replace('-', '_').toUpperCase();
 		if (value.equals(sessionStoreType.name())) {
 			return ConditionOutcome.match(message
 					.found("spring.session.store-type property").items(sessionStoreType));

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java

@@ -44,7 +44,7 @@ public class WebServicesProperties {
 	@PostConstruct
 	private void validate() {
 		Assert.notNull(this.path, "Path must not be null");
-		Assert.isTrue(this.path.length() == 0 || this.path.startsWith("/"),
+		Assert.isTrue(this.path.isEmpty() || this.path.startsWith("/"),
 				"Path must start with / or be empty");
 	}
 

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -212,7 +212,7 @@ public class DefaultErrorViewResolverTests {
 	private void setResourceLocation(String path) {
 		String packageName = getClass().getPackage().getName();
 		this.resourceProperties.setStaticLocations(new String[] {
-				"classpath:" + packageName.replace(".", "/") + path + "/" });
+				"classpath:" + packageName.replace('.', '/') + path + "/" });
 	}
 
 	private MockHttpServletResponse render(ModelAndView modelAndView) throws Exception {

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -264,7 +264,7 @@ abstract class ArchiveCommand extends OptionParsingCommand {
 			if (classLoader == null) {
 				classLoader = Thread.currentThread().getContextClassLoader();
 			}
-			String name = sourceClass.replace(".", "/") + ".class";
+			String name = sourceClass.replace('.', '/') + ".class";
 			InputStream stream = classLoader.getResourceAsStream(name);
 			writer.writeEntry(this.layout.getClassesLocation() + name, stream);
 		}

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -161,7 +161,7 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader {
 		protected Class<?> createClass(byte[] code, ClassNode classNode) {
 			Class<?> createdClass = super.createClass(code, classNode);
 			ExtendedGroovyClassLoader.this.classResources
-					.put(classNode.getName().replace(".", "/") + ".class", code);
+					.put(classNode.getName().replace('.', '/') + ".class", code);
 			return createdClass;
 		}
 

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -52,7 +52,7 @@ public class RestartClassLoaderTests {
 	private static final String PACKAGE = RestartClassLoaderTests.class.getPackage()
 			.getName();
 
-	private static final String PACKAGE_PATH = PACKAGE.replace(".", "/");
+	private static final String PACKAGE_PATH = PACKAGE.replace('.', '/');
 
 	private static final Charset UTF_8 = Charset.forName("UTF-8");
 

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/settings/DevToolsSettingsTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -37,7 +37,7 @@ public class DevToolsSettingsTests {
 	public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
 	private static final String ROOT = DevToolsSettingsTests.class.getPackage().getName()
-			.replace(".", "/") + "/";
+			.replace('.', '/') + "/";
 
 	@Test
 	public void includePatterns() throws Exception {

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -803,9 +803,9 @@ content into your application; rather pick only the properties that you need.
 
 	# EMBEDDED MONGODB ({sc-spring-boot-autoconfigure}/mongo/embedded/EmbeddedMongoProperties.{sc-ext}[EmbeddedMongoProperties])
 	spring.mongodb.embedded.features=SYNC_DELAY # Comma-separated list of features to enable.
-	spring.mongodb.embedded.storage.databaseDir= # Directory used for data storage.
-	spring.mongodb.embedded.storage.oplogSize= # Maximum size of the oplog in megabytes.
-	spring.mongodb.embedded.storage.replSetName= # Name of the replica set.
+	spring.mongodb.embedded.storage.database-dir= # Directory used for data storage.
+	spring.mongodb.embedded.storage.oplog-size= # Maximum size of the oplog in megabytes.
+	spring.mongodb.embedded.storage.repl-set-name= # Name of the replica set.
 	spring.mongodb.embedded.version=2.6.10 # Version of Mongo to use.
 
 	# REDIS ({sc-spring-boot-autoconfigure}/data/redis/RedisProperties.{sc-ext}[RedisProperties])

spring-boot-test-support/src/main/java/org/springframework/boot/junit/compiler/TestCompiler.java

@@ -99,7 +99,7 @@ public class TestCompiler {
 	}
 
 	public static String sourcePathFor(Class<?> type) {
-		return type.getName().replace(".", "/") + ".java";
+		return type.getName().replace('.', '/') + ".java";
 	}
 
 	protected File getSourceFolder() {

spring-boot-test/src/test/java/org/springframework/boot/test/testutil/AbstractConfigurationClassTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -65,7 +65,7 @@ public abstract class AbstractConfigurationClassTests {
 	private Set<AnnotationMetadata> findConfigurationClasses() throws IOException {
 		Set<AnnotationMetadata> configurationClasses = new HashSet<AnnotationMetadata>();
 		Resource[] resources = this.resolver.getResources("classpath*:"
-				+ getClass().getPackage().getName().replace(".", "/") + "/**/*.class");
+				+ getClass().getPackage().getName().replace('.', '/') + "/**/*.class");
 		for (Resource resource : resources) {
 			if (!isTestClass(resource)) {
 				MetadataReader metadataReader = new SimpleMetadataReaderFactory()

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -262,7 +262,7 @@ public abstract class MainClassFinder {
 	}
 
 	private static String convertToClassName(String name, String prefix) {
-		name = name.replace("/", ".");
+		name = name.replace('/', '.');
 		name = name.replace('\\', '.');
 		name = name.substring(0, name.length() - DOT_CLASS.length());
 		if (prefix != null) {

spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/TestJarFile.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -55,7 +55,7 @@ public class TestJarFile {
 		File file = getFilePath(filename);
 		file.getParentFile().mkdirs();
 		InputStream inputStream = getClass().getResourceAsStream(
-				"/" + classToCopy.getName().replace(".", "/") + ".class");
+				"/" + classToCopy.getName().replace('.', '/') + ".class");
 		copyToFile(inputStream, file);
 		if (time != null) {
 			file.setLastModified(time);

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -131,8 +131,8 @@ public class LaunchedURLClassLoader extends URLClassLoader {
 			AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
 				@Override
 				public Object run() throws ClassNotFoundException {
-					String packageEntryName = packageName.replace(".", "/") + "/";
-					String classEntryName = className.replace(".", "/") + ".class";
+					String packageEntryName = packageName.replace('.', '/') + "/";
+					String classEntryName = className.replace('.', '/') + ".class";
 					for (URL url : getURLs()) {
 						try {
 							URLConnection connection = url.openConnection();

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -359,7 +359,7 @@ public class PropertiesLauncher extends Launcher {
 
 	private String getProperty(String propertyKey, String manifestKey) throws Exception {
 		if (manifestKey == null) {
-			manifestKey = propertyKey.replace(".", "-");
+			manifestKey = propertyKey.replace('.', '-');
 			manifestKey = toCamelCase(manifestKey);
 		}
 		String property = SystemPropertyUtils.getProperty(propertyKey);

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

@@ -121,7 +121,7 @@ final class AsciiBytes {
 	}
 
 	public AsciiBytes append(String string) {
-		if (string == null || string.length() == 0) {
+		if (string == null || string.isEmpty()) {
 			return this;
 		}
 		return append(string.getBytes(UTF_8));

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -293,7 +293,7 @@ final class JarURLConnection extends java.net.JarURLConnection {
 		}
 
 		private String decode(String source) {
-			if (source.length() == 0 || (source.indexOf('%') < 0)) {
+			if (source.isEmpty() || (source.indexOf('%') < 0)) {
 				return source;
 			}
 			ByteArrayOutputStream bos = new ByteArrayOutputStream(source.length());
@@ -347,7 +347,7 @@ final class JarURLConnection extends java.net.JarURLConnection {
 		}
 
 		public boolean isEmpty() {
-			return this.name.length() == 0;
+			return this.name.isEmpty();
 		}
 
 		public String getContentType() {

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -184,11 +184,11 @@ public abstract class SystemPropertyUtils {
 			}
 			if (propVal == null) {
 				// Try with underscores.
-				propVal = System.getenv(key.replace(".", "_"));
+				propVal = System.getenv(key.replace('.', '_'));
 			}
 			if (propVal == null) {
 				// Try uppercase with underscores as well.
-				propVal = System.getenv(key.toUpperCase().replace(".", "_"));
+				propVal = System.getenv(key.toUpperCase().replace('.', '_'));
 			}
 			if (propVal != null) {
 				return propVal;

spring-boot/src/main/java/org/springframework/boot/bind/RelaxedConversionService.java

 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -120,14 +120,14 @@ class RelaxedConversionService implements ConversionService {
 
 			@Override
 			public T convert(String source) {
-				if (source.length() == 0) {
+				if (source.isEmpty()) {
 					// It's an empty enum identifier: reset the enum value to null.
 					return null;
 				}
 				source = source.trim();
 				for (T candidate : (Set<T>) EnumSet.allOf(this.enumType)) {
 					RelaxedNames names = new RelaxedNames(
-							candidate.name().replace("_", "-").toLowerCase());
+							candidate.name().replace('_', '-').toLowerCase());
 					for (String name : names) {
 						if (name.equals(source)) {
 							return candidate;

spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java

@@ -127,7 +127,7 @@ public final class RelaxedNames implements Iterable<String> {
 
 			@Override
 			public String apply(String value) {
-				return value.indexOf('-') != -1 ? value.replace("-", "_") : value;
+				return value.indexOf('-') != -1 ? value.replace('-', '_') : value;
 			}
 
 		},
@@ -136,7 +136,7 @@ public final class RelaxedNames implements Iterable<String> {
 
 			@Override
 			public String apply(String value) {
-				return value.indexOf('_') != -1 ? value.replace("_", ".") : value;
+				return value.indexOf('_') != -1 ? value.replace('_', '.') : value;
 			}
 
 		},
@@ -145,7 +145,7 @@ public final class RelaxedNames implements Iterable<String> {
 
 			@Override
 			public String apply(String value) {
-				return value.indexOf('.') != -1 ? value.replace(".", "_") : value;
+				return value.indexOf('.') != -1 ? value.replace('.', '_') : value;
 			}
 
 		},

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

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -206,14 +206,14 @@ public class ConfigurationWarningsApplicationContextInitializer
 		}
 
 		private boolean isProblematicPackage(String scannedPackage) {
-			if (scannedPackage == null || scannedPackage.length() == 0) {
+			if (scannedPackage == null || scannedPackage.isEmpty()) {
 				return true;
 			}
 			return PROBLEM_PACKAGES.contains(scannedPackage);
 		}
 
 		private String getDisplayName(String scannedPackage) {
-			if (scannedPackage == null || scannedPackage.length() == 0) {
+			if (scannedPackage == null || scannedPackage.isEmpty()) {
 				return "the default package";
 			}
 			return "'" + scannedPackage + "'";

spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -172,7 +172,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
 
 	protected final String getPackagedConfigFile(String fileName) {
 		String defaultPath = ClassUtils.getPackageName(getClass());
-		defaultPath = defaultPath.replace(".", "/");
+		defaultPath = defaultPath.replace('.', '/');
 		defaultPath = defaultPath + "/" + fileName;
 		defaultPath = "classpath:" + defaultPath;
 		return defaultPath;

spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java

 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify;
 public class XmlEmbeddedWebApplicationContextTests {
 
 	private static final String PATH = XmlEmbeddedWebApplicationContextTests.class
-			.getPackage().getName().replace(".", "/") + "/";
+			.getPackage().getName().replace('.', '/') + "/";
 
 	private static final String FILE = "exampleEmbeddedWebApplicationConfiguration.xml";