Skip to content

S
spring-boot
Commit 4fd8f376 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.2.x' 

Closes gh-20503
parents 2f92261f 9fbb664d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java
View file @ 4fd8f376
...@@ -180,11 +180,11 @@ public class DevToolsDataSourceAutoConfiguration { ...@@ -180,11 +180,11 @@ public class DevToolsDataSourceAutoConfiguration {
@Override @Override
public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
ConditionMessage.Builder message = ConditionMessage.forCondition("DevTools DataSource Condition"); 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) { if (dataSourceBeanNames.length != 1) {
return ConditionOutcome.noMatch(message.didNotFind("a single DataSource bean").atAll()); 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()); return ConditionOutcome.noMatch(message.didNotFind("a single DataSourceProperties bean").atAll());
} }
BeanDefinition dataSourceDefinition = context.getRegistry().getBeanDefinition(dataSourceBeanNames[0]); BeanDefinition dataSourceDefinition = context.getRegistry().getBeanDefinition(dataSourceBeanNames[0]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment