Merge branch '2.2.x'

wilkinsona · wilkinsona · commit 4fd8f376dc9d · 2020-03-11T14:02:49.000Z
Closes gh-20503
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java
@@ -180,11 +180,11 @@ public ConfigurationPhase getConfigurationPhase() {
 		@Override
 		public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
 			ConditionMessage.Builder message = ConditionMessage.forCondition("DevTools DataSource Condition");
-			String[] dataSourceBeanNames = context.getBeanFactory().getBeanNamesForType(DataSource.class);
+			String[] dataSourceBeanNames = context.getBeanFactory().getBeanNamesForType(DataSource.class, true, false);
 			if (dataSourceBeanNames.length != 1) {
 				return ConditionOutcome.noMatch(message.didNotFind("a single DataSource bean").atAll());
 			}
-			if (context.getBeanFactory().getBeanNamesForType(DataSourceProperties.class).length != 1) {
+			if (context.getBeanFactory().getBeanNamesForType(DataSourceProperties.class, true, false).length != 1) {
 				return ConditionOutcome.noMatch(message.didNotFind("a single DataSourceProperties bean").atAll());
 			}
 			BeanDefinition dataSourceDefinition = context.getRegistry().getBeanDefinition(dataSourceBeanNames[0]);

Original file line number	Diff line number	Diff line change
`@@ -180,11 +180,11 @@ public ConfigurationPhase getConfigurationPhase() {`
`180`	`180`	`@Override`
`181`	`181`	`public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {`
`182`	`182`	`ConditionMessage.Builder message = ConditionMessage.forCondition("DevTools DataSource Condition");`
`183`		`- String[] dataSourceBeanNames = context.getBeanFactory().getBeanNamesForType(DataSource.class);`
	`183`	`+ String[] dataSourceBeanNames = context.getBeanFactory().getBeanNamesForType(DataSource.class, true, false);`
`184`	`184`	`if (dataSourceBeanNames.length != 1) {`
`185`	`185`	`return ConditionOutcome.noMatch(message.didNotFind("a single DataSource bean").atAll());`
`186`	`186`	`}`
`187`		`- if (context.getBeanFactory().getBeanNamesForType(DataSourceProperties.class).length != 1) {`
	`187`	`+ if (context.getBeanFactory().getBeanNamesForType(DataSourceProperties.class, true, false).length != 1) {`
`188`	`188`	`return ConditionOutcome.noMatch(message.didNotFind("a single DataSourceProperties bean").atAll());`
`189`	`189`	`}`
`190`	`190`	`BeanDefinition dataSourceDefinition = context.getRegistry().getBeanDefinition(dataSourceBeanNames[0]);`