diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java index f1055d2f4c..71e1a276de 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java @@ -93,6 +93,7 @@ public class CacheStatisticsAutoConfiguration { public HazelcastCacheStatisticsProvider hazelcastCacheStatisticsProvider() { return new HazelcastCacheStatisticsProvider(); } + } @Configuration diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java index 4c8a51dd41..1d7ad9f7f5 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java @@ -83,4 +83,5 @@ public class EndpointMBeanExportProperties { public void setStaticNames(String[] staticNames) { this.staticNames = StringUtils.splitArrayElementsIntoProperties(staticNames, "="); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 9ac5aba91e..e66bc9fb0d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -266,6 +266,7 @@ public class EndpointWebMvcAutoConfiguration @Conditional(OnManagementMvcCondition.class) @Import(ManagementContextConfigurationsImportSelector.class) protected static class EndpointWebMvcConfiguration { + } /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java index e22f418c5c..1fa31176c5 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java @@ -43,4 +43,5 @@ public class JolokiaProperties { public void setConfig(Map config) { this.config = config; } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java index 77a21cb902..1221fd1c76 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java @@ -126,6 +126,7 @@ public class ManagementWebSecurityAutoConfiguration { } } + } @Configuration @@ -158,6 +159,7 @@ public class ManagementWebSecurityAutoConfiguration { @Conditional(WebSecurityEnablerCondition.class) @EnableWebSecurity protected static class WebSecurityEnabler extends AuthenticationManagerConfiguration { + } /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index 963dc9aecd..aab1931548 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java @@ -67,7 +67,6 @@ import org.springframework.messaging.MessageChannel; * @see MetricWriter * @see InMemoryMetricRepository * @see Exporter - * * @author Dave Syer */ @Configuration @@ -108,6 +107,7 @@ public class MetricRepositoryAutoConfiguration { public BufferGaugeService gaugeService(GaugeBuffers writer) { return new BufferGaugeService(writer); } + } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java index 1d99ac715b..81c5d048c8 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java @@ -145,7 +145,8 @@ final class MetricsFilter extends OncePerRequestFilter { suffix); } - private String determineMetricNameSuffix(HttpServletRequest request, String path, int status) { + private String determineMetricNameSuffix(HttpServletRequest request, String path, + int status) { Object bestMatchingPattern = request .getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE); if (bestMatchingPattern != null) { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java index d5b2feea7f..9df978a816 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java @@ -101,7 +101,6 @@ public class CloudFoundryActuatorAutoConfiguration { /** * Nested configuration for ignored requests if Spring Security is present. - * */ @ConditionalOnClass(WebSecurity.class) static class CloudFoundryIgnoredRequestConfiguration { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java index af5fd95d91..68aa2367f2 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java @@ -59,4 +59,5 @@ public class BeansEndpoint extends AbstractEndpoint> public List invoke() { return this.parser.parseList(this.liveBeansView.getSnapshotAsJson()); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java index d868f78776..958bfcce5f 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java @@ -332,6 +332,7 @@ public class ConfigurationPropertiesReportEndpoint } return setter; } + } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java index 5fc355b581..abe0b7a525 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java @@ -93,4 +93,5 @@ public class HealthEndpoint extends AbstractEndpoint { } return name; } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java index 86d2c830e2..eb30b9e64e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java @@ -47,4 +47,5 @@ public class TraceEndpoint extends AbstractEndpoint> { public List invoke() { return this.repository.findAll(); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/ShutdownEndpointMBean.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/ShutdownEndpointMBean.java index 1af2ec2477..d61642f514 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/ShutdownEndpointMBean.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/ShutdownEndpointMBean.java @@ -47,4 +47,5 @@ public class ShutdownEndpointMBean extends EndpointMBean { public Object shutdown() { return convert(getEndpoint().invoke()); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java index bb1bcd4648..33e252bcab 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java @@ -58,4 +58,5 @@ public class HalJsonMvcEndpoint extends AbstractNamedMvcEndpoint { protected final ManagementServletContext getManagementServletContext() { return this.managementServletContext; } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java index 8320697767..63fe5409f7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java @@ -45,8 +45,8 @@ import org.springframework.web.util.UrlPathHelper; */ @ConfigurationProperties(prefix = "endpoints.jolokia", ignoreUnknownFields = false) @HypermediaDisabled -public class JolokiaMvcEndpoint extends AbstractNamedMvcEndpoint - implements InitializingBean, ApplicationContextAware, ServletContextAware, DisposableBean { +public class JolokiaMvcEndpoint extends AbstractNamedMvcEndpoint implements + InitializingBean, ApplicationContextAware, ServletContextAware, DisposableBean { private final ServletWrappingController controller = new ServletWrappingController(); @@ -116,6 +116,7 @@ public class JolokiaMvcEndpoint extends AbstractNamedMvcEndpoint } return value; } + } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java index 0ecfab4392..b334d25a56 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java @@ -49,4 +49,5 @@ public class ShutdownMvcEndpoint extends EndpointMvcAdapter { } return super.invoke(); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthIndicator.java index 2c4eacbfbe..1f9483b92a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthIndicator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthIndicator.java @@ -50,4 +50,5 @@ public abstract class AbstractHealthIndicator implements HealthIndicator { * system status. */ protected abstract void doHealthCheck(Health.Builder builder) throws Exception; + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java index e3e4d18807..69a6822b57 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java @@ -61,4 +61,5 @@ public class DiskSpaceHealthIndicator extends AbstractHealthIndicator { .withDetail("free", diskFreeInBytes) .withDetail("threshold", this.properties.getThreshold()); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java index 175681037d..310e500134 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java @@ -299,6 +299,7 @@ public final class Health { public Health build() { return new Health(this); } + } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java index 24e4c1922e..cbdfda19f0 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java @@ -42,4 +42,5 @@ public interface HealthAggregator { * @return the aggregated health */ Health aggregate(Map healths); + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java index 7e4f6c92cc..93a6a16ee9 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java @@ -167,6 +167,7 @@ public class DropwizardMetricServices implements CounterService, GaugeService { public void setValue(double value) { this.value = value; } + } } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java index 4f04dd9802..8c1dae70cf 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java @@ -240,4 +240,5 @@ public class MetricCopyExporter extends AbstractMetricExporter { } }; + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java index a8debd2edc..ffad29c0d0 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java @@ -90,7 +90,6 @@ public class OpenTsdbGaugeWriter implements GaugeWriter { /** * Creates a new {@code OpenTsdbGaugeWriter} with the given millisecond * {@code connectTimeout} and {@code readTimeout}. - * * @param connectTimeout the connect timeout in milliseconds * @param readTimeout the read timeout in milliseconds */ diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java index 096f22edb4..5ce8d29d78 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java @@ -58,7 +58,6 @@ public class RedisMetricRepository implements MetricRepository { * Create a RedisMetricRepository with a default prefix to apply to all metric names. * If multiple repositories share a redis instance they will feed into the same global * metrics. - * * @param redisConnectionFactory the redis connection factory */ public RedisMetricRepository(RedisConnectionFactory redisConnectionFactory) { @@ -70,7 +69,6 @@ public class RedisMetricRepository implements MetricRepository { * unique to this repository or to a logical repository contributed to by multiple * instances, where they all see the same values). Recommended constructor for general * purpose use. - * * @param redisConnectionFactory the redis connection factory * @param prefix the prefix to set for all metrics keys */ @@ -84,7 +82,6 @@ public class RedisMetricRepository implements MetricRepository { * redis store will hold a zset under the key just so the metric names can be * enumerated. Read operations, especially {@link #findAll()} and {@link #count()}, * will only be accurate if the key is unique to the prefix of this repository. - * * @param redisConnectionFactory the redis connection factory * @param prefix the prefix to set for all metrics keys * @param key the key to set diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java index 7a58c5aae2..ac1fb0b55f 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java @@ -51,4 +51,5 @@ final class RedisUtils { RedisConnectionFactory redisConnectionFactory) { return new StringRedisTemplate(redisConnectionFactory); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java index 67f0c703b1..bfb62155b7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java @@ -78,4 +78,5 @@ public class InMemoryRichGaugeRepository implements RichGaugeRepository { public long count() { return this.repository.count(); } + } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java index 0c37cdb524..cb420b6b8a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java @@ -99,6 +99,7 @@ public class SimpleInMemoryRepository { /** * Callback used to update a value. + * * @param the value type */ public interface Callback { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java index 387cf3c42f..324f703eb4 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java @@ -64,8 +64,8 @@ public class AuthorizationAuditListener extends AbstractAuthorizationAuditListen if (event.getAuthentication().getDetails() != null) { data.put("details", event.getAuthentication().getDetails()); } - publish(new AuditEvent(event.getAuthentication().getName(), - AUTHORIZATION_FAILURE, data)); + publish(new AuditEvent(event.getAuthentication().getName(), AUTHORIZATION_FAILURE, + data)); } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java index 41040404cc..44be6a71d2 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java @@ -101,6 +101,7 @@ public class AuditAutoConfigurationTests { } public static class TestAuditEventRepository extends InMemoryAuditEventRepository { + } @Configuration diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java index c678ba66af..49b888c13c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java @@ -558,6 +558,7 @@ public class HealthIndicatorAutoConfigurationTests { public JestClient jestClient() { return mock(JestClient.class); } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java index b9f6d8b10f..92b0446854 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java @@ -274,11 +274,13 @@ public class ManagementWebSecurityAutoConfigurationTests { @EnableGlobalAuthentication @Configuration static class AuthenticationConfig { + @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication().withUser("user").password("password") .roles("USER"); } + } @Configuration diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java index 088b8824ea..3027b7759f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java @@ -279,6 +279,7 @@ public class PublicMetricsAutoConfigurationTests { public DataSource commonsDbcpDataSource() { return InitializedBuilder.create().type(BasicDataSource.class).build(); } + } @Configuration @@ -295,6 +296,7 @@ public class PublicMetricsAutoConfigurationTests { public DataSource commonsDbcpDataSource() { return InitializedBuilder.create().type(BasicDataSource.class).build(); } + } @Configuration @@ -311,6 +313,7 @@ public class PublicMetricsAutoConfigurationTests { public DataSource dataSource() { return InitializedBuilder.create().type(BasicDataSource.class).build(); } + } @Configuration @@ -326,6 +329,7 @@ public class PublicMetricsAutoConfigurationTests { } }; } + } @Configuration @@ -386,4 +390,5 @@ public class PublicMetricsAutoConfigurationTests { } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpointTests.java index 375d184ea6..71221802e2 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpointTests.java @@ -84,6 +84,7 @@ public class AutoConfigurationReportEndpointTests public AutoConfigurationReportEndpoint endpoint() { return new AutoConfigurationReportEndpoint(); } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java index 1e04a313cd..75157a987a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointParentTests.java @@ -87,10 +87,12 @@ public class ConfigurationPropertiesReportEndpointParentTests { @Configuration @EnableConfigurationProperties public static class Parent { + @Bean public TestProperties testProperties() { return new TestProperties(); } + } @Configuration @@ -127,6 +129,7 @@ public class ConfigurationPropertiesReportEndpointParentTests { } public static class OtherProperties { + } @ConfigurationProperties(prefix = "test") @@ -143,4 +146,5 @@ public class ConfigurationPropertiesReportEndpointParentTests { } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java index d3f488b7b5..2c9535437e 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java @@ -318,6 +318,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { } public static class Bar { + private String name = "123456"; public String getName() { @@ -327,6 +328,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { public void setName(String name) { this.name = name; } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java index a5da90428b..b8ebfe91d9 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java @@ -186,10 +186,12 @@ public class ConfigurationPropertiesReportEndpointTests @Configuration @EnableConfigurationProperties public static class Parent { + @Bean public TestProperties testProperties() { return new TestProperties(); } + } @Configuration @@ -281,4 +283,5 @@ public class ConfigurationPropertiesReportEndpointTests } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java index e95b5e3561..40cc2233b3 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java @@ -54,4 +54,5 @@ public class DumpEndpointTests extends AbstractEndpointTests { } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java index 62df5f8b0d..71ce4c33b7 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java @@ -204,4 +204,5 @@ public class EnvironmentEndpointTests extends AbstractEndpointTests { public HealthAggregator healthAggregator() { return new OrderedHealthAggregator(); } + } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java index dbf0edc3e7..38819cd6ae 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java @@ -111,4 +111,5 @@ public class MetricsEndpointTests extends AbstractEndpointTests } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java index 569d64f338..9b7b0dacb1 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java @@ -126,6 +126,7 @@ public class RequestMappingEndpointTests { @Configuration protected static class MappingConfiguration { + @Bean @Lazy @Scope(proxyMode = ScopedProxyMode.TARGET_CLASS) @@ -134,5 +135,7 @@ public class RequestMappingEndpointTests { mapping.setUrlMap(Collections.singletonMap("/foo", new Object())); return mapping; } + } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java index ccb9f79c02..93d6f24577 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java @@ -102,4 +102,5 @@ public class ShutdownEndpointTests extends AbstractEndpointTests { repository.add(Collections.singletonMap("a", "b")); return new TraceEndpoint(repository); } + } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java index 981459dcd2..efc37364e8 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java @@ -269,8 +269,8 @@ public class EndpointMBeanExporterTests { MBeanExporter mbeanExporter = registerLoggersEndpoint(); Object response = mbeanExporter.getServer().invoke( getObjectName("loggersEndpoint", this.context), "setLogLevel", - new Object[]{"com.example", "trace"}, - new String[]{String.class.getName(), String.class.getName()}); + new Object[] { "com.example", "trace" }, + new String[] { String.class.getName(), String.class.getName() }); assertThat(response).isNull(); } @@ -280,10 +280,9 @@ public class EndpointMBeanExporterTests { this.thrown.expect(MBeanException.class); this.thrown.expectCause(hasMessage(containsString("No enum constant"))); this.thrown.expectCause(hasMessage(containsString("LogLevel.INVALID"))); - mbeanExporter.getServer().invoke( - getObjectName("loggersEndpoint", this.context), "setLogLevel", - new Object[]{"com.example", "invalid"}, - new String[]{String.class.getName(), String.class.getName()}); + mbeanExporter.getServer().invoke(getObjectName("loggersEndpoint", this.context), + "setLogLevel", new Object[] { "com.example", "invalid" }, + new String[] { String.class.getName(), String.class.getName() }); } private MBeanExporter registerLoggersEndpoint() { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java index 403c30cbdc..8b7e4fbaea 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointContextPathTests.java @@ -90,14 +90,17 @@ public class JolokiaMvcEndpointContextPathTests { EndpointWebMvcAutoConfiguration.class, JolokiaAutoConfiguration.class, ManagementServerPropertiesAutoConfiguration.class }) public static class Config { + } public static class ContextPathListener implements ApplicationContextInitializer { + @Override public void initialize(ConfigurableApplicationContext context) { EnvironmentTestUtils.addEnvironment(context, "management.contextPath:/admin"); } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java index 8ba503307f..c5c04e82b6 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java @@ -101,6 +101,7 @@ public class MvcEndpointsTests { public String invoke() { return "foo"; } + } private static class TestMvcEndpoint extends EndpointMvcAdapter { @@ -108,6 +109,7 @@ public class MvcEndpointsTests { TestMvcEndpoint(Endpoint delegate) { super(delegate); } + } private static class OtherTestMvcEndpoint extends EndpointMvcAdapter { @@ -115,6 +117,7 @@ public class MvcEndpointsTests { OtherTestMvcEndpoint(Endpoint delegate) { super(delegate); } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java index dd39019987..2879828095 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java @@ -235,4 +235,5 @@ public class ElasticsearchHealthIndicatorTests { } } + } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java index 6eee34fc3a..ec745b1646 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java @@ -33,6 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DropwizardMetricServicesTests { private final MetricRegistry registry = new MetricRegistry(); + private final DropwizardMetricServices writer = new DropwizardMetricServices( this.registry); @@ -89,7 +90,6 @@ public class DropwizardMetricServicesTests { * thread is updating the same set of metrics. This would be an example case of the * writer being used with the MetricsFilter handling several requests/sec to the same * URL. - * * @throws Exception if an error occurs */ @Test diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java index 12d4c2279c..9f4ba580ac 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java @@ -53,10 +53,12 @@ public class SpringIntegrationMetricReaderTests { @Configuration @Import({ JmxAutoConfiguration.class, IntegrationAutoConfiguration.class }) protected static class TestConfiguration { + @Bean public SpringIntegrationMetricReader reader(IntegrationMBeanExporter exporter) { return new SpringIntegrationMetricReader(exporter); } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java index 5e829531fa..3a7afaee1f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java @@ -32,9 +32,12 @@ import static org.assertj.core.api.Assertions.assertThat; public class MultiMetricRichGaugeReaderTests { private InMemoryMetricRepository repository = new InMemoryMetricRepository(); + private MultiMetricRichGaugeReader reader = new MultiMetricRichGaugeReader( this.repository); + private InMemoryRichGaugeRepository data = new InMemoryRichGaugeRepository(); + private RichGaugeExporter exporter = new RichGaugeExporter(this.data, this.repository); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java index 580477399f..b1848800ec 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java @@ -86,8 +86,8 @@ public class AuthenticationAuditListenerTests { AuditApplicationEvent event = handleAuthenticationEvent( new AuthenticationSwitchUserEvent( new UsernamePasswordAuthenticationToken("user", "password"), - new User("user", "password", - AuthorityUtils.commaSeparatedStringToAuthorityList("USER")))); + new User("user", "password", AuthorityUtils + .commaSeparatedStringToAuthorityList("USER")))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthenticationAuditListener.AUTHENTICATION_SWITCH); } @@ -98,12 +98,12 @@ public class AuthenticationAuditListenerTests { UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken( "user", "password"); authentication.setDetails(details); - AuditApplicationEvent event = handleAuthenticationEvent(new AuthenticationFailureExpiredEvent( - authentication, new BadCredentialsException("Bad user"))); + AuditApplicationEvent event = handleAuthenticationEvent( + new AuthenticationFailureExpiredEvent(authentication, + new BadCredentialsException("Bad user"))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthenticationAuditListener.AUTHENTICATION_FAILURE); - assertThat(event.getAuditEvent().getData()) - .containsEntry("details", details); + assertThat(event.getAuditEvent().getData()).containsEntry("details", details); } private AuditApplicationEvent handleAuthenticationEvent( diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java index 7785202a52..e1410f3b37 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java @@ -56,7 +56,8 @@ public class AuthorizationAuditListenerTests { public void testAuthenticationCredentialsNotFound() { AuditApplicationEvent event = handleAuthorizationEvent( new AuthenticationCredentialsNotFoundEvent(this, - Collections.singletonList(new SecurityConfig("USER")), + Collections.singletonList( + new SecurityConfig("USER")), new AuthenticationCredentialsNotFoundException("Bad user"))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthenticationAuditListener.AUTHENTICATION_FAILURE); @@ -66,7 +67,8 @@ public class AuthorizationAuditListenerTests { public void testAuthorizationFailure() { AuditApplicationEvent event = handleAuthorizationEvent( new AuthorizationFailureEvent(this, - Collections.singletonList(new SecurityConfig("USER")), + Collections.singletonList( + new SecurityConfig("USER")), new UsernamePasswordAuthenticationToken("user", "password"), new AccessDeniedException("Bad user"))); assertThat(event.getAuditEvent().getType()) @@ -81,7 +83,8 @@ public class AuthorizationAuditListenerTests { authentication.setDetails(details); AuditApplicationEvent event = handleAuthorizationEvent( new AuthorizationFailureEvent(this, - Collections.singletonList(new SecurityConfig("USER")), + Collections.singletonList( + new SecurityConfig("USER")), authentication, new AccessDeniedException("Bad user"))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthorizationAuditListener.AUTHORIZATION_FAILURE); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java index eebf2ccb6d..1c9c2580a2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java @@ -95,4 +95,5 @@ public abstract class AbstractDependsOnBeanFactoryPostProcessor throw ex; } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java index af0a279c2e..62a307520a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java @@ -127,6 +127,7 @@ class AutoConfigurationSorter { } return rtn; } + } private static class AutoConfigurationClass { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java index 39005cd230..0ea5a3e4e3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java @@ -71,6 +71,7 @@ import org.springframework.retry.support.RetryTemplate; *
  • {@literal spring.rabbitmq.virtualHost} is used to specify the (optional) virtual * host to which the client should connect.
    • * + * * @author Greg Turnquist * @author Josh Long * @author Stephane Nicoll diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java index 45ec3688c3..094b46cbb7 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java @@ -47,12 +47,14 @@ public class AopAutoConfiguration { @EnableAspectJAutoProxy(proxyTargetClass = false) @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "false", matchIfMissing = true) public static class JdkDynamicAutoProxyConfiguration { + } @Configuration @EnableAspectJAutoProxy(proxyTargetClass = true) @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "true", matchIfMissing = false) public static class CglibAutoProxyConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java index bf92b24e35..9582a05f34 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java @@ -111,4 +111,5 @@ public class BatchProperties { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java index a086b46573..f30dc36067 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java @@ -101,6 +101,7 @@ public class CacheAutoConfiguration { * instantiation. */ static class CacheManagerValidatorPostProcessor implements BeanFactoryPostProcessor { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { @@ -120,6 +121,7 @@ public class CacheAutoConfiguration { result[result.length - 1] = value; return result; } + } /** @@ -141,6 +143,7 @@ public class CacheAutoConfiguration { + "be auto-configured, check your configuration (caching " + "type is '" + this.cacheProperties.getType() + "')"); } + } /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastInstanceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastInstanceConfiguration.java index bc528d1aa3..667f6e29b3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastInstanceConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastInstanceConfiguration.java @@ -67,6 +67,7 @@ abstract class HazelcastInstanceConfiguration { existingHazelcastInstance); return this.customizers.customize(cacheManager); } + } @Configuration diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java index 8d6538d320..907e65310d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java @@ -159,10 +159,12 @@ class JCacheCacheConfiguration { @Conditional(JCacheProviderAvailableCondition.class) static class JCacheProvider { + } @ConditionalOnSingleCandidate(CacheManager.class) static class CustomJCacheCacheManager { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java index 17cecda76a..05ab9e995a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java @@ -264,6 +264,7 @@ public final class ConditionEvaluationReport { public String toString() { return this.condition.getClass() + " " + this.outcome; } + } private static class AncestorsMatchedCondition implements Condition { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java index 65a410892c..0b45d2f629 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java @@ -228,8 +228,8 @@ public final class ConditionMessage { /** * Indicate that one or more results were found. For example - * {@code found("bean", "beans").items("x", "y")} results in the message - * "found beans x, y". + * {@code found("bean", "beans").items("x", "y")} results in the message "found + * beans x, y". * @param singular the article found in singular form * @param plural the article found in plural form * @return an {@link ItemsBuilder} @@ -240,8 +240,8 @@ public final class ConditionMessage { /** * Indicate that one or more results were not found. For example - * {@code didNotFind("bean").items("x")} results in the message - * "did not find bean x". + * {@code didNotFind("bean").items("x")} results in the message "did not find bean + * x". * @param article the article found * @return an {@link ItemsBuilder} */ @@ -251,8 +251,8 @@ public final class ConditionMessage { /** * Indicate that one or more results were found. For example - * {@code didNotFind("bean", "beans").items("x", "y")} results in the message - * "did not find beans x, y". + * {@code didNotFind("bean", "beans").items("x", "y")} results in the message "did + * not find beans x, y". * @param singular the article found in singular form * @param plural the article found in plural form * @return an {@link ItemsBuilder} @@ -330,8 +330,8 @@ public final class ConditionMessage { /** * Used when no items are available. For example - * {@code didNotFind("any beans").atAll()} results in the message - * "did not find any beans". + * {@code didNotFind("any beans").atAll()} results in the message "did not find + * any beans". * @return a built {@link ConditionMessage} */ public ConditionMessage atAll() { @@ -340,8 +340,8 @@ public final class ConditionMessage { /** * Indicate the items. For example - * {@code didNotFind("bean", "beans").items("x", "y")} results in the message - * "did not find beans x, y". + * {@code didNotFind("bean", "beans").items("x", "y")} results in the message "did + * not find beans x, y". * @param items the items (may be {@code null}) * @return a built {@link ConditionMessage} */ @@ -351,8 +351,8 @@ public final class ConditionMessage { /** * Indicate the items. For example - * {@code didNotFind("bean", "beans").items("x", "y")} results in the message - * "did not find beans x, y". + * {@code didNotFind("bean", "beans").items("x", "y")} results in the message "did + * not find beans x, y". * @param style the render style * @param items the items (may be {@code null}) * @return a built {@link ConditionMessage} diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java index 08ac22aba7..4bfa2abf05 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplication.java @@ -35,4 +35,5 @@ import org.springframework.context.annotation.Conditional; @Documented @Conditional(OnWebApplicationCondition.class) public @interface ConditionalOnWebApplication { + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java index 34a43d2af5..a981ac9e47 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java @@ -439,6 +439,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit Assert.isTrue(getTypes().size() == 1, annotationName() + " annotations must " + "specify only one type (got " + getTypes() + ")"); } + } static final class BeanTypeDeductionException extends RuntimeException { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java index 2437740a2c..aee7c60c34 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java @@ -134,10 +134,12 @@ public class CouchbaseAutoConfiguration { @Conditional(OnBootstrapHostsCondition.class) static class BootstrapHostsProperty { + } @ConditionalOnBean(type = "org.springframework.data.couchbase.config.CouchbaseConfigurer") static class CouchbaseConfigurerAvailable { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigureRegistrar.java index 406a021166..82b922ef9e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraRepositoriesAutoConfigureRegistrar.java @@ -51,6 +51,7 @@ class CassandraRepositoriesAutoConfigureRegistrar @EnableCassandraRepositories private static class EnableCassandraRepositoriesConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigureRegistrar.java index c95daf527a..d9883ef0ef 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigureRegistrar.java @@ -51,5 +51,7 @@ class JpaRepositoriesAutoConfigureRegistrar @EnableJpaRepositories private static class EnableJpaRepositoriesConfiguration { + } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigureRegistrar.java index 16d44ccba2..52ec64be5e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigureRegistrar.java @@ -50,6 +50,7 @@ class MongoRepositoriesAutoConfigureRegistrar @EnableMongoRepositories private static class EnableMongoRepositoriesConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java index 2239cc4bc7..8c6d3ddfdf 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java @@ -256,4 +256,5 @@ public class RedisProperties { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java index 537ce836a8..f63a4f6b71 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java @@ -133,4 +133,5 @@ public class FlywayProperties { public boolean isCreateDataSource() { return this.url != null && this.user != null; } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java index 6022fd3441..5dd6281f52 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java @@ -164,4 +164,5 @@ public class FreeMarkerAutoConfiguration { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java index b4cf1b6cc0..a4827c0be8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java @@ -95,4 +95,5 @@ public class H2ConsoleProperties { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java index 02a2489513..06e8b9b2f9 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java @@ -126,4 +126,5 @@ public class HypermediaAutoConfiguration { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java index c5b0015c06..1f280dc9cf 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java @@ -57,6 +57,7 @@ public class IntegrationAutoConfiguration { @Configuration @EnableIntegration protected static class IntegrationConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java index 6b7ec2bfff..c9646c00bc 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -95,6 +95,7 @@ public class DataSourceAutoConfiguration { @ConditionalOnMissingBean({ DataSource.class, XADataSource.class }) @Import(EmbeddedDataSourceConfiguration.class) protected static class EmbeddedDatabaseConfiguration { + } @Configuration @@ -140,10 +141,12 @@ public class DataSourceAutoConfiguration { @ConditionalOnProperty(prefix = "spring.datasource", name = "type") static class ExplicitType { + } @Conditional(PooledDataSourceAvailableCondition.class) static class PooledDataSourceAvailable { + } } @@ -177,6 +180,7 @@ public class DataSourceAutoConfiguration { .findType(); return (dataSourceClass == null ? null : dataSourceClass.getClassLoader()); } + } /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java index dde619245f..bbe619a7bb 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java @@ -124,8 +124,8 @@ class DataSourceInitializer implements ApplicationListener getScripts(String propertyName, - List resources, String fallback) { + private List getScripts(String propertyName, List resources, + String fallback) { if (resources != null) { return getResources(propertyName, resources, true); } @@ -136,8 +136,8 @@ class DataSourceInitializer implements ApplicationListener getResources(String propertyName, - List locations, boolean validate) { + private List getResources(String propertyName, List locations, + boolean validate) { List resources = new ArrayList(); for (String location : locations) { for (Resource resource : doGetResources(location)) { 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 8391a08010..988cce147a 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 @@ -117,7 +117,6 @@ public enum EmbeddedDatabaseConnection { /** * Convenience method to determine if a given driver class name represents an embedded * database type. - * * @param driverClass the driver class * @return true if the driver class is one of the embedded types */ @@ -130,7 +129,6 @@ public enum EmbeddedDatabaseConnection { /** * Convenience method to determine if a given data source represents an embedded * database type. - * * @param dataSource the data source to interrogate * @return true if the data source is one of the embedded types */ @@ -186,4 +184,5 @@ public enum EmbeddedDatabaseConnection { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java index 348e09e822..357aafa42a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java @@ -228,6 +228,7 @@ public class JerseyAutoConfiguration implements ServletContextAware { // will try and register a ContextLoaderListener which we don't need servletContext.setInitParameter("contextConfigLocation", ""); } + } @ConditionalOnClass(JacksonFeature.class) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java index f66daadeda..77e56b032e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java @@ -85,7 +85,9 @@ public class JerseyProperties { } public enum Type { + SERVLET, FILTER + } public static class Filter { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java index 3a3a3a8957..5a83a02792 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java @@ -85,6 +85,7 @@ class JmsAnnotationDrivenConfiguration { @EnableJms @ConditionalOnMissingBean(name = JmsListenerConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME) protected static class EnableJmsConfiguration { + } @ConditionalOnJndi diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java index 03d08fb056..3c76d05c6b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java @@ -101,6 +101,7 @@ public class JmsAutoConfiguration { } return jmsTemplate; } + } @ConditionalOnClass(JmsMessagingTemplate.class) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java index 2dea5b54fd..8a4b993945 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java @@ -130,6 +130,7 @@ public class JmsProperties { ? this.concurrency + "-" + this.maxConcurrency : String.valueOf(this.concurrency)); } + } public static class Template { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java index 9e5b32fb10..6d96d8ed16 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java @@ -95,10 +95,12 @@ public class JndiConnectionFactoryAutoConfiguration { @ConditionalOnJndi({ "java:/JmsXA", "java:/XAConnectionFactory" }) static class Jndi { + } @ConditionalOnProperty(prefix = "spring.jms", name = "jndi-name") static class Property { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java index 778f83df54..54d580bad1 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java @@ -30,8 +30,8 @@ import org.springframework.jdbc.support.SQLExceptionTranslator; import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator; /** - * Transforms {@link java.sql.SQLException} into a Spring-specific {@link - * DataAccessException}. + * Transforms {@link java.sql.SQLException} into a Spring-specific + * {@link DataAccessException}. * * @author Lukas Eder * @author Andreas Ahlenstorf @@ -66,8 +66,8 @@ class JooqExceptionTranslator extends DefaultExecuteListener { /** * Handle a single exception in the chain. SQLExceptions might be nested multiple - * levels deep. The outermost exception is usually the least interesting one ( - * "Call getNextException to see the cause."). Therefore the innermost exception is + * levels deep. The outermost exception is usually the least interesting one ("Call + * getNextException to see the cause."). Therefore the innermost exception is * propagated and all other exceptions are logged. * @param context the execute context * @param translator the exception translator diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java index 7c3f3e007a..62ad24bd91 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java @@ -122,6 +122,7 @@ public class LiquibaseAutoConfiguration { .username(this.properties.getUser()) .password(this.properties.getPassword()).build(); } + } /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java index f595cb6c01..a14095ba85 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java @@ -110,10 +110,12 @@ public class MailSenderAutoConfiguration { @ConditionalOnProperty(prefix = "spring.mail", name = "host") static class HostProperty { + } @ConditionalOnProperty(prefix = "spring.mail", name = "jndi-name") static class JndiNameProperty { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java index b8a657b52f..fa69691ae6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java @@ -194,7 +194,6 @@ public class MongoProperties { * {@code environment}. If the configured port is zero, the value of the * {@code local.mongo.port} property retrieved from the {@code environment} is used to * configure the client. - * * @param options the options * @param environment the environment * @return the Mongo client diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java index 6668bf5d77..dab227d2da 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java @@ -121,4 +121,5 @@ public class MustacheAutoConfiguration { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java index f8768a9262..0a714869c1 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java @@ -106,6 +106,7 @@ class DataSourceInitializedPublisher implements BeanPostProcessor { registry.registerBeanDefinition(BEAN_NAME, beanDefinition); } } + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java index be747339aa..e9d16accde 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java @@ -43,4 +43,5 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur @AutoConfigureAfter(SecurityAutoConfiguration.class) @EnableWebSecurity public class FallbackWebSecurityAutoConfiguration { + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java index f6de395a3e..aae7bc7590 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java @@ -171,7 +171,9 @@ public class SecurityProperties implements SecurityPrerequisite { public static class Headers { public enum HSTS { + NONE, DOMAIN, ALL + } public enum ContentSecurityPolicyMode { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java index ed904894bd..7335ddf2dc 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java @@ -237,6 +237,7 @@ public class SpringBootWebSecurityConfiguration { @Order(SecurityProperties.BASIC_AUTH_ORDER) protected static class ApplicationNoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter { + @Override protected void configure(HttpSecurity http) throws Exception { http.requestMatcher(new RequestMatcher() { @@ -246,6 +247,7 @@ public class SpringBootWebSecurityConfiguration { } }); } + } @Configuration diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java index 03899630fa..50ea0bc30a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java @@ -173,4 +173,5 @@ public class OAuth2RestOperationsConfiguration { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java index 03b2456f28..056f73a3f3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java @@ -251,6 +251,7 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware { } return null; } + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoRestTemplateCustomizer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoRestTemplateCustomizer.java index ad9074743b..0dc06f404f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoRestTemplateCustomizer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoRestTemplateCustomizer.java @@ -33,7 +33,6 @@ public interface UserInfoRestTemplateCustomizer { /** * Customize the rest template before it is initialized. - * * @param template the rest template */ void customize(OAuth2RestTemplate template); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java index 9b8ab21e9c..cc178685de 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java @@ -77,11 +77,14 @@ public class SendGridAutoConfiguration { @ConditionalOnProperty(prefix = "spring.sendgrid", value = "username") static class SendGridUserProperty { + } @ConditionalOnProperty(prefix = "spring.sendgrid", value = "api-key") static class SendGridApiKeyProperty { + } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java index ef447937a2..48866c2a84 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfiguration.java @@ -84,6 +84,7 @@ public class LinkedInAutoConfiguration { return new LinkedInConnectionFactory(this.properties.getAppId(), this.properties.getAppSecret()); } + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java index 44c00d7c53..0a76f81f1a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java @@ -146,6 +146,7 @@ public class SocialWebAutoConfiguration { } }; } + } @Configuration @@ -186,4 +187,5 @@ public class SocialWebAutoConfiguration { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index 48a4e19bd2..96d006f59e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -83,6 +83,7 @@ public class ThymeleafAutoConfiguration { public SpringResourceResourceResolver thymeleafResourceResolver() { return new SpringResourceResourceResolver(); } + } @Configuration diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index 7d4580fc37..c10098ce14 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -116,5 +116,7 @@ class BitronixJtaConfiguration { public BitronixXAConnectionFactoryWrapper xaConnectionFactoryWrapper() { return new BitronixXAConnectionFactoryWrapper(); } + } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java index b25d883443..628f346154 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java @@ -56,7 +56,8 @@ public class ValidationAutoConfiguration { @Bean @ConditionalOnMissingBean - public MethodValidationPostProcessor methodValidationPostProcessor(Validator validator) { + public MethodValidationPostProcessor methodValidationPostProcessor( + Validator validator) { MethodValidationPostProcessor processor = new MethodValidationPostProcessor(); processor.setValidator(validator); return processor; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java index 0bf9a78f98..c481ff290b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java @@ -167,4 +167,5 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered { } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java index 22563b78f0..ba2d797088 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpEncodingProperties.java @@ -113,7 +113,9 @@ public class HttpEncodingProperties { } enum Type { + REQUEST, RESPONSE + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index 3a30986772..662da3ebb4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -1535,6 +1535,7 @@ public class ServerProperties public void setRotate(boolean rotate) { this.rotate = rotate; } + } } @@ -1586,4 +1587,5 @@ public class ServerProperties } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java index c19631475f..b25d4523f6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java @@ -58,6 +58,7 @@ public class AutoConfigurationReproTests { @Configuration public static class Config { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java index 670ea46d21..5e76e1ed72 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java @@ -37,17 +37,29 @@ import static org.assertj.core.api.Assertions.assertThat; public class AutoConfigurationSorterTests { private static final String LOWEST = OrderLowest.class.getName(); + private static final String HIGHEST = OrderHighest.class.getName(); + private static final String A = AutoConfigureA.class.getName(); + private static final String B = AutoConfigureB.class.getName(); + private static final String C = AutoConfigureC.class.getName(); + private static final String D = AutoConfigureD.class.getName(); + private static final String E = AutoConfigureE.class.getName(); + private static final String W = AutoConfigureW.class.getName(); + private static final String X = AutoConfigureX.class.getName(); + private static final String Y = AutoConfigureY.class.getName(); + private static final String Z = AutoConfigureZ.class.getName(); + private static final String A2 = AutoConfigureA2.class.getName(); + private static final String W2 = AutoConfigureW2.class.getName(); @Rule diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java index af4c26e174..8cd11c1a36 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java @@ -79,21 +79,25 @@ public class ImportAutoConfigurationTests { @Configuration static class ConfigA { + } @Configuration @AutoConfigureAfter(ConfigA.class) static class ConfigB { + } @Configuration @AutoConfigureAfter(ConfigB.class) static class ConfigC { + } @Configuration @AutoConfigureAfter(ConfigC.class) static class ConfigD { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java index 07a9380190..40c514aac9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java @@ -55,4 +55,5 @@ public class MessageSourceAutoConfigurationIntegrationTests { protected static class Config { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java index 68d2cf8004..da2dda0ae0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationTests.java @@ -204,4 +204,5 @@ public class MessageSourceAutoConfigurationTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java index 9255e44254..c01d9a30f7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java @@ -420,10 +420,12 @@ public class RabbitAutoConfigurationTests { @Configuration protected static class TestConfiguration2 { + @Bean ConnectionFactory aDifferentConnectionFactory() { return new CachingConnectionFactory("otherserver", 8001); } + } @Configuration @@ -453,6 +455,7 @@ public class RabbitAutoConfigurationTests { messagingTemplate.setDefaultDestination("fooBar"); return messagingTemplate; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java index 2e1740b28b..ac756aabdb 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java @@ -83,6 +83,7 @@ public class AopAutoConfigurationTests { @Configuration protected static class TestConfiguration { + @Bean public TestAspect aspect() { return new TestAspect(); @@ -92,16 +93,20 @@ public class AopAutoConfigurationTests { public TestInterface bean() { return new TestBean(); } + } protected static class TestBean implements TestInterface { + @Override public void foo() { } + } @Aspect protected static class TestAspect { + private boolean called; public boolean isCalled() { @@ -112,6 +117,7 @@ public class AopAutoConfigurationTests { public void before() { this.called = true; } + } public interface TestInterface { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java index 3647b6a1f9..c668df5019 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -269,11 +269,13 @@ public class BatchAutoConfigurationTests { @Configuration protected static class EmptyConfiguration { + } @EnableBatchProcessing @TestAutoConfigurationPackage(City.class) protected static class TestConfiguration { + } @EnableBatchProcessing @@ -281,6 +283,7 @@ public class BatchAutoConfigurationTests { protected static class TestCustomConfiguration implements BatchConfigurer { private JobRepository jobRepository; + private MapJobRepositoryFactoryBean factory = new MapJobRepositoryFactoryBean(); @Override @@ -311,10 +314,12 @@ public class BatchAutoConfigurationTests { explorer.afterPropertiesSet(); return explorer.getObject(); } + } @EnableBatchProcessing protected static class NamedJobConfigurationWithRegisteredJob { + @Autowired private JobRegistry jobRegistry; @@ -351,6 +356,7 @@ public class BatchAutoConfigurationTests { job.setJobRepository(this.jobRepository); return job; } + } @EnableBatchProcessing @@ -382,10 +388,12 @@ public class BatchAutoConfigurationTests { job.setJobRepository(this.jobRepository); return job; } + } @EnableBatchProcessing protected static class JobConfiguration { + @Autowired private JobRepository jobRepository; @@ -412,6 +420,7 @@ public class BatchAutoConfigurationTests { job.setJobRepository(this.jobRepository); return job; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java index 63b239a7a0..fbe7b07deb 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java @@ -761,6 +761,7 @@ public class CacheAutoConfigurationTests { @Import({ GenericCacheConfiguration.class, CacheManagerCustomizersConfiguration.class }) static class GenericCacheAndCustomizersConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java index db65307cd7..eef34e9a64 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java @@ -35,7 +35,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyZeroInteractions; /** - * * @author Stephane Nicoll */ public class CacheManagerCustomizersTests { @@ -92,4 +91,5 @@ public class CacheManagerCustomizersTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java index 5639723bd2..e0378993bb 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java @@ -278,6 +278,7 @@ public class ConditionEvaluationReportTests { } } + } static class TestMatchCondition extends SpringBootCondition diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java index 8ac249f740..7a5aa7f43c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java @@ -160,19 +160,23 @@ public class ConditionalOnBeanTests { @Configuration @ConditionalOnBean(String.class) protected static class OnBeanClassConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnBean(type = "java.lang.String") protected static class OnBeanClassNameConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java index 16227d18b2..e4b6852287 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnClassTests.java @@ -111,4 +111,5 @@ public class ConditionalOnClassTests { protected static class CombinedXmlConfiguration { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java index 1acc974f35..b85966e7d1 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java @@ -51,18 +51,23 @@ public class ConditionalOnExpressionTests { @Configuration @ConditionalOnExpression("false") protected static class MissingConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnExpression("true") protected static class BasicConfiguration { + @Bean public String foo() { return "foo"; } + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java index 458b9f9877..80399a9829 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java @@ -164,28 +164,34 @@ public class ConditionalOnJavaTests { @Configuration @ConditionalOnJava(JavaVersion.NINE) static class Java9Required { + @Bean String foo() { return "foo"; } + } @Configuration @ConditionalOnJava(range = Range.OLDER_THAN, value = JavaVersion.EIGHT) static class Java7Required { + @Bean String foo() { return "foo"; } + } @Configuration @ConditionalOnJava(JavaVersion.EIGHT) static class Java8Required { + @Bean String foo() { return "foo"; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java index b148a14091..73b026face 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java @@ -157,6 +157,7 @@ public class ConditionalOnJndiTests { public String foo() { return "foo"; } + } @Configuration @@ -167,6 +168,7 @@ public class ConditionalOnJndiTests { public String foo() { return "foo"; } + } private static class MockableOnJndi extends OnJndiCondition { @@ -193,6 +195,7 @@ public class ConditionalOnJndiTests { public void setFoundLocation(String foundLocation) { this.foundLocation = foundLocation; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java index 350c652d27..f18122a24a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java @@ -423,6 +423,7 @@ public class ConditionalOnMissingBeanTests { @Configuration @Import(FactoryBeanRegistrar.class) protected static class RegisteredFactoryBeanConfiguration { + } protected static class FactoryBeanRegistrar implements ImportBeanDefinitionRegistrar { @@ -621,4 +622,5 @@ public class ConditionalOnMissingBeanTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java index c88c2c100f..1ca9e64b6e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClassTests.java @@ -52,27 +52,33 @@ public class ConditionalOnMissingClassTests { @Configuration @ConditionalOnMissingClass("org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClassTests") protected static class BasicConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnMissingClass("FOO") protected static class MissingConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration protected static class FooConfiguration { + @Bean public String foo() { return "foo"; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java index 3e65cf9b72..862a90e861 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java @@ -51,18 +51,23 @@ public class ConditionalOnNotWebApplicationTests { @Configuration @ConditionalOnWebApplication protected static class MissingConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnNotWebApplication protected static class BasicConfiguration { + @Bean public String foo() { return "foo"; } + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java index 738d35b649..13ae5bb448 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java @@ -461,4 +461,5 @@ public class ConditionalOnPropertyTests { public @interface ConditionalOnMyFeature { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java index fcc544bd5a..9f1d133566 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java @@ -61,27 +61,34 @@ public class ConditionalOnResourceTests { @Configuration @ConditionalOnResource(resources = "foo") protected static class MissingConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnResource(resources = "schema.sql") protected static class BasicConfiguration { + @Bean public String foo() { return "foo"; } + } @Configuration @ConditionalOnResource(resources = "${schema}") protected static class PlaceholderConfiguration { + @Bean public String foo() { return "foo"; } + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java index ec9bf8849c..dbc6a29771 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidateTests.java @@ -240,4 +240,5 @@ public class ConditionalOnSingleCandidateTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java index ce27493d32..4da7bd1156 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java @@ -54,18 +54,23 @@ public class ConditionalOnWebApplicationTests { @Configuration @ConditionalOnNotWebApplication protected static class MissingConfiguration { + @Bean public String bar() { return "bar"; } + } @Configuration @ConditionalOnWebApplication protected static class BasicConfiguration { + @Bean public String foo() { return "foo"; } + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java index 69b3766fe9..7cfd5440df 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java @@ -79,6 +79,7 @@ public class ResourceConditionTests { public String foo() { return "foo"; } + } @Configuration @@ -89,6 +90,7 @@ public class ResourceConditionTests { public String foo() { return "foo"; } + } private static class DefaultLocationResourceCondition extends ResourceCondition { @@ -96,6 +98,7 @@ public class ResourceConditionTests { DefaultLocationResourceCondition() { super("test", "spring.foo.test.", "config", "classpath:/logging.properties"); } + } private static class UnknownDefaultLocationResourceCondition @@ -107,4 +110,5 @@ public class ResourceConditionTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java index ea0745eaf7..a8eec3cb9b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java @@ -82,6 +82,7 @@ public class ConfigurationPropertiesAutoConfigurationTests { public void setName(String name) { this.name = name; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseTestServer.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseTestServer.java index 2e948be8f9..6c5584a646 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseTestServer.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseTestServer.java @@ -117,6 +117,7 @@ public class CouchbaseTestServer implements TestRule { } } } + } private static class SkipStatement extends Statement { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java index 655a5b86bb..a8f9065bc4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java @@ -99,6 +99,7 @@ public class PersistenceExceptionTranslationAutoConfigurationTests { public TestRepository testRepository(EntityManagerFactory entityManagerFactory) { return new TestRepository(entityManagerFactory.createEntityManager()); } + } @Repository @@ -113,6 +114,7 @@ public class PersistenceExceptionTranslationAutoConfigurationTests { public void doSomething() { this.entityManager.persist(null); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java index 5abd9020c9..c7f1200b6f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/couchbase/CityCouchbaseRepository.java @@ -23,4 +23,5 @@ import org.springframework.data.repository.Repository; * @author Eddú Meléndez */ public interface CityCouchbaseRepository extends Repository { + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/city/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/city/City.java index 2ddbe1c7b6..09d49e9cdc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/city/City.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/city/City.java @@ -81,4 +81,5 @@ public class City { public void setMap(String map) { this.map = map; } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java index 03fc86bbf2..dd67090097 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java @@ -110,4 +110,5 @@ public class ElasticsearchRepositoriesAutoConfigurationTests { protected static class CustomizedConfiguration { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/City.java index ed5cd9f9d8..f4da81c4e4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/City.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/city/City.java @@ -66,4 +66,5 @@ public class City implements Serializable { public String toString() { return getName() + "," + getState() + "," + getCountry(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java index 7c90cb449c..b10d2e4538 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java @@ -112,4 +112,5 @@ public class JpaRepositoriesAutoConfigurationTests { protected static class SortOfInvalidCustomConfiguration { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/city/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/city/City.java index cc26cf7294..756fce5e32 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/city/City.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/city/City.java @@ -73,4 +73,5 @@ public class City implements Serializable { public String toString() { return getName() + "," + getState() + "," + getCountry(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java index 579d6b1b1d..521e759cde 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java @@ -166,6 +166,7 @@ public class MixedMongoRepositoriesAutoConfigurationTests { } return names.toArray(new String[0]); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java index e7f728cf1b..566751c01f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java @@ -201,6 +201,7 @@ public class MongoDataAutoConfigurationTests { public CustomConversions customConversions() { return new CustomConversions(Arrays.asList(new MyConverter())); } + } @Configuration @@ -223,4 +224,5 @@ public class MongoDataAutoConfigurationTests { LocalDateTime date; } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java index 42f851f6b6..c86dfeb056 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoRepositoriesAutoConfigurationTests.java @@ -127,4 +127,5 @@ public class MongoRepositoriesAutoConfigurationTests { protected static class SortOfInvalidCustomConfiguration { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/city/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/city/City.java index b73e896281..8485f09227 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/city/City.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/city/City.java @@ -74,4 +74,5 @@ public class City implements Serializable { public String toString() { return getName() + "," + getState() + "," + getCountry(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/country/Country.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/country/Country.java index 2700efc4af..7279d7c12b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/country/Country.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/country/Country.java @@ -52,4 +52,5 @@ public class Country implements Serializable { public String toString() { return getName(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java index 327fdfe078..821b791c24 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java @@ -165,6 +165,7 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { } return names.toArray(new String[names.size()]); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java index 778ee1b864..3225429455 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java @@ -111,5 +111,7 @@ public class SolrRepositoriesAutoConfigurationTests { // To not find any repositories @EnableSolrRepositories("foo.bar") protected static class SortOfInvalidCustomConfiguration { + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java index 22fb4b46a2..d2557dee36 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java @@ -26,4 +26,5 @@ import org.springframework.data.repository.Repository; public interface CityRepository extends Repository { Page findByNameStartingWith(String name, Pageable page); + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java index 6890bf20a9..c9426e6171 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java @@ -269,6 +269,7 @@ public class FlywayAutoConfigurationTests { initializer.setOrder(Ordered.HIGHEST_PRECEDENCE); return initializer; } + } @Configuration @@ -310,6 +311,7 @@ public class FlywayAutoConfigurationTests { public void assertCalled() { assertThat(this.called).isTrue(); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java index fed629eeaa..b608a98e97 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java @@ -456,6 +456,7 @@ public class JacksonAutoConfigurationTests { public MyDateFormat() { super("yyyy-MM-dd HH:mm:ss"); } + } @Configuration @@ -568,6 +569,7 @@ public class JacksonAutoConfigurationTests { public void setPropertyName(String propertyName) { this.propertyName = propertyName; } + } @JsonComponent diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java index 99563aaf57..8417a4e794 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java @@ -297,9 +297,8 @@ public class DataSourceInitializerTests { PropertyPlaceholderAutoConfiguration.class); EnvironmentTestUtils.addEnvironment(this.context, "spring.datasource.initialize:true", - "spring.datasource.schema:" - + ClassUtils.addResourcePathToPackagePath(getClass(), - "schema.sql"), + "spring.datasource.schema:" + ClassUtils + .addResourcePathToPackagePath(getClass(), "schema.sql"), "spring.datasource.data:classpath:does/not/exist.sql"); this.thrown.expect(BeanCreationException.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java index 3c382e2b8d..60bf306a41 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java @@ -76,6 +76,7 @@ public class DataSourceJsonSerializationTests { @JsonSerialize(using = TomcatDataSourceSerializer.class) protected interface DataSourceJson { + } protected static class TomcatDataSourceSerializer extends JsonSerializer { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java index e5cfcc225d..e1ceb09b7d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java @@ -149,6 +149,7 @@ public class JndiDataSourceAutoConfigurationTests { MBeanExporter mbeanExporter() { return new MBeanExporter(); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/metadata/HikariDataSourcePoolMetadataTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/metadata/HikariDataSourcePoolMetadataTests.java index a17bbdcdd9..49ce2cf370 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/metadata/HikariDataSourcePoolMetadataTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/metadata/HikariDataSourcePoolMetadataTests.java @@ -57,4 +57,5 @@ public class HikariDataSourcePoolMetadataTests dataSource.setMaximumPoolSize(maxSize); return dataSource; } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java index 77837a5dcc..5d5fd9b109 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java @@ -100,6 +100,7 @@ public class JerseyAutoConfigurationCustomFilterContextPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java index 8f6d235838..32afffbe3b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java @@ -99,6 +99,7 @@ public class JerseyAutoConfigurationCustomFilterPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java index ef2aa7baf7..d6f6974e19 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java @@ -43,6 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link JerseyAutoConfiguration} when using custom load on startup. + * * @author Stephane Nicoll */ @RunWith(SpringRunner.class) @@ -77,6 +78,7 @@ public class JerseyAutoConfigurationCustomLoadOnStartupTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java index 0bc1a88e89..2ea08f6573 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java @@ -100,6 +100,7 @@ public class JerseyAutoConfigurationCustomServletContextPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java index eecfe983b0..88c2b740a4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java @@ -100,6 +100,7 @@ public class JerseyAutoConfigurationCustomServletPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java index 7e869d7eb2..2b331d9647 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java @@ -97,6 +97,7 @@ public class JerseyAutoConfigurationDefaultFilterPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java index 57169bddd3..1e5b79f671 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java @@ -98,6 +98,7 @@ public class JerseyAutoConfigurationDefaultServletPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java index 7f278fbb6b..489597b39b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationWithoutApplicationPathTests.java @@ -97,6 +97,7 @@ public class JerseyAutoConfigurationWithoutApplicationPathTests { ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java index 522de557bd..4593ba4f60 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java @@ -412,6 +412,7 @@ public class JmsAutoConfigurationTests { @Configuration protected static class TestConfiguration { + } @Configuration @@ -552,6 +553,7 @@ public class JmsAutoConfigurationTests { return factory; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java index 37c45cfb45..0398a035d4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java @@ -359,6 +359,7 @@ public class ArtemisAutoConfigurationTests { } }); } + } @Configuration @@ -386,6 +387,7 @@ public class ArtemisAutoConfigurationTests { topicConfiguration.setBindings("/topic/1"); return topicConfiguration; } + } @Configuration @@ -400,6 +402,7 @@ public class ArtemisAutoConfigurationTests { config.getQueueConfigurations().add(jmsQueueConfiguration); return config; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java index d6ae181503..0be6348e35 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java @@ -177,4 +177,5 @@ public class JmxAutoConfigurationTests { } } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java index 952444ebd6..4e38cd9bba 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java @@ -220,10 +220,12 @@ public class AutoConfigurationReportLoggingInitializerTests { @Configuration @Import(WebMvcAutoConfiguration.class) static class ErrorConfig { + @Bean public String iBreak() { throw new RuntimeException(); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java index 1b9ae16467..19104e9f4a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java @@ -60,6 +60,7 @@ public class MustacheAutoConfigurationIntegrationTests { @Autowired private EmbeddedWebApplicationContext context; + private int port; @Before @@ -117,6 +118,7 @@ public class MustacheAutoConfigurationIntegrationTests { DispatcherServletAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java index b1a3784b79..9bd164815d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java @@ -66,6 +66,7 @@ public class MustacheWebIntegrationTests { @Autowired private EmbeddedWebApplicationContext context; + private int port; @Before @@ -143,6 +144,7 @@ public class MustacheWebIntegrationTests { DispatcherServletAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java index dc079933bf..56c866708e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java @@ -308,6 +308,7 @@ public abstract class AbstractJpaAutoConfigurationTests { @SuppressWarnings("serial") static class CustomJpaTransactionManager extends JpaTransactionManager { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java index 9daadab838..fb5fbf1f0a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java @@ -106,4 +106,5 @@ public class CustomHibernateJpaAutoConfigurationTests { protected static class TestConfiguration { } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java index 4708c9e6e6..d32fda3523 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/test/City.java @@ -75,4 +75,5 @@ public class City implements Serializable { public String toString() { return getName() + "," + getState() + "," + getCountry(); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java index 2ea6929ac0..9d7f81e547 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java @@ -410,6 +410,7 @@ public class SecurityAutoConfigurationTests { public void onApplicationEvent(AbstractAuthenticationEvent event) { this.event = event; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java index 95e6f3787d..dbfc8e27c1 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java @@ -297,6 +297,7 @@ public class SpringBootWebSecurityConfigurationTests { @MinimalWebConfiguration @Import(SecurityAutoConfiguration.class) protected static class VanillaWebConfiguration { + } @MinimalWebConfiguration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java index d06d6fdff6..4a6e447d88 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java @@ -59,6 +59,7 @@ public class JpaUserDetailsTests { PropertyPlaceholderAutoConfiguration.class, SecurityAutoConfiguration.class }) @ComponentScan(basePackageClasses = SecurityConfig.class) public static class Main { + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java index 32a6807bef..f5a75ebdcc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java @@ -425,6 +425,7 @@ public class OAuth2AutoConfigurationTests { @Configuration @EnableOAuth2Client protected static class ClientConfiguration extends TestSecurityConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java index e25a2a4060..f2af3edc66 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java @@ -54,4 +54,5 @@ public class FacebookAutoConfigurationTests extends AbstractSocialAutoConfigurat assertNoConnectionFrameworkBeans(); assertMissingBean(Facebook.class); } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java index 99202004ef..cbb9ed50a2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java @@ -94,6 +94,7 @@ public class TransactionAutoConfigurationTests { @Configuration static class EmptyConfiguration { + } @Configuration @@ -108,6 +109,7 @@ public class TransactionAutoConfigurationTests { public PlatformTransactionManager transactionManagerTwo() { return mock(PlatformTransactionManager.class); } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java index e0a7a7b097..f57b84e2fa 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java @@ -284,6 +284,7 @@ public class JtaAutoConfigurationTests { XADataSource dataSource = mock(XADataSource.class); return wrapper.wrapDataSource(dataSource); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java index 8bec1437e8..b9337677dd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java @@ -67,14 +67,15 @@ public class ValidationAutoConfigurationTests { public void userDefinedMethodValidationPostProcessorTakesPrecedence() { load(SampleConfiguration.class); assertThat(this.context.getBeansOfType(Validator.class)).hasSize(1); - Object userMethodValidationPostProcessor = - this.context.getBean("testMethodValidationPostProcessor"); + Object userMethodValidationPostProcessor = this.context + .getBean("testMethodValidationPostProcessor"); assertThat(this.context.getBean(MethodValidationPostProcessor.class)) .isSameAs(userMethodValidationPostProcessor); assertThat(this.context.getBeansOfType(MethodValidationPostProcessor.class)) .hasSize(1); - assertThat(this.context.getBean(Validator.class)).isNotSameAs( - new DirectFieldAccessor(userMethodValidationPostProcessor).getPropertyValue("validator")); + assertThat(this.context.getBean(Validator.class)) + .isNotSameAs(new DirectFieldAccessor(userMethodValidationPostProcessor) + .getPropertyValue("validator")); } public void load(Class config) { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java index c1f8180840..d57fd82acf 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerDirectMockMvcTests.java @@ -130,6 +130,7 @@ public class BasicErrorControllerDirectMockMvcTests { HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java index 031460be0f..6bcea6e7cd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java @@ -132,6 +132,7 @@ public class BasicErrorControllerMockMvcTests { HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java index 7559dfea28..edc47133d4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java @@ -114,6 +114,7 @@ public class DefaultErrorViewIntegrationTests { HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected @interface MinimalWebConfiguration { + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java index 6e3b7475e7..17ee52e46b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java @@ -243,6 +243,7 @@ public class DispatcherServletAutoConfigurationTests { public String dispatcherServlet() { return "spring"; } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java index a983055953..eff864c1e0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java @@ -247,10 +247,12 @@ public class EmbeddedServletContainerAutoConfigurationTests { @Component public static class CallbackEmbeddedContainerCustomizer implements EmbeddedServletContainerCustomizer { + @Override public void customize(ConfigurableEmbeddedServletContainer container) { container.setPort(9000); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java index c3ac6b3282..b8a879aaa5 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java @@ -240,10 +240,12 @@ public class HttpMessageConvertersAutoConfigurationTests { @Configuration protected static class JacksonObjectMapperConfig { + @Bean public ObjectMapper objectMapper() { return new ObjectMapper(); } + } @Configuration @@ -258,6 +260,7 @@ public class HttpMessageConvertersAutoConfigurationTests { public Jackson2ObjectMapperBuilder builder() { return new Jackson2ObjectMapperBuilder(); } + } @Configuration @@ -270,6 +273,7 @@ public class HttpMessageConvertersAutoConfigurationTests { converter.setObjectMapper(objectMapper); return converter; } + } @Configuration @@ -281,6 +285,7 @@ public class HttpMessageConvertersAutoConfigurationTests { converter.setGson(gson); return converter; } + } @Configuration @@ -290,6 +295,7 @@ public class HttpMessageConvertersAutoConfigurationTests { public StringHttpMessageConverter customStringMessageConverter() { return new StringHttpMessageConverter(); } + } @Configuration @@ -300,6 +306,7 @@ public class HttpMessageConvertersAutoConfigurationTests { return new TypeConstrainedMappingJackson2HttpMessageConverter( ResourceSupport.class); } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java index 943ba04806..ae64e4427c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java @@ -223,10 +223,12 @@ public class MultipartAutoConfigurationTests { @Configuration public static class ContainerWithNothing { + } @Configuration public static class ContainerWithNoMultipartJetty { + @Bean JettyEmbeddedServletContainerFactory containerFactory() { return new JettyEmbeddedServletContainerFactory(); @@ -236,10 +238,12 @@ public class MultipartAutoConfigurationTests { WebController controller() { return new WebController(); } + } @Configuration public static class ContainerWithNoMultipartUndertow { + @Bean UndertowEmbeddedServletContainerFactory containerFactory() { return new UndertowEmbeddedServletContainerFactory(); @@ -249,6 +253,7 @@ public class MultipartAutoConfigurationTests { WebController controller() { return new WebController(); } + } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java index 478772ba3a..17e0fbf30d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java @@ -754,6 +754,7 @@ public class WebMvcAutoConfigurationTests { private static class CustomWebBindingInitializer extends ConfigurableWebBindingInitializer { + } @Configuration @@ -780,6 +781,7 @@ public class WebMvcAutoConfigurationTests { }; } + } private static class MyRequestMappingHandlerMapping @@ -801,6 +803,7 @@ public class WebMvcAutoConfigurationTests { }; } + } private static class MyRequestMappingHandlerAdapter diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java index 5cd224a0ce..06f041bd62 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/HelpExample.java @@ -45,4 +45,5 @@ public class HelpExample { public String getExample() { return this.example; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java index ab0723e6f2..ca9ffef894 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java @@ -111,4 +111,5 @@ public class HintCommand extends AbstractCommand { } return false; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java index 8da6a669b1..305938d0f8 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java @@ -182,5 +182,7 @@ public class OptionHandler { public String getUsageHelp() { return this.description; } + } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java index d6e76aae76..cd7cc9f258 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionSetGroovyCompilerConfiguration.java @@ -91,4 +91,5 @@ public class OptionSetGroovyCompilerConfiguration implements GroovyCompilerConfi public List getRepositoryConfiguration() { return this.repositoryConfiguration; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java index 7878b6293d..8f301372d0 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/RunCommand.java @@ -148,7 +148,9 @@ public class RunCommand extends OptionParsingCommand { } return Level.INFO; } + } + } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java index 162fe15e1b..a7920921c3 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java @@ -92,7 +92,6 @@ public class SpringApplicationRunner { /** * Compile and run the application. - * * @throws Exception on error */ public void compileAndRun() throws Exception { @@ -203,6 +202,7 @@ public class SpringApplicationRunner { } } } + } /** diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerConfiguration.java index 354f38d28d..462d7675a8 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunnerConfiguration.java @@ -40,4 +40,5 @@ public interface SpringApplicationRunnerConfiguration * @return the logging level */ Level getLogLevel(); + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java index 7a7fd90579..4a2f62d535 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/AnsiString.java @@ -77,4 +77,5 @@ class AnsiString { public String toString() { return this.value.toString(); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java index a5e4463b2e..de0bc000f9 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java @@ -143,5 +143,7 @@ public class CommandCompleter extends StringsCompleter { public String getUsage() { return this.usage; } + } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java index 3b2109b259..ed4f2a0b69 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java @@ -55,4 +55,5 @@ public class ShellPrompts { public String getPrompt() { return this.prompts.isEmpty() ? DEFAULT_PROMPT : this.prompts.peek(); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestCommand.java index 459c7052c9..f594a729c5 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestCommand.java @@ -68,6 +68,7 @@ public class TestCommand extends OptionParsingCommand { CompilerOptionHandler optionHandler) { super(options, optionHandler); } + } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java index 484191c0ba..a3db15b290 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java @@ -170,6 +170,7 @@ public class TestRunner { ReflectionUtils.rethrowRuntimeException(ex); } } + } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java index 124dd4726c..d0eb45e69a 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java @@ -131,4 +131,5 @@ public abstract class AnnotatedNodeASTTransformation implements ASTTransformatio } } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java index 7e018af4bd..22ea8674d4 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java @@ -78,4 +78,5 @@ public class DependencyAutoConfigurationTransformation implements ASTTransformat } } } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java index cf9921d46c..102c2b4d05 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java @@ -253,7 +253,6 @@ public class DependencyCustomizer { /** * Strategy called to test if dependencies can be added. Subclasses override as * required. Returns {@code true} by default. - * * @return {@code true} if dependencies can be added, otherwise {@code false} */ protected boolean canAdd() { @@ -267,4 +266,5 @@ public class DependencyCustomizer { public DependencyResolutionContext getDependencyResolutionContext() { return this.dependencyResolutionContext; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java index 8f34802f2c..493aa5cd34 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java @@ -164,6 +164,7 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader { .put(classNode.getName().replace(".", "/") + ".class", code); return createdClass; } + } /** @@ -238,6 +239,7 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader { this.groovyOnlyClassLoader.loadClass(name); return super.loadClass(name, resolve); } + } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java index e1ea17cd35..2e2791e499 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java @@ -108,4 +108,5 @@ public class ResolveDependencyCoordinatesTransformation ConstantExpression expression = new ConstantExpression(value); annotation.setMember(name, expression); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JUnitCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JUnitCompilerAutoConfiguration.java index bc801844ea..29d2ce8ca7 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JUnitCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JUnitCompilerAutoConfiguration.java @@ -48,4 +48,5 @@ public class JUnitCompilerAutoConfiguration extends CompilerAutoConfiguration { .addStaticStars("org.hamcrest.MatcherAssert") .addStaticStars("org.hamcrest.Matchers"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JmsCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JmsCompilerAutoConfiguration.java index b8a534fdf2..3bc6669c24 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JmsCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JmsCompilerAutoConfiguration.java @@ -51,4 +51,5 @@ public class JmsCompilerAutoConfiguration extends CompilerAutoConfiguration { "org.springframework.jms.listener", "org.springframework.jms.listener.adapter"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java index fc9b3ce815..2c122c626b 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java @@ -55,4 +55,5 @@ public class RabbitCompilerAutoConfiguration extends CompilerAutoConfiguration { "org.springframework.amqp.rabbit.listener.adapter", "org.springframework.amqp.core"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java index 952af620ec..aea223bf02 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java @@ -64,4 +64,5 @@ public class SpringBatchCompilerAutoConfiguration extends CompilerAutoConfigurat "org.springframework.batch.core.converter.JobParametersConverter", "org.springframework.batch.core.converter.DefaultJobParametersConverter"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java index ae19f42494..fa1a120898 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java @@ -102,4 +102,5 @@ public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfigurati } return false; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java index 010928bc95..4bb9627f04 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java @@ -61,4 +61,5 @@ public class SpringIntegrationCompilerAutoConfiguration "org.springframework.integration.config.EnableIntegration"); imports.addStarImports("org.springframework.integration.annotation"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringRetryCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringRetryCompilerAutoConfiguration.java index d3fec159ce..c8b35e1b3c 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringRetryCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringRetryCompilerAutoConfiguration.java @@ -48,4 +48,5 @@ public class SpringRetryCompilerAutoConfiguration extends CompilerAutoConfigurat public void applyImports(ImportCustomizer imports) { imports.addStarImports("org.springframework.retry.annotation"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java index 172d61f389..90d89753f0 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java @@ -55,4 +55,5 @@ public class SpringSecurityCompilerAutoConfiguration extends CompilerAutoConfigu "org.springframework.security.config.annotation.web", "org.springframework.security.config.annotation.web.builders"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java index 672c55c111..3fe6288885 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java @@ -72,4 +72,5 @@ public class SpringTestCompilerAutoConfiguration extends CompilerAutoConfigurati "org.springframework.boot.test.context.SpringBootTest.WebEnvironment", "org.springframework.boot.test.web.client.TestRestTemplate"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java index dcf5755fe3..2d57cea530 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java @@ -51,4 +51,5 @@ public interface ArtifactCoordinatesResolver { * @return The version of the module */ String getVersion(String module); + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java index b691ca5946..df62003457 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java @@ -95,4 +95,5 @@ public abstract class AetherGrapeEngineFactory { } return repositories; } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DefaultRepositorySystemSessionAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DefaultRepositorySystemSessionAutoConfiguration.java index d3fc4bf350..c744360bfb 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DefaultRepositorySystemSessionAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DefaultRepositorySystemSessionAutoConfiguration.java @@ -68,4 +68,5 @@ public class DefaultRepositorySystemSessionAutoConfiguration } return new File(System.getProperty("user.home"), ".m2"); } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporter.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporter.java index 1d6426bfc7..25997cee9f 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporter.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporter.java @@ -66,4 +66,5 @@ final class DetailedProgressReporter implements ProgressReporter { @Override public void finished() { } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/GrapeEngineInstaller.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/GrapeEngineInstaller.java index c2c1ba5592..d1c039c3fd 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/GrapeEngineInstaller.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/GrapeEngineInstaller.java @@ -40,4 +40,5 @@ public abstract class GrapeEngineInstaller { } } } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SummaryProgressReporter.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SummaryProgressReporter.java index 6ad5ca9d81..0ee7bc2cfd 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SummaryProgressReporter.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SummaryProgressReporter.java @@ -98,4 +98,5 @@ final class SummaryProgressReporter implements ProgressReporter { System.out.println(""); } } + } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java index 97d0fa7196..125d2fcf90 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java @@ -120,6 +120,7 @@ public class MavenSettingsReader { throw new IllegalStateException(e); } } + } } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java index 8448ee3f4b..13e37821fd 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java @@ -225,6 +225,7 @@ public class CliTester implements TestRule { throw new IllegalStateException(ex); } } + } } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java index 2528d75261..659f91a34d 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java @@ -85,4 +85,5 @@ public class GrabCommandIntegrationTests { assertThat(new File("target/repository/javax/ejb/ejb-api/3.0").isDirectory()) .isTrue(); } + } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java index d2bb9247cc..959cd0d7a6 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java @@ -140,6 +140,7 @@ public class SpringApplicationLauncherTests { public void run(String[] args) { TestSpringApplication.args = args; } + } private class TestSpringApplicationLauncher extends SpringApplicationLauncher { diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java index ecbc620ed3..301d133aef 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerIntegrationTests.java @@ -49,4 +49,5 @@ public class CommandRunnerIntegrationTests { runner.runAndHandleErrors("run", "samples/app.groovy", "--", "-d"); assertThat(this.output.toString()).doesNotContain("Negative matches:"); } + } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java index 3738b5f476..d8027cf011 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java @@ -199,6 +199,9 @@ public class CommandRunnerTests { } private enum Call { + SHOW_USAGE, ERROR_MESSAGE, PRINT_STACK_TRACE + } + } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java index fb8dafb44c..304e2b4273 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java @@ -267,4 +267,5 @@ public class AetherGrapeEngineTests { } return System.clearProperty(key); } + } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java index 725437d6de..ae25bc252c 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java @@ -36,7 +36,8 @@ public class DependencyResolutionContextTests { @Test public void canAddSpringBootDependencies() { DependencyResolutionContext dependencyResolutionContext = new DependencyResolutionContext(); - dependencyResolutionContext.addDependencyManagement(new SpringBootDependenciesDependencyManagement()); + dependencyResolutionContext.addDependencyManagement( + new SpringBootDependenciesDependencyManagement()); assertThat(dependencyResolutionContext.getManagedDependencies()).isNotEmpty(); } diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java index 6d0680cc34..51dfa021d9 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java @@ -105,6 +105,7 @@ public class GrapeRootRepositorySystemSessionAutoConfigurationTests { } private class LocalRepositoryManagerAnswer implements Answer { + @Override public LocalRepositoryManager answer(InvocationOnMock invocation) throws Throwable { diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java index 962a329ad7..f9e336fc1a 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java @@ -33,7 +33,6 @@ public final class SystemProperties { /** * Performs the given {@code action} with the given system properties set. System * properties are restored to their previous values once the action has run. - * * @param action The action to perform * @param systemPropertyPairs The system properties, each in the form * {@code key:value} @@ -61,4 +60,5 @@ public final class SystemProperties { } } } + } diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java index 67052e8fc4..ece34e2887 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java @@ -86,4 +86,5 @@ public final class ChangedFiles implements Iterable { public String toString() { return this.sourceFolder + " " + this.files; } + } diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java index 65b2676e18..b4ed90b8f8 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java @@ -249,6 +249,7 @@ public class LiveReloadServer { /** * {@link Runnable} to handle a single connection. + * * @see Connection */ private class ConnectionHandler implements Runnable { diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java index 894117f419..bdb0cc07ad 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java @@ -63,6 +63,7 @@ public class RestartScopeInitializer public String getConversationId() { return null; } + } } diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java index 9ae99c8b55..a3e594717f 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java @@ -65,4 +65,5 @@ public class ClassLoaderFileURLStreamHandler extends URLStreamHandler { } } + } diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java index f139a0a73d..9d0a0620c1 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java @@ -198,6 +198,7 @@ public class TunnelClient implements SmartInitializingSingleton { protected void stopAcceptingConnections() { this.acceptConnections = false; } + } /** @@ -221,5 +222,7 @@ public class TunnelClient implements SmartInitializingSingleton { this.closed = true; } } + } + } diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java index 7fa890e272..afc8e47fad 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolPropertiesIntegrationTests.java @@ -118,6 +118,7 @@ public class DevToolPropertiesIntegrationTests { public MyBean myBean() { return new MyBean(); } + } static class MyBean { @@ -132,4 +133,5 @@ public class DevToolPropertiesIntegrationTests { } } + } diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java index 5f86db5e14..d52de196a5 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/env/DevToolsHomePropertiesPostProcessorTests.java @@ -79,6 +79,7 @@ public class DevToolsHomePropertiesPostProcessorTests { protected File getHomeFolder() { return DevToolsHomePropertiesPostProcessorTests.this.home; } + } } diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index cf23dce34d..f98bcc5850 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -2716,6 +2716,7 @@ advanced examples, typically to take full control over the configuration of the DataSource. + [[boot-features-embedded-database-support]] ==== Embedded Database Support It's often convenient to develop applications using an in-memory embedded database. diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc index 9a3a6b3198..3cf85f7ce3 100644 --- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc +++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc @@ -782,7 +782,7 @@ will cache compiled templates to avoid repeatedly parsing template files. Also, Spring MVC can add HTTP caching headers to responses when serving static resources. Whilst caching is very beneficial in production, it can be counter productive during -development, preventing you from seeing the changes you just made in your application. +development, preventing you from seeing the changes you just made in your application. For this reason, spring-boot-devtools will disable those caching options by default. Cache options are usually configured by settings in your `application.properties` file. diff --git a/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java b/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java index 157258eebb..49bebf3256 100644 --- a/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java +++ b/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java @@ -64,4 +64,5 @@ public class RestTemplateProxyCustomizationExample { } // end::customizer[] + } diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MixedVersionRepackagingTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MixedVersionRepackagingTests.java index 394176375c..f4d0832f50 100644 --- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MixedVersionRepackagingTests.java +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MixedVersionRepackagingTests.java @@ -78,6 +78,7 @@ public class MixedVersionRepackagingTests { public boolean matches(JarFile jarFile) { return jarFile.getEntry(this.entryName) != null; } + } } diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java index f81f2a26a5..7e00690a15 100644 --- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java @@ -91,4 +91,5 @@ public class SpringLoadedTests { } fail("Required pattern '" + requiredPattern + "' not matched in " + actualOutput); } + } diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java index e14f698b2e..dfe84ad31c 100644 --- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java +++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java @@ -116,4 +116,5 @@ public class StarterDependenciesIntegrationTests { fail(root.getMessage()); } } + } diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java b/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java index 40b1680e8f..515d888692 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java @@ -35,7 +35,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest -@TestPropertySource(properties = {"endpoints.hypermedia.enabled: true", "management.security.enabled: false"}) +@TestPropertySource(properties = { "endpoints.hypermedia.enabled: true", + "management.security.enabled: false" }) public class SampleHypermediaGsonApplicationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java index 3dfbeffcff..6f38b7f82c 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java @@ -73,8 +73,8 @@ public class SampleMethodSecurityApplication extends WebMvcConfigurerAdapter { @Override public void init(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication().withUser("admin").password("admin") - .roles("ADMIN", "USER", "ACTUATOR").and().withUser("user").password("user") - .roles("USER"); + .roles("ADMIN", "USER", "ACTUATOR").and().withUser("user") + .password("user").roles("USER"); } } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java index 317afaac29..e363fb1c48 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java @@ -25,9 +25,9 @@ import java.lang.annotation.Target; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; /** - * {@link ImportAutoConfiguration Auto-configuration imports} for typical jdbc tests. - * Most tests should consider using {@link JdbcTest @JdbcTest} rather than using - * this annotation directly. + * {@link ImportAutoConfiguration Auto-configuration imports} for typical jdbc tests. Most + * tests should consider using {@link JdbcTest @JdbcTest} rather than using this + * annotation directly. * * @author Stephane Nicoll * @since 1.5.0 @@ -38,4 +38,5 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @Documented @ImportAutoConfiguration public @interface AutoConfigureJdbc { + } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java index 8825771cda..122b02712b 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java @@ -49,10 +49,10 @@ class JdbcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { @Override protected ComponentScan.Filter[] getFilters(FilterType type) { switch (type) { - case INCLUDE: - return this.annotation.includeFilters(); - case EXCLUDE: - return this.annotation.excludeFilters(); + case INCLUDE: + return this.annotation.includeFilters(); + case EXCLUDE: + return this.annotation.excludeFilters(); } throw new IllegalStateException("Unsupported type " + type); } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java index 0c8fb183c5..e041eec152 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsTestExecutionListener.java @@ -82,6 +82,7 @@ public class RestDocsTestExecutionListener extends AbstractTestExecutionListener return null; } } + } } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java index 22574273bf..590510f641 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java @@ -229,6 +229,7 @@ public class SpringBootMockMvcBuilderCustomizer implements MockMvcBuilderCustomi /** * {@link LinesWriter} used to defer writing until errors are detected. + * * @see MockMvcPrintOnlyOnFailureTestExecutionListener */ static class DeferredLinesWriter implements LinesWriter { diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java index 9fe7a813fa..db0df23ced 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java @@ -76,6 +76,7 @@ public class SpringBootDependencyInjectionTestExecutionListenerTests { @Configuration @ImportAutoConfiguration(JacksonAutoConfiguration.class) static class Config { + } } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java index 6fcab22879..64264c8883 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java @@ -62,16 +62,14 @@ public class AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests { @Primary public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } @Bean public DataSource secondaryDataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java index d14eaf3f92..cc41a38cd7 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java @@ -34,8 +34,7 @@ public class ExampleJdbcApplication { @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java index 6247b2e418..db6a80933c 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java @@ -49,8 +49,9 @@ public class ExampleRepository { } public ExampleEntity findById(int id) { - return this.jdbcTemplate.queryForObject("select id, name from example where id =?", - new Object[] { id }, ROW_MAPPER); + return this.jdbcTemplate.queryForObject( + "select id, name from example where id =?", new Object[] { id }, + ROW_MAPPER); } public Collection findAll() { @@ -65,6 +66,7 @@ public class ExampleRepository { String name = rs.getString("name"); return new ExampleEntity(id, name); } + } } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java index cc4902ae6c..218f46e4bf 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java @@ -61,8 +61,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTest @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.H2); + .generateUniqueName(true).setType(EmbeddedDatabaseType.H2); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java index f223d8a898..4dcad35dce 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java @@ -63,8 +63,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationT @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.H2); + .generateUniqueName(true).setType(EmbeddedDatabaseType.H2); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java index 650bf6caa9..069310c262 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java @@ -93,8 +93,7 @@ public class TestDatabaseAutoConfigurationTests { @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java index 022996d085..188f336328 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java @@ -34,8 +34,7 @@ public class ExampleDataJpaApplication { @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java index c99cae6d18..cf1d1d1c34 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java @@ -115,6 +115,7 @@ public class PropertyMappingContextCustomizerFactoryTests { @NoMappingAnnotation static class NoMapping { + } @Retention(RetentionPolicy.RUNTIME) @@ -124,6 +125,7 @@ public class PropertyMappingContextCustomizerFactoryTests { @TypeMappingAnnotation static class TypeMapping { + } @Configuration @@ -142,10 +144,12 @@ public class PropertyMappingContextCustomizerFactoryTests { @AttributeMappingAnnotation static class AttributeMapping { + } @AttributeMappingAnnotation("Other") static class OtherMapping { + } @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/ExampleControllerAdvice.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/ExampleControllerAdvice.java index 34433465ee..d8975c2347 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/ExampleControllerAdvice.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/ExampleControllerAdvice.java @@ -39,7 +39,8 @@ public class ExampleControllerAdvice { @ExceptionHandler(NoHandlerFoundException.class) @ResponseStatus(HttpStatus.BAD_REQUEST) - public ResponseEntity noHandlerFoundHandler(NoHandlerFoundException exception) { + public ResponseEntity noHandlerFoundHandler( + NoHandlerFoundException exception) { return ResponseEntity.badRequest() .body("Invalid request: " + exception.getRequestURL()); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java index 5ea2c26a13..c5aa5e7d16 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java @@ -68,8 +68,7 @@ public class WebMvcTestAllControllersIntegrationTests { @Test public void shouldRunValidationSuccess() throws Exception { - this.mvc.perform(get("/three/OK")) - .andExpect(status().isOk()) + this.mvc.perform(get("/three/OK")).andExpect(status().isOk()) .andExpect(content().string("Hello OK")); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestCustomDispatcherServletIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestCustomDispatcherServletIntegrationTests.java index a4a407626a..9b7187b81a 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestCustomDispatcherServletIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestCustomDispatcherServletIntegrationTests.java @@ -45,8 +45,7 @@ public class WebMvcTestCustomDispatcherServletIntegrationTests { @Test public void dispatcherServletIsCustomized() throws Exception { - this.mvc.perform(get("/does-not-exist")) - .andExpect(status().isBadRequest()) + this.mvc.perform(get("/does-not-exist")).andExpect(status().isBadRequest()) .andExpect(content().string("Invalid request: /does-not-exist")); } diff --git a/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java b/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java index ad471a2d8d..d437ed4d62 100644 --- a/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java +++ b/spring-boot-test-support/src/main/java/org/springframework/boot/junit/runner/classpath/ModifiedClassPathRunner.java @@ -220,6 +220,7 @@ public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner { } return false; } + } /** diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java index 61ddf06483..17eea896f9 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java @@ -276,6 +276,7 @@ class ImportsContextCustomizer implements ContextCustomizer { return (obj != null && getClass().equals(obj.getClass()) && this.annotations.equals(((ContextCustomizerKey) obj).annotations)); } + } /** diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java index 4c26c9f3d9..61329056a4 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java @@ -100,4 +100,5 @@ final class SpringBootConfigurationFinder { } } + } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java index 28fd9088fd..14d3a9b75a 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTest.java @@ -38,8 +38,8 @@ import org.springframework.web.context.WebApplicationContext; /** * Annotation that can be specified on a test class that runs Spring Boot based tests. - * Provides the following features over and above the regular - * Spring TestContext Framework: + * Provides the following features over and above the regular Spring TestContext + * Framework: *
      *
    • Uses {@link SpringBootContextLoader} as the default {@link ContextLoader} when no * specific {@link ContextConfiguration#loader() @ContextConfiguration(loader=...)} is diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java index e1b1cfd6a4..e5aaf8b1e7 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java @@ -345,6 +345,7 @@ public abstract class AbstractJsonMarshalTester { /** * Utility class used to support field initialization. Used by subclasses to support * {@code initFields}. + * * @param The marshaller type */ protected static abstract class FieldInitializer { diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java index 52adec92ed..688b833ca3 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java @@ -125,4 +125,5 @@ public class GsonTester extends AbstractJsonMarshalTester { } } + } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java index eb1a6de218..161066e6d2 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java @@ -110,4 +110,5 @@ public class SpringBootMockServletContext extends MockServletContext { } return resource; } + } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java index a40736f393..fc18241a6e 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializerTests.java @@ -50,4 +50,5 @@ public class ConfigFileApplicationContextInitializerTests { public static class Config { } + } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java index f42c82fd41..970496b865 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockBeanWithAsyncInterfaceMethodIntegrationTests.java @@ -78,6 +78,7 @@ public class MockBeanWithAsyncInterfaceMethodIntegrationTests { public MyService myService(Transformer transformer) { return new MyService(transformer); } + } } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java index 81796e2963..4a7a4a4d5a 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java @@ -201,4 +201,5 @@ public class TestRestTemplateTests { .isEqualTo(password); } + } diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java index 48d5260a07..b87b076e7e 100644 --- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java +++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueHint.java @@ -77,4 +77,5 @@ public class ValueHint implements Serializable { return "ValueHint{" + "value=" + this.value + ", description='" + this.description + '\'' + '}'; } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java index 7d6c662f10..1c735eebc5 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java @@ -59,7 +59,8 @@ class TypeElementMembers { private final FieldValuesParser fieldValuesParser; - TypeElementMembers(ProcessingEnvironment env, FieldValuesParser fieldValuesParser, TypeElement element) { + TypeElementMembers(ProcessingEnvironment env, FieldValuesParser fieldValuesParser, + TypeElement element) { this.env = env; this.typeUtils = new TypeUtils(this.env); this.fieldValuesParser = fieldValuesParser; diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index bf3ffba589..69ba7d4ba0 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -357,10 +357,18 @@ public class ConfigurationMetadataAnnotationProcessorTests { ConfigurationMetadata metadata = compile(ClassWithNestedProperties.class); assertThat(metadata).has(Metadata.withGroup("nestedChildProps") .fromSource(ClassWithNestedProperties.NestedChildClass.class)); - assertThat(metadata).has(Metadata.withProperty("nestedChildProps.child-class-property", Integer.class) - .fromSource(ClassWithNestedProperties.NestedChildClass.class).withDefaultValue(20)); - assertThat(metadata).has(Metadata.withProperty("nestedChildProps.parent-class-property", Integer.class) - .fromSource(ClassWithNestedProperties.NestedChildClass.class).withDefaultValue(10)); + assertThat(metadata) + .has(Metadata + .withProperty("nestedChildProps.child-class-property", + Integer.class) + .fromSource(ClassWithNestedProperties.NestedChildClass.class) + .withDefaultValue(20)); + assertThat(metadata) + .has(Metadata + .withProperty("nestedChildProps.parent-class-property", + Integer.class) + .fromSource(ClassWithNestedProperties.NestedChildClass.class) + .withDefaultValue(10)); } @Test diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java index 094280df77..d908cdc999 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java @@ -62,6 +62,7 @@ public class TestProject { * incremental builds. */ private File sourceFolder; + private TestCompiler compiler; private Set sourceFiles = new LinkedHashSet(); @@ -202,4 +203,5 @@ public class TestProject { private static String getContents(File file) throws Exception { return FileCopyUtils.copyToString(new FileReader(file)); } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java index f0f143a162..cd8a9d451f 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java @@ -53,4 +53,5 @@ public class BarProperties { public void setCounter(Integer counter) { this.counter = counter; } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java index 8dc73f04e5..d4b30bb2a1 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java @@ -53,4 +53,5 @@ public class RenamedBarProperties { public void setCounter(Integer counter) { this.counter = counter; } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java index 3294d8e514..9af47e6394 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java @@ -57,7 +57,9 @@ public class LombokInnerClassProperties { } public enum Fourth { + YES, NO + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java index fc3e4abe6a..247fcea05f 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java @@ -52,6 +52,7 @@ public class DeprecatedMethodConfig { public void setFlag(boolean flag) { this.flag = flag; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java index d59d120a73..41cd6b0779 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java @@ -62,6 +62,7 @@ public class MethodAndClassConfig { public void setFlag(boolean flag) { this.flag = flag; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SimpleMethodConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SimpleMethodConfig.java index 93b6755d37..f2bdce9db2 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SimpleMethodConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SimpleMethodConfig.java @@ -51,6 +51,7 @@ public class SimpleMethodConfig { public void setFlag(boolean flag) { this.flag = flag; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java index 80aaa6c2f2..bec8e0f663 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java @@ -36,6 +36,7 @@ public class ClassWithNestedProperties { public void setParentClassProperty(int parentClassProperty) { this.parentClassProperty = parentClassProperty; } + } @ConfigurationProperties(prefix = "nestedChildProps") @@ -50,5 +51,7 @@ public class ClassWithNestedProperties { public void setChildClassProperty(int childClassProperty) { this.childClassProperty = childClassProperty; } + } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java index 6d8d49498e..73ca89846c 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java @@ -36,4 +36,5 @@ public class BuilderPojo { this.name = name; return this; } + } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java index 53c48eafd7..28de281047 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java @@ -67,6 +67,7 @@ public class GenericConfig { public Map getStringToInteger() { return this.stringToInteger; } + } public static class Bar { @@ -99,6 +100,7 @@ public class GenericConfig { public void setName(String name) { this.name = name; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java index d64f8e2042..b152754ee0 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java @@ -89,12 +89,15 @@ public class InnerClassProperties { public void setName(String name) { this.name = name; } + } } public enum Fourth { + YES, NO + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java index 6910b57f55..d26ec476a2 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java @@ -37,6 +37,7 @@ public class InnerClassRootConfig { public void setName(String name) { this.name = name; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java index d8a9e33b94..88285a2af6 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java @@ -42,6 +42,7 @@ public class InvalidDoubleRegistrationProperties { public void setName(String name) { this.name = name; } + } } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java index db01938f5f..d1c4eef608 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java @@ -233,6 +233,7 @@ class ProjectLibraries implements Libraries { public String toString() { return getFile().getAbsolutePath(); } + } /** diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/RunPluginFeatures.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/RunPluginFeatures.java index b2967eab8d..ad913dbefe 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/RunPluginFeatures.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/RunPluginFeatures.java @@ -99,4 +99,5 @@ public class RunPluginFeatures implements PluginFeatures { } }); } + } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java index 39ebbcbd71..2f95a3b639 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java @@ -39,7 +39,6 @@ public final class BuildPropertiesWriter { /** * Creates a new {@code BuildPropertiesWriter} that will write to the given * {@code outputFile}. - * * @param outputFile the output file */ public BuildPropertiesWriter(File outputFile) { @@ -168,4 +167,5 @@ public final class BuildPropertiesWriter { } } + } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/FileUtils.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/FileUtils.java index 0b0535e2bc..cad69386e1 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/FileUtils.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/FileUtils.java @@ -89,4 +89,5 @@ public abstract class FileUtils { } return hex.toString(); } + } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java index 4d461c6e33..79fd737e29 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java @@ -356,6 +356,7 @@ public class JarWriter implements LoaderClassesWriter { public boolean hasZipHeader() { return Arrays.equals(this.header, ZIP_HEADER); } + } /** @@ -396,6 +397,7 @@ public class JarWriter implements LoaderClassesWriter { entry.setCrc(this.crc.getValue()); entry.setMethod(ZipEntry.STORED); } + } /** diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LogbackInitializer.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LogbackInitializer.java index 0bf51d2535..c93b90f302 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LogbackInitializer.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LogbackInitializer.java @@ -39,10 +39,13 @@ public abstract class LogbackInitializer { } private static class Initializer { + public void setRootLogLevel() { ILoggerFactory factory = StaticLoggerBinder.getSingleton().getLoggerFactory(); Logger logger = factory.getLogger(Logger.ROOT_LOGGER_NAME); ((ch.qos.logback.classic.Logger) logger).setLevel(Level.INFO); } + } + } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java index 0612b41c18..a2f71f8c59 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java @@ -392,7 +392,6 @@ public abstract class MainClassFinder { * Creates a new {@code MainClass} rather represents the main class with the given * {@code name}. The class is annotated with the annotations with the given * {@code annotationNames}. - * * @param name the name of the class * @param annotationNames the names of the annotations on the class */ diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java index beb8203eb5..56e24c5b2e 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java @@ -60,6 +60,7 @@ public class RepackagerTests { }; private static final long JAN_1_1980; + private static final long JAN_1_1985; static { diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java index 059a9be1e6..a32f363806 100755 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java @@ -628,4 +628,5 @@ public class PropertiesLauncher extends Launcher { } } + } diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java index 6efca10a31..59f94407a8 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java @@ -65,7 +65,8 @@ public class ExplodedArchive implements Archive { * Create a new {@link ExplodedArchive} instance. * @param root the root folder * @param recursive if recursive searching should be used to locate the manifest. - * Defaults to {@code true}, folders with a large tree might want to set this to {@code + * Defaults to {@code true}, folders with a large tree might want to set this to + * {@code * false}. */ public ExplodedArchive(File root, boolean recursive) { diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java index 162395c295..e0a2741dfc 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java @@ -404,7 +404,9 @@ public class JarFile extends java.util.jar.JarFile { * The type of a {@link JarFile}. */ enum JarFileType { + DIRECT, NESTED_DIRECTORY, NESTED_JAR + } } diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/SystemPropertyUtils.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/SystemPropertyUtils.java index 27cb0f3ec8..213bfa9fbd 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/SystemPropertyUtils.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/util/SystemPropertyUtils.java @@ -32,7 +32,6 @@ import java.util.Set; * @author Juergen Hoeller * @author Rob Harrop * @author Dave Syer - * * @see System#getProperty(String) */ public abstract class SystemPropertyUtils { diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/InternalOutputCapture.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/InternalOutputCapture.java index a9fc9894fc..bf837a4512 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/InternalOutputCapture.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/InternalOutputCapture.java @@ -122,6 +122,7 @@ class InternalOutputCapture implements TestRule { this.copy.flush(); this.original.flush(); } + } } diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java index e6d91a6d07..c8e8083e41 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java @@ -253,6 +253,7 @@ public class PropertiesLauncherTests { protected Class findClass(String name) throws ClassNotFoundException { return super.findClass(name); } + } } diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java index 74bed70938..784f8c45e3 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/WarLauncherTests.java @@ -60,4 +60,5 @@ public class WarLauncherTests extends AbstractExecutableArchiveLauncherTests { new URL("jar:" + jarRoot.toURI().toURL() + "!/WEB-INF/classes!/"), new URL("jar:" + jarRoot.toURI().toURL() + "!/WEB-INF/lib/foo.jar!/")); } + } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java index 91e75e10c4..da1f4e3ed6 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java @@ -134,4 +134,5 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo { } return cleaned.toString(); } + } 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 e4288b6265..87a460905d 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 @@ -506,6 +506,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { class LaunchRunner implements Runnable { private final String startClassName; + private final String[] args; LaunchRunner(String startClassName, String... args) { diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java index ae61d699b7..e4b862f814 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java @@ -93,4 +93,5 @@ public class DependencyFilterMojoTests { } } + } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java index 85c3eee88e..e169faed59 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java @@ -87,6 +87,7 @@ public final class Verify { public static class ArchiveVerifier { private final ZipFile zipFile; + private final Map content; public ArchiveVerifier(ZipFile zipFile) { @@ -253,6 +254,7 @@ public final class Verify { assertThat(manifest.getMainAttributes().getValue("Not-Used")) .isEqualTo("Foo"); } + } public static class WarArchiveVerification extends AbstractArchiveVerification { @@ -286,6 +288,7 @@ public final class Verify { assertThat(manifest.getMainAttributes().getValue("Not-Used")) .isEqualTo("Foo"); } + } private static class ZipArchiveVerification extends AbstractArchiveVerification { @@ -303,6 +306,7 @@ public final class Verify { assertThat(manifest.getMainAttributes().getValue("Not-Used")) .isEqualTo("Foo"); } + } private static class ModuleArchiveVerification extends AbstractArchiveVerification { diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java index 6c0c0e4d49..9d2e83d87e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java @@ -28,7 +28,6 @@ import org.springframework.core.env.PropertySources; * Convenience class for manipulating PropertySources. * * @author Dave Syer - * * @see PropertySource * @see PropertySources */ diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java index cbcd549d94..9e21d9ca1e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java @@ -224,6 +224,7 @@ public final class RelaxedNames implements Iterable { } return builder.toString(); } + } /** diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java index 63a8f588cb..dabd103dd7 100644 --- a/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java +++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java @@ -92,4 +92,5 @@ public class YamlJavaBeanPropertyConstructor extends Constructor { } } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Compression.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Compression.java index dff565c27e..cd3c0b728e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Compression.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Compression.java @@ -77,4 +77,5 @@ public class Compression { public void setExcludedUserAgents(String[] excludedUserAgents) { this.excludedUserAgents = excludedUserAgents; } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index f419c11ef5..43c9a116ed 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -702,6 +702,7 @@ public class JettyEmbeddedServletContainerFactory serverConnector.setPort(port); return serverConnector; } + } /** diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java index 53694f8824..4e61ed5fde 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java @@ -96,6 +96,7 @@ public class ServletContextInitializerConfiguration extends AbstractConfiguratio // Not available on Jetty 8 } } + } } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatResources.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatResources.java index 78df53bc1b..a7edb2d64d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatResources.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatResources.java @@ -157,6 +157,7 @@ abstract class TomcatResources { } } } + } /** diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java index 171dd8a301..a6d4489a2f 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java @@ -425,4 +425,5 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine } } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java index 4eb94098e1..187cfdb164 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java @@ -412,8 +412,8 @@ public class UndertowEmbeddedServletContainerFactory String prefix = (this.accessLogPrefix != null ? this.accessLogPrefix : "access_log."); AccessLogReceiver accessLogReceiver = new DefaultAccessLogReceiver( - createWorker(), this.accessLogDirectory, prefix, - this.accessLogSuffix, this.accessLogRotate); + createWorker(), this.accessLogDirectory, prefix, this.accessLogSuffix, + this.accessLogRotate); String formatString = (this.accessLogPattern != null) ? this.accessLogPattern : "common"; return new AccessLogHandler(handler, accessLogReceiver, formatString, diff --git a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java index 97deea9544..27bd772fef 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java +++ b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java @@ -164,7 +164,7 @@ public enum DatabaseDriver { * Informix. */ INFORMIX("informix", "Informix Dynamic Server", "com.informix.jdbc.IfxDriver", null, - "select count(*) from systables") { + "select count(*) from systables") { @Override protected Collection getUrlPrefixes() { diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java index 9b788cb972..93e4ac22ef 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java @@ -116,6 +116,7 @@ public class PoolingConnectionFactoryBean extends PoolingConnectionFactory /** * A {@link XAConnectionFactory} implementation that delegates to the * {@link ThreadLocal} {@link PoolingConnectionFactoryBean}. + * * @see PoolingConnectionFactoryBean#setConnectionFactory(XAConnectionFactory) */ public static class DirectXAConnectionFactory implements XAConnectionFactory { diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java index e84f025026..376c13ef99 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java @@ -184,6 +184,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem { /** * Maintains a mapping between native levels and {@link LogLevel}. + * * @param The native level type */ protected static class LogLevels { diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LogFile.java b/spring-boot/src/main/java/org/springframework/boot/logging/LogFile.java index e40d86da01..5d545b165b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/LogFile.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LogFile.java @@ -120,4 +120,5 @@ public class LogFile { } return null; } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java index 6f4c32d2ca..4d33be2ff7 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java @@ -48,9 +48,9 @@ public abstract class LoggingSystem { public static final String NONE = "none"; /** - * The name used for the root logger. LoggingSystem implementations should ensure - * that this is the name used to represent the root logger, regardless of the - * underlying implementation. + * The name used for the root logger. LoggingSystem implementations should ensure that + * this is the name used to represent the root logger, regardless of the underlying + * implementation. */ public static final String ROOT_LOGGER_NAME = "ROOT"; diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java index bd871e90e7..8ed6a81ab6 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java @@ -85,7 +85,6 @@ public final class ColorConverter extends LogEventPatternConverter { /** * Creates a new instance of the class. Required by Log4J2. - * * @param config the configuration * @param options the options * @return a new instance, or {@code null} if the options are invalid diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java index 97ee14efdf..a08ef6efff 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java @@ -117,6 +117,7 @@ public class LevelRemappingAppender extends AppenderBase { this.logger.callAppenders(event); } } + } /** diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java index f9ad96dafc..fa5f0673e1 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java @@ -37,6 +37,7 @@ import org.springframework.core.env.Environment; class SpringPropertyAction extends Action { private static final String SOURCE_ATTRIBUTE = "source"; + private static final String DEFAULT_VALUE_ATTRIBUTE = "defaultValue"; private final Environment environment; diff --git a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java index 281a8eabc6..070ccf3579 100644 --- a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java +++ b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java @@ -73,18 +73,30 @@ public class SpringPhysicalNamingStrategy implements PhysicalNamingStrategy { builder.insert(i++, '_'); } } + return getIdentifier(builder.toString(), name.isQuoted(), jdbcEnvironment); + } - String text = builder.toString(); - String finalText = isCaseInsensitive(jdbcEnvironment) ? text.toLowerCase(Locale.ROOT) - : text; - return new Identifier(finalText, name.isQuoted()); + /** + * Get an the identifier for the specified details. By default his method will return + * an identifier with the name adapted based on the result of + * {@link #isCaseInsensitive(JdbcEnvironment)} + * @param name the name of the identifier + * @param quoted if the identifier is quoted + * @param jdbcEnvironment the JDBC environment + * @return an identifier instance + */ + protected Identifier getIdentifier(String name, boolean quoted, + JdbcEnvironment jdbcEnvironment) { + if (isCaseInsensitive(jdbcEnvironment)) { + name = name.toLowerCase(Locale.ROOT); + } + return new Identifier(name, quoted); } /** * Specify whether the database is case sensitive. * @param jdbcEnvironment The JDBC environment which can be used to determine case - * @return true if the database is case insensitive - * sensitivity + * @return true if the database is case insensitive sensitivity */ protected boolean isCaseInsensitive(JdbcEnvironment jdbcEnvironment) { return true; diff --git a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java index 42b4467eba..939a3d1503 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java @@ -463,7 +463,6 @@ public class RestTemplateBuilder { /** * Sets the connect timeout in milliseconds on the underlying * {@link ClientHttpRequestFactory}. - * * @param connectTimeout the connect timeout in milliseconds * @return a new builder instance. */ @@ -479,7 +478,6 @@ public class RestTemplateBuilder { /** * Sets the read timeout in milliseconds on the underlying * {@link ClientHttpRequestFactory}. - * * @param readTimeout the read timeout in milliseconds * @return a new builder instance. */ diff --git a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java index 2e4ece2ec0..4d58a4a592 100644 --- a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java +++ b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java @@ -122,7 +122,9 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher { * Profile match types. */ enum ProfileType { + POSITIVE, NEGATIVE + } /** diff --git a/spring-boot/src/test/java/org/springframework/boot/ApplicationPidTests.java b/spring-boot/src/test/java/org/springframework/boot/ApplicationPidTests.java index fee353ecf6..3aa6b92b3f 100644 --- a/spring-boot/src/test/java/org/springframework/boot/ApplicationPidTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/ApplicationPidTests.java @@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link ApplicationPid}. + * * @author Phillip Webb */ public class ApplicationPidTests { diff --git a/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java b/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java index 012ca9085a..7f0e0f7694 100644 --- a/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/OverrideSourcesTests.java @@ -87,8 +87,10 @@ public class OverrideSourcesTests { } protected static class Service { + @Autowired private TestBean bean; + } protected static class TestBean { @@ -100,4 +102,5 @@ public class OverrideSourcesTests { } } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/ReproTests.java b/spring-boot/src/test/java/org/springframework/boot/ReproTests.java index 1ce4a480e9..d3fea91b97 100644 --- a/spring-boot/src/test/java/org/springframework/boot/ReproTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/ReproTests.java @@ -177,4 +177,5 @@ public class ReproTests { public static class Config { } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java index d21326b900..d3603882f2 100644 --- a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java @@ -273,10 +273,12 @@ public class SpringApplicationTests { final AtomicReference reference = new AtomicReference(); class ApplicationReadyEventListener implements ApplicationListener { + @Override public void onApplicationEvent(ApplicationReadyEvent event) { reference.set(event.getSpringApplication()); } + } application.addListeners(new ApplicationReadyEventListener()); this.context = application.run("--foo=bar"); @@ -289,10 +291,12 @@ public class SpringApplicationTests { application.setWebEnvironment(false); final AtomicReference reference = new AtomicReference(); class InitializerListener implements ApplicationListener { + @Override public void onApplicationEvent(ContextRefreshedEvent event) { reference.set(event.getApplicationContext()); } + } application.setListeners(Arrays.asList(new InitializerListener())); this.context = application.run("--foo=bar"); @@ -309,10 +313,12 @@ public class SpringApplicationTests { final List events = new ArrayList(); class ApplicationRunningEventListener implements ApplicationListener { + @Override public void onApplicationEvent(ApplicationEvent event) { events.add((event)); } + } application.addListeners(new ApplicationRunningEventListener()); this.context = application.run(); @@ -1047,6 +1053,7 @@ public class SpringApplicationTests { public void fail() { throw new RefreshFailureException(); } + } static class ExitStatusException extends RuntimeException diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java index c49ea0f1bc..a0bb1810fa 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java @@ -233,6 +233,7 @@ public class BindingPreparationTests { } public static class TargetWithNestedMap { + private Map nested; public Map getNested() { @@ -242,9 +243,11 @@ public class BindingPreparationTests { public void setNested(Map nested) { this.nested = nested; } + } public static class TargetWithNestedMapOfListOfString { + private Map> nested; public Map> getNested() { @@ -254,9 +257,11 @@ public class BindingPreparationTests { public void setNested(Map> nested) { this.nested = nested; } + } public static class TargetWithNestedListOfMaps { + private List> nested; public List> getNested() { @@ -266,9 +271,11 @@ public class BindingPreparationTests { public void setNested(List> nested) { this.nested = nested; } + } public static class TargetWithNestedListOfLists { + private List> nested; public List> getNested() { @@ -278,9 +285,11 @@ public class BindingPreparationTests { public void setNested(List> nested) { this.nested = nested; } + } public static class TargetWithNestedListOfBeansWithList { + private List nested; public List getNested() { @@ -290,9 +299,11 @@ public class BindingPreparationTests { public void setNested(List nested) { this.nested = nested; } + } public static class TargetWithList { + private List list; public List getList() { @@ -306,6 +317,7 @@ public class BindingPreparationTests { } public static class TargetWithNestedMapOfBean { + private Map nested; public Map getNested() { @@ -315,6 +327,7 @@ public class BindingPreparationTests { public void setNested(Map nested) { this.nested = nested; } + } public static class VanillaTarget { diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java index d8475a3c8b..aa547f3099 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java @@ -117,6 +117,7 @@ public class PropertiesConfigurationFactoryMapTests { // Foo needs to be public and to have setters for all properties public static class Foo { + private Map map = new HashMap(); public Map getMap() { @@ -126,6 +127,7 @@ public class PropertiesConfigurationFactoryMapTests { public void setMap(Map map) { this.map = map; } + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java index b2564ded9a..b5da56ca2d 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java @@ -233,6 +233,7 @@ public class PropertiesConfigurationFactoryTests { // Foo needs to be public and to have setters for all properties public static class Foo { + @NotNull private String name; diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java index d83fb73395..beb0058945 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java @@ -96,10 +96,12 @@ public class PropertySourcesBindingTests { @PropertySources({ @PropertySource("classpath:/override.properties"), @PropertySource("classpath:/some.properties") }) public static class SomeConfig { + } @ConfigurationProperties public static class Wrapper { + private String foo; private String bar; @@ -139,6 +141,7 @@ public class PropertySourcesBindingTests { public void setTheName(String theName) { this.theName = theName; } + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java index 2a8716df60..3c3665891d 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java @@ -852,6 +852,7 @@ public class RelaxedDataBinderTests { public void setNested(Map nested) { this.nested = nested; } + } public static class TargetWithNestedMapOfListOfString { @@ -1101,7 +1102,9 @@ public class RelaxedDataBinderTests { } enum Bingo { + THIS, or, THAT, THE_OTHER, THAT_OTHER + } public static class ValidatedTarget { diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java index ae159d1185..36ee414ab6 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java @@ -100,13 +100,18 @@ public class YamlConfigurationFactoryTests { } private static class Foo { + @NotNull public String name; public String bar; + } private static class Jee { + public Map mymap; + } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java index 7faa991f63..55904781bd 100644 --- a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java @@ -358,5 +358,7 @@ public class SpringApplicationBuilderTests { public ApplicationContext getParent() { return this.applicationContext.getParent(); } + } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java index f6a612fb6b..1a972ea782 100644 --- a/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java @@ -132,4 +132,5 @@ public class CloudFoundryVcapEnvironmentPostProcessorTests { private String getProperty(String key) { return this.context.getEnvironment().getProperty(key); } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java index 4fce2663c7..b698a32bd7 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/FileEncodingApplicationListenerTests.java @@ -33,7 +33,9 @@ import org.springframework.test.context.support.TestPropertySourceUtils; public class FileEncodingApplicationListenerTests { private final FileEncodingApplicationListener initializer = new FileEncodingApplicationListener(); + private final ConfigurableEnvironment environment = new StandardEnvironment(); + private final ApplicationEnvironmentPreparedEvent event = new ApplicationEnvironmentPreparedEvent( new SpringApplication(), new String[0], this.environment); diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java index c808195641..14434434f9 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java @@ -93,6 +93,7 @@ public class AnsiOutputApplicationListenerTests { @Configuration public static class Config { + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java index 05fc23d8a0..a6d6bd1996 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java @@ -83,12 +83,14 @@ public class DelegatingApplicationListenerTests { @Order(Ordered.HIGHEST_PRECEDENCE) private static class MockInitA implements ApplicationListener { + @Override public void onApplicationEvent(ContextRefreshedEvent event) { ConfigurableApplicationContext applicationContext = (ConfigurableApplicationContext) event .getApplicationContext(); applicationContext.getBeanFactory().registerSingleton("a", "a"); } + } @Order(Ordered.LOWEST_PRECEDENCE) @@ -102,6 +104,7 @@ public class DelegatingApplicationListenerTests { .isEqualTo("a"); applicationContext.getBeanFactory().registerSingleton("b", "b"); } + } } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java index 9f3ed92e84..a6912a6d36 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan public class InDefaultPackageConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java index 517fc19d16..e1eb981a38 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java @@ -23,4 +23,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan(basePackageClasses = ExampleBean.class) public class InDefaultPackageWithBasePackageClassesConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java index ec69a08f48..4abc16bfd0 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan(basePackages = "org.springframework.boot.context.configwarnings.nested") public class InDefaultPackageWithBasePackagesConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java index 986541024c..088334827c 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithMetaAnnotationConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @MetaComponentScan public class InDefaultPackageWithMetaAnnotationConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java index 49f9db9088..1987b17bda 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan("org.springframework.boot.context.configwarnings.nested") public class InDefaultPackageWithValueConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java index 637a37f91a..0b4e90dd34 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java @@ -20,4 +20,5 @@ import org.springframework.context.annotation.Configuration; @Configuration public class InDefaultPackageWithoutScanConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java index 2c5ece9f4b..b79c969481 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/orgspring/InOrgSpringPackageConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan public class InOrgSpringPackageConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java index 8f6664b6d5..cd0932b378 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/configwarnings/real/InRealPackageConfiguration.java @@ -22,4 +22,5 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan public class InRealPackageConfiguration { + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java index e344f189a0..a0fd5d3b1a 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java @@ -210,4 +210,5 @@ public class AnnotationConfigEmbeddedWebApplicationContextTests { } } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java index 531fa5f062..8e2b1c5cba 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java @@ -121,28 +121,34 @@ public class EmbeddedServletContainerMvcIntegrationTests { @Configuration @Import(Config.class) public static class TomcatConfig { + @Bean public EmbeddedServletContainerFactory containerFactory() { return new TomcatEmbeddedServletContainerFactory(0); } + } @Configuration @Import(Config.class) public static class JettyConfig { + @Bean public EmbeddedServletContainerFactory containerFactory() { return new JettyEmbeddedServletContainerFactory(0); } + } @Configuration @Import(Config.class) public static class UndertowConfig { + @Bean public EmbeddedServletContainerFactory containerFactory() { return new UndertowEmbeddedServletContainerFactory(0); } + } @Configuration @@ -161,6 +167,7 @@ public class EmbeddedServletContainerMvcIntegrationTests { public HelloWorldController helloWorldController() { return new HelloWorldController(); } + } @Configuration @@ -201,6 +208,7 @@ public class EmbeddedServletContainerMvcIntegrationTests { public HelloWorldController helloWorldController() { return new HelloWorldController(); } + } @Controller diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java index 05853d2e92..0f78f3bdc1 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/ExampleFilter.java @@ -47,4 +47,5 @@ public class ExampleFilter implements Filter { chain.doFilter(request, response); response.getWriter().write("]"); } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java index b3101ab16d..d14251a7bb 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java @@ -200,6 +200,7 @@ public class MockEmbeddedServletContainerFactory } private static class EmptyEnumeration implements Enumeration { + static final EmptyEnumeration EMPTY_ENUMERATION = new EmptyEnumeration(); @Override @@ -211,6 +212,7 @@ public class MockEmbeddedServletContainerFactory public E nextElement() { throw new NoSuchElementException(); } + } } @@ -233,6 +235,7 @@ public class MockEmbeddedServletContainerFactory public Servlet getServlet() { return this.servlet; } + } public static class RegisteredFilter { @@ -253,5 +256,7 @@ public class MockEmbeddedServletContainerFactory public Filter getFilter() { return this.filter; } + } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java index 775e875611..41cb73f76f 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContextTests.java @@ -87,4 +87,5 @@ public class XmlEmbeddedWebApplicationContextTests { Servlet servlet = this.context.getBean(Servlet.class); verify(containerFactory.getServletContext()).addServlet("servlet", servlet); } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java index c90fdd8b07..48c98d4509 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java @@ -499,6 +499,7 @@ public class ConfigurationPropertiesBindingPostProcessorTests { public void setFoo(String foo) { this.foo = foo; } + } public static class CustomPropertyValidator implements Validator { @@ -577,7 +578,9 @@ public class ConfigurationPropertiesBindingPostProcessorTests { } enum FooEnum { + FOO, BAZ, BAR + } @Configuration diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java index eabcf28293..492e2f81a1 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java @@ -699,6 +699,7 @@ public class EnableConfigurationPropertiesTests { } // No getter - you should be able to bind to a write-only bean + } // No annotation diff --git a/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersTests.java b/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersTests.java index eae067faf1..83aa28cf80 100644 --- a/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersTests.java @@ -94,6 +94,7 @@ public class FailureAnalyzersTests { public FailureAnalysis analyze(Throwable failure) { return null; } + } interface BeanFactoryAwareFailureAnalyzer extends BeanFactoryAware, FailureAnalyzer { diff --git a/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java b/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java index 417ced254b..7975125075 100644 --- a/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java @@ -82,6 +82,7 @@ public class BeanNotOfRequiredTypeFailureAnalyzerTests { public AsyncBean asyncBean() { return new AsyncBean(); } + } @Configuration diff --git a/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java b/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java index d93113aeb1..5333b4785a 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java @@ -73,8 +73,7 @@ public class DatabaseDriverTests { .isEqualTo(DatabaseDriver.UNKNOWN); assertThat(DatabaseDriver.fromProductName("Apache Derby")) .isEqualTo(DatabaseDriver.DERBY); - assertThat(DatabaseDriver.fromProductName("H2")) - .isEqualTo(DatabaseDriver.H2); + assertThat(DatabaseDriver.fromProductName("H2")).isEqualTo(DatabaseDriver.H2); assertThat(DatabaseDriver.fromProductName("HSQL Database Engine")) .isEqualTo(DatabaseDriver.HSQLDB); assertThat(DatabaseDriver.fromProductName("SQLite")) @@ -122,8 +121,9 @@ public class DatabaseDriverTests { .isEqualTo(DatabaseDriver.ORACLE); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:postgresql://127.0.0.1:5432/sample")) .isEqualTo(DatabaseDriver.POSTGRESQL); - assertThat(DatabaseDriver.fromJdbcUrl("jdbc:jtds:sqlserver://127.0.0.1:1433/sample")) - .isEqualTo(DatabaseDriver.JTDS); + assertThat( + DatabaseDriver.fromJdbcUrl("jdbc:jtds:sqlserver://127.0.0.1:1433/sample")) + .isEqualTo(DatabaseDriver.JTDS); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:sqlserver://127.0.0.1:1433")) .isEqualTo(DatabaseDriver.SQLSERVER); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:firebirdsql://localhost/sample")) @@ -134,8 +134,9 @@ public class DatabaseDriverTests { .isEqualTo(DatabaseDriver.DB2_AS400); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:teradata://localhost/SAMPLE")) .isEqualTo(DatabaseDriver.TERADATA); - assertThat(DatabaseDriver.fromJdbcUrl("jdbc:informix-sqli://localhost:1533/sample")) - .isEqualTo(DatabaseDriver.INFORMIX); + assertThat( + DatabaseDriver.fromJdbcUrl("jdbc:informix-sqli://localhost:1533/sample")) + .isEqualTo(DatabaseDriver.INFORMIX); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:informix-direct://sample")) .isEqualTo(DatabaseDriver.INFORMIX); } diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java index c6010bc8e9..9fe1f8dcdf 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java @@ -176,7 +176,8 @@ public class JavaLoggingSystemTests extends AbstractLoggingSystemTests { List configurations = this.loggingSystem .getLoggerConfigurations(); assertThat(configurations).isNotEmpty(); - assertThat(configurations.get(0).getName()).isEqualTo(LoggingSystem.ROOT_LOGGER_NAME); + assertThat(configurations.get(0).getName()) + .isEqualTo(LoggingSystem.ROOT_LOGGER_NAME); } @Test diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java index f5b677f9a0..cb5404e0c5 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java @@ -37,7 +37,9 @@ import static org.assertj.core.api.Assertions.assertThat; public class ColorConverterTests { private ColorConverter converter; + private LoggingEvent event; + private final String in = "in"; @BeforeClass @@ -132,4 +134,5 @@ public class ColorConverterTests { String out = this.converter.transform(this.event, this.in); assertThat(out).isEqualTo("\033[32min\033[0;39m"); } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/LevelRemappingAppenderTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LevelRemappingAppenderTests.java index 7f4a647a40..d0d8fd5602 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/LevelRemappingAppenderTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LevelRemappingAppenderTests.java @@ -108,4 +108,5 @@ public class LevelRemappingAppenderTests { } } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java b/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java index 39353f2103..8adeee8bfc 100644 --- a/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java @@ -70,13 +70,14 @@ public class SpringPhysicalNamingStrategyTests { @Test public void tableNameShouldNotBeLowerCaseIfCaseSensitive() throws Exception { this.metadata = this.metadataSources.getMetadataBuilder(this.serviceRegistry) - .applyPhysicalNamingStrategy(new TestSpringPhysicalNamingStrategy()).build(); + .applyPhysicalNamingStrategy(new TestSpringPhysicalNamingStrategy()) + .build(); PersistentClass binding = this.metadata .getEntityBinding(TelephoneNumber.class.getName()); assertThat(binding.getTable().getQuotedName()).isEqualTo("Telephone_Number"); } - private class TestSpringPhysicalNamingStrategy extends SpringPhysicalNamingStrategy { + private class TestSpringPhysicalNamingStrategy extends SpringPhysicalNamingStrategy { @Override protected boolean isCaseInsensitive(JdbcEnvironment jdbcEnvironment) { @@ -84,4 +85,5 @@ public class SpringPhysicalNamingStrategyTests { } } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/MockFilter.java b/spring-boot/src/test/java/org/springframework/boot/testutil/MockFilter.java index 3029c3e306..dcda41151e 100644 --- a/spring-boot/src/test/java/org/springframework/boot/testutil/MockFilter.java +++ b/spring-boot/src/test/java/org/springframework/boot/testutil/MockFilter.java @@ -44,4 +44,5 @@ public class MockFilter implements Filter { @Override public void destroy() { } + } diff --git a/spring-boot/src/test/java/org/springframework/boot/web/support/SpringBootServletInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/web/support/SpringBootServletInitializerTests.java index edaec5724e..382f4637d9 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/support/SpringBootServletInitializerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/web/support/SpringBootServletInitializerTests.java @@ -127,10 +127,12 @@ public class SpringBootServletInitializerTests { SpringApplicationBuilder application) { return application.sources(Config.class); } + } @Configuration public class WithConfigurationAnnotation extends MockSpringBootServletInitializer { + } public class WithConfiguredSource extends MockSpringBootServletInitializer {