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

Use ResourceLoader from condition context if avilable

Browse Source
This commit is contained in:
Dave Syer
2013-06-03 09:41:15 +01:00
parent aded15227f
commit c99d7a0a09
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java
View File

@@ -39,7 +39,7 @@ class OnResourceCondition implements Condition {
private static Log logger = LogFactory.getLog(OnResourceCondition.class); private static Log logger = LogFactory.getLog(OnResourceCondition.class);
private ResourceLoader loader = new DefaultResourceLoader(); private ResourceLoader defaultResourceLoader = new DefaultResourceLoader();
@Override @Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
@@ -48,6 +48,8 @@ class OnResourceCondition implements Condition {
MultiValueMap<String, Object> attributes = metadata.getAllAnnotationAttributes( MultiValueMap<String, Object> attributes = metadata.getAllAnnotationAttributes(
ConditionalOnResource.class.getName(), true); ConditionalOnResource.class.getName(), true);
ResourceLoader loader = context.getResourceLoader() == null ? this.defaultResourceLoader
: context.getResourceLoader();
if (attributes != null) { if (attributes != null) {
List<String> locations = new ArrayList<String>(); List<String> locations = new ArrayList<String>();
collectValues(locations, attributes.get("resources")); collectValues(locations, attributes.get("resources"));
@@ -57,7 +59,7 @@ class OnResourceCondition implements Condition {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug(checking + "Checking for resource: " + location); logger.debug(checking + "Checking for resource: " + location);
} }
if (!this.loader.getResource(location).exists()) { if (!loader.getResource(location).exists()) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug(checking + "Resource not found: " + location logger.debug(checking + "Resource not found: " + location
+ " (search terminated with matches=false)"); + " (search terminated with matches=false)");