From 6a55623910c8893bd809d7fc88a33feb66ef9f26 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 13 Dec 2017 11:25:53 -0800 Subject: [PATCH] Polish --- .../boot/actuate/audit/AuditEvent.java | 2 +- .../actuate/endpoint/EnvironmentEndpoint.java | 7 ++-- ...iaManagementContextConfigurationTests.java | 6 ++- ...vcManagementContextConfigurationTests.java | 37 ++++++++++++------- .../jdbc/EmbeddedDatabaseConnection.java | 2 +- ...asticsearchDataAutoConfigurationTests.java | 12 +++--- .../jdbc/DataSourcePropertiesTests.java | 4 +- spring-boot-dependencies/pom.xml | 2 +- .../boot/test/json/JsonContent.java | 1 - .../AutoConfigureAnnotationProcessor.java | 2 +- 10 files changed, 43 insertions(+), 32 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java index a7b6ee21a0a..98712d8788b 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java @@ -87,7 +87,7 @@ public class AuditEvent implements Serializable { Assert.notNull(timestamp, "Timestamp must not be null"); Assert.notNull(type, "Type must not be null"); this.timestamp = timestamp; - this.principal = principal != null ? principal : ""; + this.principal = (principal != null ? principal : ""); this.type = type; this.data = Collections.unmodifiableMap(data); } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java index 7a2292cfe2f..35d620dcb36 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java @@ -69,9 +69,10 @@ public class EnvironmentEndpoint extends AbstractEndpoint> { EnumerablePropertySource enumerable = (EnumerablePropertySource) source; Map properties = new LinkedHashMap(); for (String name : enumerable.getPropertyNames()) { - Object property = source.getProperty(name); - Object resolved = property instanceof String - ? resolver.resolvePlaceholders((String) property) : property; + Object resolved = source.getProperty(name); + if (resolved instanceof String) { + resolved = resolver.resolvePlaceholders((String) resolved); + } properties.put(name, sanitize(name, resolved)); } properties = postProcessSourceProperties(sourceName, properties); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfigurationTests.java index 99a1cf169db..56c066741a7 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfigurationTests.java @@ -183,7 +183,8 @@ public class EndpointWebMvcHypermediaManagementContextConfigurationTests { static class DocsConfiguration { @Bean - public DocsMvcEndpoint testDocsMvcEndpoint(ManagementServletContext managementServletContext) { + public DocsMvcEndpoint testDocsMvcEndpoint( + ManagementServletContext managementServletContext) { return new TestDocsMvcEndpoint(managementServletContext); } @@ -193,7 +194,8 @@ public class EndpointWebMvcHypermediaManagementContextConfigurationTests { static class HalJsonConfiguration { @Bean - public HalJsonMvcEndpoint testHalJsonMvcEndpoint(ManagementServletContext managementServletContext) { + public HalJsonMvcEndpoint testHalJsonMvcEndpoint( + ManagementServletContext managementServletContext) { return new TestHalJsonMvcEndpoint(managementServletContext); } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java index af531ad336f..37bb8db84d2 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java @@ -111,13 +111,15 @@ public class EndpointWebMvcManagementContextConfigurationTests { public void envMvcEndpointIsConditionalOnMissingBean() throws Exception { this.context.register(EnvConfiguration.class, TestEndpointConfiguration.class); this.context.refresh(); - EnvironmentMvcEndpoint mvcEndpoint = this.context.getBean(EnvironmentMvcEndpoint.class); + EnvironmentMvcEndpoint mvcEndpoint = this.context + .getBean(EnvironmentMvcEndpoint.class); assertThat(mvcEndpoint).isInstanceOf(TestEnvMvcEndpoint.class); } @Test public void metricsMvcEndpointIsConditionalOnMissingBean() throws Exception { - this.context.register(MetricsConfiguration.class, TestEndpointConfiguration.class); + this.context.register(MetricsConfiguration.class, + TestEndpointConfiguration.class); this.context.refresh(); MetricsMvcEndpoint mvcEndpoint = this.context.getBean(MetricsMvcEndpoint.class); assertThat(mvcEndpoint).isInstanceOf(TestMetricsMvcEndpoint.class); @@ -125,7 +127,8 @@ public class EndpointWebMvcManagementContextConfigurationTests { @Test public void logFileMvcEndpointIsConditionalOnMissingBean() throws Exception { - this.context.register(LogFileConfiguration.class, TestEndpointConfiguration.class); + this.context.register(LogFileConfiguration.class, + TestEndpointConfiguration.class); this.context.refresh(); LogFileMvcEndpoint mvcEndpoint = this.context.getBean(LogFileMvcEndpoint.class); assertThat(mvcEndpoint).isInstanceOf(TestLogFileMvcEndpoint.class); @@ -133,7 +136,8 @@ public class EndpointWebMvcManagementContextConfigurationTests { @Test public void shutdownEndpointIsConditionalOnMissingBean() throws Exception { - this.context.register(ShutdownConfiguration.class, TestEndpointConfiguration.class); + this.context.register(ShutdownConfiguration.class, + TestEndpointConfiguration.class); this.context.refresh(); ShutdownMvcEndpoint mvcEndpoint = this.context.getBean(ShutdownMvcEndpoint.class); assertThat(mvcEndpoint).isInstanceOf(TestShutdownMvcEndpoint.class); @@ -141,15 +145,18 @@ public class EndpointWebMvcManagementContextConfigurationTests { @Test public void auditEventsMvcEndpointIsConditionalOnMissingBean() throws Exception { - this.context.register(AuditEventsConfiguration.class, TestEndpointConfiguration.class); + this.context.register(AuditEventsConfiguration.class, + TestEndpointConfiguration.class); this.context.refresh(); - AuditEventsMvcEndpoint mvcEndpoint = this.context.getBean(AuditEventsMvcEndpoint.class); + AuditEventsMvcEndpoint mvcEndpoint = this.context + .getBean(AuditEventsMvcEndpoint.class); assertThat(mvcEndpoint).isInstanceOf(TestAuditEventsMvcEndpoint.class); } @Test public void loggersMvcEndpointIsConditionalOnMissingBean() throws Exception { - this.context.register(LoggersConfiguration.class, TestEndpointConfiguration.class); + this.context.register(LoggersConfiguration.class, + TestEndpointConfiguration.class); this.context.refresh(); LoggersMvcEndpoint mvcEndpoint = this.context.getBean(LoggersMvcEndpoint.class); assertThat(mvcEndpoint).isInstanceOf(TestLoggersMvcEndpoint.class); @@ -157,7 +164,8 @@ public class EndpointWebMvcManagementContextConfigurationTests { @Test public void heapdumpMvcEndpointIsConditionalOnMissingBean() throws Exception { - this.context.register(HeapdumpConfiguration.class, TestEndpointConfiguration.class); + this.context.register(HeapdumpConfiguration.class, + TestEndpointConfiguration.class); this.context.refresh(); HeapdumpMvcEndpoint mvcEndpoint = this.context.getBean(HeapdumpMvcEndpoint.class); assertThat(mvcEndpoint).isInstanceOf(TestHeapdumpMvcEndpoint.class); @@ -171,11 +179,10 @@ public class EndpointWebMvcManagementContextConfigurationTests { @Configuration @ImportAutoConfiguration({ SecurityAutoConfiguration.class, WebMvcAutoConfiguration.class, JacksonAutoConfiguration.class, - HttpMessageConvertersAutoConfiguration.class, - EndpointAutoConfiguration.class, EndpointWebMvcAutoConfiguration.class, + HttpMessageConvertersAutoConfiguration.class, EndpointAutoConfiguration.class, + EndpointWebMvcAutoConfiguration.class, ManagementServerPropertiesAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class, - WebClientAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class, WebClientAutoConfiguration.class, EndpointWebMvcManagementContextConfiguration.class }) static class TestEndpointConfiguration { @@ -194,7 +201,8 @@ public class EndpointWebMvcManagementContextConfigurationTests { static class EnvConfiguration { @Bean - public EnvironmentMvcEndpoint testEnvironmentMvcEndpoint(EnvironmentEndpoint endpoint) { + public EnvironmentMvcEndpoint testEnvironmentMvcEndpoint( + EnvironmentEndpoint endpoint) { return new TestEnvMvcEndpoint(endpoint); } @@ -245,7 +253,8 @@ public class EndpointWebMvcManagementContextConfigurationTests { } @Bean - public AuditEventsMvcEndpoint testAuditEventsMvcEndpoint(AuditEventRepository repository) { + public AuditEventsMvcEndpoint testAuditEventsMvcEndpoint( + AuditEventRepository repository) { return new TestAuditEventsMvcEndpoint(repository); } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java index 924d78d00a2..f15bf05e2f0 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java @@ -106,7 +106,7 @@ public enum EmbeddedDatabaseConnection { */ public String getUrl(String databaseName) { Assert.hasText(databaseName, "DatabaseName must not be null."); - return this.url != null ? String.format(this.url, databaseName) : null; + return (this.url != null ? String.format(this.url, databaseName) : null); } /** diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java index d2cb1850d36..156513baec6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java @@ -68,7 +68,7 @@ public class ElasticsearchDataAutoConfigurationTests { "spring.data.elasticsearch.properties.path.logs:target/logs"); assertThat( this.context.getBeanNamesForType(SimpleElasticsearchMappingContext.class)) - .hasSize(1); + .hasSize(1); } @Test @@ -80,13 +80,13 @@ public class ElasticsearchDataAutoConfigurationTests { } private void load(String... environment) { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); - ctx.register(PropertyPlaceholderAutoConfiguration.class, + AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); + EnvironmentTestUtils.addEnvironment(context, environment); + context.register(PropertyPlaceholderAutoConfiguration.class, ElasticsearchAutoConfiguration.class, ElasticsearchDataAutoConfiguration.class); - ctx.refresh(); - this.context = ctx; + context.refresh(); + this.context = context; } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java index bc6109787da..aa884c246e7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java @@ -65,8 +65,8 @@ public class DataSourcePropertiesTests { @Test public void determineUrlWithNoEmbeddedSupport() throws Exception { DataSourceProperties properties = new DataSourceProperties(); - properties.setBeanClassLoader(new HidePackagesClassLoader("org.h2", - "org.apache.derby", "org.hsqldb")); + properties.setBeanClassLoader( + new HidePackagesClassLoader("org.h2", "org.apache.derby", "org.hsqldb")); properties.afterPropertiesSet(); this.thrown.expect(DataSourceProperties.DataSourceBeanCreationException.class); this.thrown.expectMessage("Cannot determine embedded database url"); diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 3d287fa7f53..19788d28b5a 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -3027,4 +3027,4 @@ integration-test - \ No newline at end of file + diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java index 78069abf2d3..c7fc0c1a3f4 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java @@ -55,7 +55,6 @@ public final class JsonContent implements AssertProvider { /** * Use AssertJ's {@link org.assertj.core.api.Assertions#assertThat assertThat} * instead. - * * @deprecated in favor of AssertJ's {@link org.assertj.core.api.Assertions#assertThat * assertThat} */ diff --git a/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java b/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java index 134d6c04e89..d27dffd4128 100644 --- a/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java +++ b/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java @@ -177,7 +177,7 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor { return result; } - private Object processValue(Object value) { + private Object processValue(Object value) { if (value instanceof DeclaredType) { return getQualifiedName(((DeclaredType) value).asElement()); }