diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java index 63386b556e2..93ab6c9ccf0 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java +++ b/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.*", - "vcap_services"); + this("password", "secret", "key", ".*credentials.*", "vcap_services"); + } + + Sanitizer(String... keysToSanitize) { + setKeysToSanitize(keysToSanitize); } /** diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/ViewResolverPropertiesTest.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/ViewResolverPropertiesTests.java old mode 100644 new mode 100755 similarity index 96% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/ViewResolverPropertiesTest.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/ViewResolverPropertiesTests.java index 456dcdf24c6..8030f9709be --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/ViewResolverPropertiesTest.java +++ b/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() { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTest.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java old mode 100644 new mode 100755 similarity index 94% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTest.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java index cbe40826125..cdd5437ed70 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTest.java +++ b/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(); diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java old mode 100644 new mode 100755 similarity index 97% rename from spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTests.java index 37b3f44fdc7..61cd556fa56 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java +++ b/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; diff --git a/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/SampleSecureOAuth2Application.java b/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/SampleSecureOAuth2Application.java index c951b7a316c..67f10542814 100644 --- a/spring-boot-samples/spring-boot-sample-secure-oauth2/src/main/java/sample/secure/oauth2/SampleSecureOAuth2Application.java +++ b/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; diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataItem.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataItem.java index 69e9cc5324d..c32a607c958 100644 --- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataItem.java +++ b/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 - * its source. + * An extension of {@link ConfigurationMetadataProperty} that provides a reference to its + * source. * * @author Stephane Nicoll * @since 1.3.0 diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/BootRunTask.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/BootRunTask.java index 64a37814c75..7ee4a313b17 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/BootRunTask.java +++ b/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 - * of resources. Duplicate resources are removed from the resource output - * directory to prevent them from appearing twice if - * {@code ClassLoader.getResources()} is called. + * directly to the classpath. When enabled, this allows live in-place editing of + * resources. Duplicate resources are removed from the resource output directory to + * prevent them from appearing twice if {@code ClassLoader.getResources()} is called. */ private boolean addResources = false; diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java index bc4721cce45..0c52bf8e6b3 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java +++ b/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 - * adding {@code spring-boot-devtools} to your project instead as it provides this feature - * and many more. + * them to appear twice if {@code ClassLoader.getResources()} is called. Please + * consider adding {@code spring-boot-devtools} to your project instead as it provides + * this feature and many more. * @since 1.0 */ @Parameter(property = "run.addResources", defaultValue = "false")