diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java index eecfbda3784..154d7e9fb1d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java @@ -183,14 +183,15 @@ public class EndpointWebMvcManagementContextConfiguration { AnnotatedTypeMetadata metadata) { Environment environment = context.getEnvironment(); String config = environment.resolvePlaceholders("${logging.file:}"); - ConditionMessage.Builder message = ConditionMessage - .forCondition("Log File"); + ConditionMessage.Builder message = ConditionMessage.forCondition("Log File"); if (StringUtils.hasText(config)) { - return ConditionOutcome.match(message.found("logging.file").items(config)); + return ConditionOutcome + .match(message.found("logging.file").items(config)); } config = environment.resolvePlaceholders("${logging.path:}"); if (StringUtils.hasText(config)) { - return ConditionOutcome.match(message.found("logging.path").items(config)); + return ConditionOutcome + .match(message.found("logging.path").items(config)); } config = new RelaxedPropertyResolver(environment, "endpoints.logfile.") .getProperty("external-file"); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java index d596cbd90e4..a15772492c8 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java @@ -98,7 +98,8 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; MongoDataAutoConfiguration.class, RabbitAutoConfiguration.class, RedisAutoConfiguration.class, SolrAutoConfiguration.class }) @EnableConfigurationProperties({ HealthIndicatorProperties.class }) -@Import({ ElasticsearchHealthIndicatorConfiguration.ElasticsearchClientHealthIndicatorConfiguration.class, +@Import({ + ElasticsearchHealthIndicatorConfiguration.ElasticsearchClientHealthIndicatorConfiguration.class, ElasticsearchHealthIndicatorConfiguration.ElasticsearchJestHealthIndicatorConfiguration.class }) public class HealthIndicatorAutoConfiguration { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/InfoContributorProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/InfoContributorProperties.java index a190908ad3c..26a2ecc694e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/InfoContributorProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/InfoContributorProperties.java @@ -34,7 +34,6 @@ public class InfoContributorProperties { return this.git; } - public static class Git { /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java index 1e6e45ea88f..f7ad0fa02dc 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java @@ -98,8 +98,7 @@ public class JolokiaAutoConfiguration { public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { boolean endpointsEnabled = isEnabled(context, "endpoints.", true); - ConditionMessage.Builder message = ConditionMessage - .forCondition("Jolokia"); + ConditionMessage.Builder message = ConditionMessage.forCondition("Jolokia"); if (isEnabled(context, "endpoints.jolokia.", endpointsEnabled)) { return ConditionOutcome.match(message.because("enabled")); } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java index a69ccd75f48..6359f7e0ae9 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java @@ -17,8 +17,7 @@ package org.springframework.boot.actuate.autoconfigure; import java.net.InetAddress; -import java.util.ArrayList; -import java.util.Collections; +import java.util.Arrays; import java.util.List; import javax.validation.constraints.NotNull; @@ -179,7 +178,7 @@ public class ManagementServerProperties implements SecurityPrerequisite { /** * Comma-separated list of roles that can access the management endpoint. */ - private List roles = new ArrayList(Collections.singletonList("ADMIN")); + private List roles = Arrays.asList("ADMIN"); /** * Session creating policy to use (always, never, if_required, stateless). 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 7bca00b49ef..937ab513a1c 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 @@ -398,9 +398,9 @@ public class HealthIndicatorAutoConfigurationTests { EnvironmentTestUtils.addEnvironment(this.context, "spring.data.elasticsearch.properties.path.home:target", "management.health.diskspace.enabled:false"); - this.context.register(JestClientConfiguration.class, - JestAutoConfiguration.class, ElasticsearchAutoConfiguration.class, - ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); + this.context.register(JestClientConfiguration.class, JestAutoConfiguration.class, + ElasticsearchAutoConfiguration.class, ManagementServerProperties.class, + HealthIndicatorAutoConfiguration.class); this.context.refresh(); Map beans = this.context @@ -414,9 +414,8 @@ public class HealthIndicatorAutoConfigurationTests { public void elasticsearchJestHealthIndicator() { EnvironmentTestUtils.addEnvironment(this.context, "management.health.diskspace.enabled:false"); - this.context.register(JestClientConfiguration.class, - JestAutoConfiguration.class, ManagementServerProperties.class, - HealthIndicatorAutoConfiguration.class); + this.context.register(JestClientConfiguration.class, JestAutoConfiguration.class, + ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); Map beans = this.context @@ -432,9 +431,9 @@ public class HealthIndicatorAutoConfigurationTests { "management.health.elasticsearch.enabled:false", "spring.data.elasticsearch.properties.path.home:target", "management.health.diskspace.enabled:false"); - this.context.register(JestClientConfiguration.class, - JestAutoConfiguration.class, ElasticsearchAutoConfiguration.class, - ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); + this.context.register(JestClientConfiguration.class, JestAutoConfiguration.class, + ElasticsearchAutoConfiguration.class, ManagementServerProperties.class, + HealthIndicatorAutoConfiguration.class); this.context.refresh(); Map beans = this.context diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java index d04616a4861..3fa42be8c4d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java @@ -82,8 +82,7 @@ public class ManagementServerPropertiesAutoConfigurationTests { @Test public void managementRolesAllowsIndexedAccess() { - ManagementServerProperties properties = load( - "management.security.roles[0]=FOO"); + ManagementServerProperties properties = load("management.security.roles[0]=FOO"); assertThat(properties.getSecurity().getRoles()).containsOnly("FOO"); } 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 725b1b24e11..632ad65f350 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 @@ -73,8 +73,8 @@ public class AuthorizationAuditListenerTests { @Test public void testDetailsAreIncludedInAuditEvent() throws Exception { Object details = new Object(); - UsernamePasswordAuthenticationToken authentication = - new UsernamePasswordAuthenticationToken("user", "password"); + UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken( + "user", "password"); authentication.setDetails(details); this.listener.onApplicationEvent(new AuthorizationFailureEvent(this, Arrays.asList(new SecurityConfig("USER")), 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 0882cf7f33c..8d6538d3201 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 @@ -178,8 +178,7 @@ class JCacheCacheConfiguration { @Override public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { - ConditionMessage.Builder message = ConditionMessage - .forCondition("JCache"); + ConditionMessage.Builder message = ConditionMessage.forCondition("JCache"); RelaxedPropertyResolver resolver = new RelaxedPropertyResolver( context.getEnvironment(), "spring.cache.jcache."); if (resolver.containsProperty("provider")) { 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 c6a12bf36d3..65a410892c6 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 @@ -375,8 +375,8 @@ public final class ConditionMessage { /** * Indicate the items with a {@link Style}. For example - * {@code didNotFind("bean", "beans").items(Style.QUOTE, Collections.singleton("x")} results in - * the message "did not find bean 'x'". + * {@code didNotFind("bean", "beans").items(Style.QUOTE, Collections.singleton("x")} + * results in the message "did not find bean 'x'". * @param style the render style * @param items the source of the items (may be {@code null}) * @return a built {@link ConditionMessage} diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java index ffb5d2977f1..2b602ebf79e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java @@ -24,8 +24,8 @@ import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapt import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; /** - * A {@code RepositoryRestConfigurer} that applies configuration items from - * the {@code spring.data.rest} namespace to Spring Data REST. Also, if a + * A {@code RepositoryRestConfigurer} that applies configuration items from the + * {@code spring.data.rest} namespace to Spring Data REST. Also, if a * {@link Jackson2ObjectMapperBuilder} is available, it is used to configure Spring Data * REST's {@link ObjectMapper ObjectMappers}. * diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java index 166ce812754..bb0ca4cef15 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java @@ -16,8 +16,7 @@ package org.springframework.boot.autoconfigure.elasticsearch.jest; -import java.util.ArrayList; -import java.util.Collections; +import java.util.Arrays; import java.util.List; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -34,8 +33,7 @@ public class JestProperties { /** * Comma-separated list of the Elasticsearch instances to use. */ - private List uris = new ArrayList(Collections.singletonList( - "http://localhost:9200")); + private List uris = Arrays.asList("http://localhost:9200"); /** * Login user. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java index 6e5d0ddc23c..26690bb4923 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java @@ -108,7 +108,8 @@ public class ProjectInfoAutoConfiguration { ConditionMessage.Builder message = ConditionMessage .forCondition("GitResource"); if (loader.getResource(location).exists()) { - return ConditionOutcome.match(message.found("git info at").items(location)); + return ConditionOutcome + .match(message.found("git info at").items(location)); } return ConditionOutcome .noMatch(message.didNotFind("git info at").items(location)); 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 c93014cac76..f3d1217b59e 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 @@ -232,8 +232,8 @@ public class DataSourceAutoConfiguration { } if (anyMatches(context, metadata, this.pooledCondition, this.embeddedCondition)) { - return ConditionOutcome - .match(message.foundExactly("existing auto-configured data source bean")); + return ConditionOutcome.match(message + .foundExactly("existing auto-configured data source bean")); } return ConditionOutcome .noMatch(message.didNotFind("any existing data source bean").atAll()); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerConfiguration.java index bfb70ef3492..523906ab2a4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerConfiguration.java @@ -132,8 +132,8 @@ public class OAuth2ResourceServerConfiguration { if (ClassUtils.isPresent(AUTHORIZATION_ANNOTATION, null)) { if (AuthorizationServerEndpointsConfigurationBeanCondition .matches(context)) { - return ConditionOutcome - .match(message.found("class").items(AUTHORIZATION_ANNOTATION)); + return ConditionOutcome.match( + message.found("class").items(AUTHORIZATION_ANNOTATION)); } } return ConditionOutcome.noMatch( diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionCondition.java index 6ecefb5d702..f86ff340de4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionCondition.java @@ -58,8 +58,8 @@ class SessionCondition extends SpringBootCondition { return ConditionOutcome.match(message .found("spring.session.store-type property").items(sessionStoreType)); } - return ConditionOutcome - .noMatch(message.found("spring.session.store-type property").items(value)); + return ConditionOutcome.noMatch( + message.found("spring.session.store-type property").items(value)); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/OnEnabledResourceChainCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/OnEnabledResourceChainCondition.java index 41e7ec5d43b..04ab0800d83 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/OnEnabledResourceChainCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/OnEnabledResourceChainCondition.java @@ -50,8 +50,7 @@ class OnEnabledResourceChainCondition extends SpringBootCondition { ConditionMessage.Builder message = ConditionMessage .forCondition(ConditionalOnEnabledResourceChain.class); if (match == null) { - if (ClassUtils.isPresent(WEBJAR_ASSET_LOCATOR, - getClass().getClassLoader())) { + if (ClassUtils.isPresent(WEBJAR_ASSET_LOCATOR, getClass().getClassLoader())) { return ConditionOutcome .match(message.found("class").items(WEBJAR_ASSET_LOCATOR)); } 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 8a91c0c0ec1..3647b6a1f9d 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 @@ -92,8 +92,9 @@ public class BatchAutoConfigurationTests { this.context.refresh(); assertThat(this.context.getBean(JobLauncher.class)).isNotNull(); assertThat(this.context.getBean(JobExplorer.class)).isNotNull(); - assertThat(this.context.getBean(BatchProperties.class) - .getInitializer().isEnabled()).isTrue(); + assertThat( + this.context.getBean(BatchProperties.class).getInitializer().isEnabled()) + .isTrue(); assertThat(new JdbcTemplate(this.context.getBean(DataSource.class)) .queryForList("select * from BATCH_JOB_EXECUTION")).isEmpty(); } @@ -193,8 +194,9 @@ public class BatchAutoConfigurationTests { PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(JobLauncher.class)).isNotNull(); - assertThat(this.context.getBean(BatchProperties.class) - .getInitializer().isEnabled()).isFalse(); + assertThat( + this.context.getBean(BatchProperties.class).getInitializer().isEnabled()) + .isFalse(); this.expected.expect(BadSqlGrammarException.class); new JdbcTemplate(this.context.getBean(DataSource.class)) .queryForList("select * from BATCH_JOB_EXECUTION"); @@ -233,8 +235,9 @@ public class BatchAutoConfigurationTests { PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(JobLauncher.class)).isNotNull(); - assertThat(this.context.getBean(BatchProperties.class) - .getInitializer().isEnabled()).isTrue(); + assertThat( + this.context.getBean(BatchProperties.class).getInitializer().isEnabled()) + .isTrue(); assertThat(new JdbcTemplate(this.context.getBean(DataSource.class)) .queryForList("select * from PREFIX_JOB_EXECUTION")).isEmpty(); JobExplorer jobExplorer = this.context.getBean(JobExplorer.class); @@ -245,19 +248,20 @@ public class BatchAutoConfigurationTests { } @Test - public void testCustomTablePrefixWithDefaultSchemaDisablesInitializer() throws Exception { + public void testCustomTablePrefixWithDefaultSchemaDisablesInitializer() + throws Exception { this.context = new AnnotationConfigApplicationContext(); EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.name:batchtest", - "spring.batch.tablePrefix:PREFIX_"); + "spring.datasource.name:batchtest", "spring.batch.tablePrefix:PREFIX_"); this.context.register(TestConfiguration.class, EmbeddedDataSourceConfiguration.class, HibernateJpaAutoConfiguration.class, BatchAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(JobLauncher.class)).isNotNull(); - assertThat(this.context.getBean(BatchProperties.class) - .getInitializer().isEnabled()).isFalse(); + assertThat( + this.context.getBean(BatchProperties.class).getInitializer().isEnabled()) + .isFalse(); this.expected.expect(BadSqlGrammarException.class); new JdbcTemplate(this.context.getBean(DataSource.class)) .queryForList("select * from BATCH_JOB_EXECUTION"); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java index f07847bbd16..c5932505bbc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java @@ -107,8 +107,8 @@ public class IntegrationAutoConfigurationTests { public void primaryExporterIsAllowed() { load(CustomMBeanExporter.class); assertThat(this.context.getBeansOfType(MBeanExporter.class)).hasSize(2); - assertThat(this.context.getBean(MBeanExporter.class)).isSameAs( - this.context.getBean("myMBeanExporter")); + assertThat(this.context.getBean(MBeanExporter.class)) + .isSameAs(this.context.getBean("myMBeanExporter")); } private static void assertDomains(MBeanServer mBeanServer, boolean expected, diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java index 03745f35cd7..82b1277544e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java @@ -54,8 +54,8 @@ public class SessionAutoConfigurationJdbcTests JdbcOperationsSessionRepository.class); assertThat(new DirectFieldAccessor(repository).getPropertyValue("tableName")) .isEqualTo("SPRING_SESSION"); - assertThat(this.context.getBean(SessionProperties.class) - .getJdbc().getInitializer().isEnabled()).isTrue(); + assertThat(this.context.getBean(SessionProperties.class).getJdbc() + .getInitializer().isEnabled()).isTrue(); assertThat(this.context.getBean(JdbcOperations.class) .queryForList("select * from SPRING_SESSION")).isEmpty(); } @@ -70,8 +70,8 @@ public class SessionAutoConfigurationJdbcTests JdbcOperationsSessionRepository.class); assertThat(new DirectFieldAccessor(repository).getPropertyValue("tableName")) .isEqualTo("SPRING_SESSION"); - assertThat(this.context.getBean(SessionProperties.class) - .getJdbc().getInitializer().isEnabled()).isFalse(); + assertThat(this.context.getBean(SessionProperties.class).getJdbc() + .getInitializer().isEnabled()).isFalse(); this.thrown.expect(BadSqlGrammarException.class); assertThat(this.context.getBean(JdbcOperations.class) .queryForList("select * from SPRING_SESSION")).isEmpty(); @@ -88,8 +88,8 @@ public class SessionAutoConfigurationJdbcTests JdbcOperationsSessionRepository.class); assertThat(new DirectFieldAccessor(repository).getPropertyValue("tableName")) .isEqualTo("FOO_BAR"); - assertThat(this.context.getBean(SessionProperties.class) - .getJdbc().getInitializer().isEnabled()).isTrue(); + assertThat(this.context.getBean(SessionProperties.class).getJdbc() + .getInitializer().isEnabled()).isTrue(); assertThat(this.context.getBean(JdbcOperations.class) .queryForList("select * from FOO_BAR")).isEmpty(); } @@ -104,8 +104,8 @@ public class SessionAutoConfigurationJdbcTests JdbcOperationsSessionRepository.class); assertThat(new DirectFieldAccessor(repository).getPropertyValue("tableName")) .isEqualTo("FOO_BAR"); - assertThat(this.context.getBean(SessionProperties.class) - .getJdbc().getInitializer().isEnabled()).isFalse(); + assertThat(this.context.getBean(SessionProperties.class).getJdbc() + .getInitializer().isEnabled()).isFalse(); this.thrown.expect(BadSqlGrammarException.class); assertThat(this.context.getBean(JdbcOperations.class) .queryForList("select * from SPRING_SESSION")).isEmpty(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java index 29c1389f59f..dd7b2d05e68 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java @@ -50,7 +50,8 @@ public class SessionAutoConfigurationRedisTests public void redisSessionStoreIsTheDefault() { load(Collections.>singletonList(RedisAutoConfiguration.class)); validateSpringSessionUsesRedis(); - this.output.expect(containsString("Spring Session store type is mandatory: set 'spring.session.store-type=redis' in your configuration")); + this.output.expect(containsString( + "Spring Session store type is mandatory: set 'spring.session.store-type=redis' in your configuration")); } @Test @@ -58,7 +59,8 @@ public class SessionAutoConfigurationRedisTests load(Collections.>singletonList(RedisAutoConfiguration.class), "spring.session.store-type=redis"); validateSpringSessionUsesRedis(); - this.output.expect(not(containsString("Spring Session store type is mandatory: set 'spring.session.store-type=redis' in your configuration"))); + this.output.expect(not(containsString( + "Spring Session store type is mandatory: set 'spring.session.store-type=redis' in your configuration"))); } private void validateSpringSessionUsesRedis() { diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml index 6465a311d0c..b54e7da4cf8 100644 --- a/spring-boot-samples/pom.xml +++ b/spring-boot-samples/pom.xml @@ -81,6 +81,7 @@ spring-boot-sample-session-redis spring-boot-sample-simple spring-boot-sample-test + spring-boot-sample-test-nomockito spring-boot-sample-testng spring-boot-sample-tomcat spring-boot-sample-tomcat-jsp @@ -182,6 +183,25 @@ + + + + org.apache.maven.plugins + + + maven-enforcer-plugin + + + [1.3.1,) + + + enforce + + + + + + diff --git a/spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml b/spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml new file mode 100644 index 00000000000..289e01c32b5 --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + + org.springframework.boot + spring-boot-samples + 1.4.2.BUILD-SNAPSHOT + + spring-boot-sample-test-nomockito + Spring Boot Test Sample No Mockito + Spring Boot Test Sample No Mockito + http://projects.spring.io/spring-boot/ + + Pivotal Software, Inc. + http://www.spring.io + + + ${basedir}/../.. + + + + org.springframework.boot + spring-boot-starter + + + junit + junit + test + + + org.springframework.boot + spring-boot-test + test + + + org.springframework + spring-test + test + + + org.assertj + assertj-core + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/spring-boot-samples/spring-boot-sample-test-nomockito/src/main/java/sample/testnomockito/SampleTestNoMockitoApplication.java b/spring-boot-samples/spring-boot-sample-test-nomockito/src/main/java/sample/testnomockito/SampleTestNoMockitoApplication.java new file mode 100644 index 00000000000..550aa84d6e8 --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-test-nomockito/src/main/java/sample/testnomockito/SampleTestNoMockitoApplication.java @@ -0,0 +1,13 @@ +package sample.testnomockito; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SampleTestNoMockitoApplication { + + public static void main(String[] args) { + SpringApplication.run(SampleTestNoMockitoApplication.class); + } + +} diff --git a/spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTest.java b/spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTest.java new file mode 100644 index 00000000000..589bb0c4f17 --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTest.java @@ -0,0 +1,32 @@ +package sample.testnomockito; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests that {code ResetMocksTestExecutionListener} and + * {@code MockitoTestExecutionListener} gracefully degrade when Mockito is not on the + * classpath. + * + * @author Madhura Bhave + */ +@RunWith(SpringRunner.class) +public class SampleTestNoMockitoApplicationTest { + + // gh-7065 + + @Autowired + private ApplicationContext context; + + @Test + public void contextLoads() throws Exception { + assertThat(this.context).isNotNull(); + } + +} diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java index f0042116d56..5cef1c2cc52 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java @@ -26,6 +26,7 @@ import org.mockito.listeners.MethodInvocationReport; import org.mockito.mock.MockCreationSettings; import org.springframework.util.Assert; +import org.springframework.util.ClassUtils; /** * Reset strategy used on a mock bean. Usually applied to a mock via the @@ -53,8 +54,6 @@ public enum MockReset { */ NONE; - private static final MockUtil util = new MockUtil(); - /** * Create {@link MockSettings settings} to be used with mocks where reset should occur * before each test method runs. @@ -105,12 +104,15 @@ public enum MockReset { @SuppressWarnings("rawtypes") static MockReset get(Object mock) { MockReset reset = MockReset.NONE; - if (util.isMock(mock)) { - MockCreationSettings settings = util.getMockSettings(mock); - List listeners = settings.getInvocationListeners(); - for (Object listener : listeners) { - if (listener instanceof ResetInvocationListener) { - reset = ((ResetInvocationListener) listener).getReset(); + if (ClassUtils.isPresent("org.mockito.internal.util.MockUtil", null)) { + MockUtil mockUtil = new MockUtil(); + if (mockUtil.isMock(mock)) { + MockCreationSettings settings = mockUtil.getMockSettings(mock); + List listeners = settings.getInvocationListeners(); + for (Object listener : listeners) { + if (listener instanceof ResetInvocationListener) { + reset = ((ResetInvocationListener) listener).getReset(); + } } } } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperExampleConfig.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperExampleConfig.java index 15f99f1bdac..d1daf1d6bf0 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperExampleConfig.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperExampleConfig.java @@ -19,7 +19,8 @@ package org.springframework.boot.test.context.bootstrap; import org.springframework.boot.SpringBootConfiguration; /** - * Example configuration used in {@link SpringBootTestContextBootstrapperIntegrationTests}. + * Example configuration used in + * {@link SpringBootTestContextBootstrapperIntegrationTests}. * * @author Phillip Webb */ diff --git a/spring-boot/src/main/java/org/springframework/boot/context/event/EventPublishingRunListener.java b/spring-boot/src/main/java/org/springframework/boot/context/event/EventPublishingRunListener.java index 867b9673b15..de26352fb6c 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/event/EventPublishingRunListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/event/EventPublishingRunListener.java @@ -28,9 +28,9 @@ import org.springframework.core.env.ConfigurableEnvironment; /** * {@link SpringApplicationRunListener} to publish {@link SpringApplicationEvent}s. - * - *

Uses an internal {@link ApplicationEventMulticaster} for the events that are - * fired before the context is actually refreshed. + *

+ * Uses an internal {@link ApplicationEventMulticaster} for the events that are fired + * before the context is actually refreshed. * * @author Phillip Webb * @author Stephane Nicoll @@ -59,8 +59,8 @@ public class EventPublishingRunListener implements SpringApplicationRunListener, @Override public void started() { - this.initialMulticaster.multicastEvent(new ApplicationStartedEvent( - this.application, this.args)); + this.initialMulticaster + .multicastEvent(new ApplicationStartedEvent(this.application, this.args)); } @Override @@ -82,8 +82,8 @@ public class EventPublishingRunListener implements SpringApplicationRunListener, } context.addApplicationListener(listener); } - this.initialMulticaster.multicastEvent(new ApplicationPreparedEvent( - this.application, this.args, context)); + this.initialMulticaster.multicastEvent( + new ApplicationPreparedEvent(this.application, this.args, context)); } @Override diff --git a/spring-boot/src/main/java/org/springframework/boot/env/EnvironmentPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/env/EnvironmentPostProcessor.java index 030995ffa3d..3c29532da7a 100644 --- a/spring-boot/src/main/java/org/springframework/boot/env/EnvironmentPostProcessor.java +++ b/spring-boot/src/main/java/org/springframework/boot/env/EnvironmentPostProcessor.java @@ -23,15 +23,15 @@ import org.springframework.core.env.Environment; /** * Allows for customization of the application's {@link Environment} prior to the * application context being refreshed. - * - *

EnvironmentPostProcessor implementations have to be registered in - * {@code META-INF/spring.factories}, using the fully qualified name of this - * class as the key. - * - *

{@code EnvironmentPostProcessor} processors are encouraged to detect - * whether Spring's {@link org.springframework.core.Ordered Ordered} interface has been - * implemented or if the @{@link org.springframework.core.annotation.Order Order} - * annotation is present and to sort instances accordingly if so prior to invocation. + *

+ * EnvironmentPostProcessor implementations have to be registered in + * {@code META-INF/spring.factories}, using the fully qualified name of this class as the + * key. + *

+ * {@code EnvironmentPostProcessor} processors are encouraged to detect whether Spring's + * {@link org.springframework.core.Ordered Ordered} interface has been implemented or if + * the @{@link org.springframework.core.annotation.Order Order} annotation is present and + * to sort instances accordingly if so prior to invocation. * * @author Andy Wilkinson * @author Stephane Nicoll 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 8259081016f..1deea39b657 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 @@ -67,7 +67,8 @@ public class SpringPhysicalNamingStrategy implements PhysicalNamingStrategy { } StringBuilder text = new StringBuilder(name.getText().replace('.', '_')); for (int i = 1; i < text.length() - 1; i++) { - if (isUnderscoreRequired(text.charAt(i - 1), text.charAt(i), text.charAt(i + 1))) { + if (isUnderscoreRequired(text.charAt(i - 1), text.charAt(i), + text.charAt(i + 1))) { text.insert(i++, '_'); } } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java index 96b7442c09b..5461a70b482 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java @@ -826,8 +826,7 @@ public class ConfigFileApplicationListenerTests { assertThat(environment.containsProperty("customprofile")).isTrue(); assertThat(environment.containsProperty("customprofile-specific")).isTrue(); assertThat(environment.containsProperty("customprofile-customdefault")).isTrue(); - assertThat(environment.acceptsProfiles("customdefault")) - .isTrue(); + assertThat(environment.acceptsProfiles("customdefault")).isTrue(); } private Condition matchingPropertySource(