From 30a677646fe3817bb0f3d035c3d2f202d3ec9e1b Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 27 Sep 2016 20:37:32 +0900 Subject: [PATCH] Polish Closes gh-7030 --- .../autoconfigure/jdbc/DataSourceAutoConfiguration.java | 6 +++--- .../resource/OAuth2ResourceServerConfiguration.java | 2 +- .../web/OnEnabledResourceChainCondition.java | 8 ++++---- .../autoconfigure/condition/ConditionMessageTests.java | 4 ++-- .../boot/test/mock/mockito/QualifierDefinitionTests.java | 5 ----- .../src/it/run-devtools/verify.groovy | 2 +- 6 files changed, 11 insertions(+), 16 deletions(-) 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 3615b730933..c93014cac76 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 @@ -224,16 +224,16 @@ public class DataSourceAutoConfiguration { public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { ConditionMessage.Builder message = ConditionMessage - .forCondition("EmbeddedDataAvailable"); + .forCondition("DataSourceAvailable"); if (hasBean(context, DataSource.class) || hasBean(context, XADataSource.class)) { return ConditionOutcome - .match(message.foundExactly("existing database bean")); + .match(message.foundExactly("existing data source bean")); } if (anyMatches(context, metadata, this.pooledCondition, this.embeddedCondition)) { return ConditionOutcome - .match(message.foundExactly("existing auto-configured database")); + .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 dabdaa33064..bfb70ef3492 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 @@ -127,7 +127,7 @@ public class OAuth2ResourceServerConfiguration { } if (StringUtils.hasText(resolver.getProperty("user-info-uri"))) { return ConditionOutcome - .match(message.foundExactly("user-info-url property")); + .match(message.foundExactly("user-info-uri property")); } if (ClassUtils.isPresent(AUTHORIZATION_ANNOTATION, null)) { if (AuthorizationServerEndpointsConfigurationBeanCondition 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 264043dceac..41e7ec5d43b 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 @@ -36,7 +36,7 @@ import org.springframework.util.ClassUtils; */ class OnEnabledResourceChainCondition extends SpringBootCondition { - private static final String WEBJAR_ASSERT_LOCATOR = "org.webjars.WebJarAssetLocator"; + private static final String WEBJAR_ASSET_LOCATOR = "org.webjars.WebJarAssetLocator"; @Override public ConditionOutcome getMatchOutcome(ConditionContext context, @@ -50,13 +50,13 @@ class OnEnabledResourceChainCondition extends SpringBootCondition { ConditionMessage.Builder message = ConditionMessage .forCondition(ConditionalOnEnabledResourceChain.class); if (match == null) { - if (ClassUtils.isPresent(WEBJAR_ASSERT_LOCATOR, + if (ClassUtils.isPresent(WEBJAR_ASSET_LOCATOR, getClass().getClassLoader())) { return ConditionOutcome - .match(message.found("class").items(WEBJAR_ASSERT_LOCATOR)); + .match(message.found("class").items(WEBJAR_ASSET_LOCATOR)); } return ConditionOutcome - .noMatch(message.didNotFind("class").items(WEBJAR_ASSERT_LOCATOR)); + .noMatch(message.didNotFind("class").items(WEBJAR_ASSET_LOCATOR)); } if (match) { return ConditionOutcome.match(message.because("enabled")); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionMessageTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionMessageTests.java index 2d1e3160b61..7155b6fde28 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionMessageTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionMessageTests.java @@ -45,13 +45,13 @@ public class ConditionMessageTests { } @Test - public void toStringWhenHasMessageShouldReturnMessage() throws Exception { + public void toStringWhenEmptyShouldReturnEmptyString() throws Exception { ConditionMessage message = ConditionMessage.empty(); assertThat(message.toString()).isEqualTo(""); } @Test - public void toStringWhenEmptyShouldReturnEmptyString() throws Exception { + public void toStringWhenHasMessageShouldReturnMessage() throws Exception { ConditionMessage message = ConditionMessage.of("Test"); assertThat(message.toString()).isEqualTo("Test"); } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java index b636fc42f09..eeeaa0e84ed 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/QualifierDefinitionTests.java @@ -21,9 +21,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Field; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; @@ -47,9 +45,6 @@ import static org.mockito.Mockito.verify; */ public class QualifierDefinitionTests { - @Rule - public ExpectedException thrown = ExpectedException.none(); - @Mock private ConfigurableListableBeanFactory beanFactory; diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/verify.groovy b/spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/verify.groovy index fa0ecade552..ac9957acf2d 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/verify.groovy +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/run-devtools/verify.groovy @@ -2,5 +2,5 @@ import static org.junit.Assert.assertTrue def file = new File(basedir, "build.log") assertTrue 'Devtools should have been detected', file.text.contains('Fork mode disabled, devtools will be disabled') -assertTrue 'Application should have ran', file.text.contains("I haz been run") +assertTrue 'Application should have run', file.text.contains("I haz been run")