Polish

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

@@ -35,8 +35,11 @@ class Sanitizer {
 	private Pattern[] keysToSanitize;
 
 	Sanitizer() {
-		setKeysToSanitize("password", "secret", "key", ".*credentials.*",
+		this("password", "secret", "key", ".*credentials.*", "vcap_services");
-				"vcap_services");
+	}
+
+	Sanitizer(String... keysToSanitize) {
+		setKeysToSanitize(keysToSanitize);
 	}
 
 	/**

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/ViewResolverPropertiesTests.java

@@ -23,14 +23,14 @@ import org.junit.Test;
 import org.springframework.util.MimeTypeUtils;
 
 import static org.hamcrest.Matchers.hasToString;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests for {@link AbstractViewResolverProperties}.
  *
  * @author Stephane Nicoll
  */
-public class ViewResolverPropertiesTest {
+public class ViewResolverPropertiesTests {
 
 	@Test
 	public void defaultContentType() {

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

@@ -20,14 +20,14 @@ import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests for {@link ResourceProperties}.
  *
  * @author Stephane Nicoll
  */
-public class ResourcePropertiesTest {
+public class ResourcePropertiesTests {
 
 	private final ResourceProperties properties = new ResourceProperties();
 

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java

@@ -62,9 +62,9 @@ import static org.junit.Assert.assertEquals;
  * @author Phillip Webb
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(HttpTunnelIntegrationTest.Config.class)
+@SpringApplicationConfiguration(HttpTunnelIntegrationTests.Config.class)
 @WebIntegrationTest
-public class HttpTunnelIntegrationTest {
+public class HttpTunnelIntegrationTests {
 
 	@Autowired
 	private Config config;

spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/SampleSecureOAuth2Application.java

@@ -98,7 +98,7 @@ import org.springframework.web.bind.annotation.RestController;
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 @RestController
 public class SampleSecureOAuth2Application {
-	
+
 	@RequestMapping("/user")
 	public Principal user(Principal user) {
 		return user;

spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataItem.java

@@ -17,8 +17,8 @@
 package org.springframework.boot.configurationmetadata;
 
 /**
- * An extension of {@link ConfigurationMetadataProperty} that provides a reference to
+ * An extension of {@link ConfigurationMetadataProperty} that provides a reference to its
- * its source.
+ * source.
  *
  * @author Stephane Nicoll
  * @since 1.3.0

spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/BootRunTask.java

@@ -38,10 +38,9 @@ public class BootRunTask extends JavaExec {
 
 	/**
 	 * Whether or not resources (typically in {@code src/main/resources} are added
-	 * directly to the classpath. When enabled, this allows live in-place editing
+	 * directly to the classpath. When enabled, this allows live in-place editing of
-	 * of resources. Duplicate resources are removed from the resource output
+	 * resources. Duplicate resources are removed from the resource output directory to
-	 * directory to prevent them from appearing twice if
+	 * prevent them from appearing twice if {@code ClassLoader.getResources()} is called.
-	 * {@code ClassLoader.getResources()} is called.
 	 */
 	private boolean addResources = false;
 

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java

@@ -64,9 +64,9 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 	/**
 	 * Add maven resources to the classpath directly, this allows live in-place editing of
 	 * resources. Duplicate resources are removed from {@code target/classes} to prevent
-	 * them to appear twice if {@code ClassLoader.getResources()} is called. Please consider
+	 * them to appear twice if {@code ClassLoader.getResources()} is called. Please
-	 * adding {@code spring-boot-devtools} to your project instead as it provides this feature
+	 * consider adding {@code spring-boot-devtools} to your project instead as it provides
-	 * and many more.
+	 * this feature and many more.
 	 * @since 1.0
 	 */
 	@Parameter(property = "run.addResources", defaultValue = "false")