Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bs-124] Add tests for @ConditionalOnBean

Browse Source 
[#49989537] [bs-124] @ConditionalOnBean doesn't work
This commit is contained in:
Dave Syer
2013-05-16 12:14:11 +01:00
parent 6d21ff71ba
commit ad2e311f2f
6 changed files with 243 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java
View File

@@ -91,6 +91,7 @@ public class WebMvcAutoConfiguration {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/**").addResourceLocations("/")
.addResourceLocations("classpath:/META-INF/resources/")
.addResourceLocations("classpath:/static")
.addResourceLocations("classpath:/");
}

19
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java
View File

@@ -33,6 +33,7 @@ import org.springframework.util.MultiValueMap;
* Base for {@link OnBeanCondition} and {@link OnMissingBeanCondition}.
*
* @author Phillip Webb
* @author Dave Syer
*/
abstract class AbstractOnBeanCondition implements Condition {
@@ -53,9 +54,6 @@ abstract class AbstractOnBeanCondition implements Condition {
List<String> beanClassesFound = new ArrayList<String>();
List<String> beanNamesFound = new ArrayList<String>();
if (this.logger.isDebugEnabled()) {
this.logger.debug("Looking for beans with class: " + beanClasses);
}
for (String beanClass : beanClasses) {
try {
// eagerInit set to false to prevent early instantiation (some
@@ -71,10 +69,6 @@ abstract class AbstractOnBeanCondition implements Condition {
} catch (ClassNotFoundException ex) {
}
}
if (this.logger.isDebugEnabled()) {
this.logger.debug("Looking for beans with names: " + beanNames);
}
for (String beanName : beanNames) {
if (context.getBeanFactory().containsBeanDefinition(beanName)) {
beanNamesFound.add(beanName);
@@ -83,7 +77,16 @@ abstract class AbstractOnBeanCondition implements Condition {
boolean result = evaluate(beanClassesFound, beanNamesFound);
if (this.logger.isDebugEnabled()) {
this.logger.debug("Finished matching and result is matches: " + result);
if (!beanClasses.isEmpty()) {
this.logger.debug("Looking for beans with class: " + beanClasses);
this.logger.debug("Found beans with classes: " + beanClassesFound);
}
if (!beanNames.isEmpty()) {
this.logger.debug("Looking for beans with names: " + beanNames);
this.logger.debug("Found beans with names: " + beanNamesFound);
}
this.logger.debug("Match result is: " + result);
}
return result;
}

4
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java
View File

@@ -54,7 +54,7 @@ class OnClassCondition implements Condition {
}
if (!ClassUtils.isPresent(className, context.getClassLoader())) {
if (logger.isDebugEnabled()) {
logger.debug("Found class: " + className
logger.debug("Class not found: " + className
+ " (search terminated with matches=false)");
}
return false;
@@ -62,7 +62,7 @@ class OnClassCondition implements Condition {
}
}
if (logger.isDebugEnabled()) {
logger.debug("Classes not found (search terminated with matches=true)");
logger.debug("All classes found (search terminated with matches=true)");
}
return true;
}