root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Improve reporting of SpEL condition matching

This commit is contained in:
Dave Syer 2013-11-28 13:08:19 +00:00
parent 20bede21ad
commit 16222270b8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java
View File

@ -38,6 +38,7 @@ public class OnExpressionCondition extends SpringBootCondition {
String expression = (String) metadata.getAnnotationAttributes( String expression = (String) metadata.getAnnotationAttributes(
ConditionalOnExpression.class.getName()).get("value"); ConditionalOnExpression.class.getName()).get("value");
String rawExpression = expression;
if (!expression.startsWith("#{")) { if (!expression.startsWith("#{")) {
// For convenience allow user to provide bare expression with no #{} wrapper // For convenience allow user to provide bare expression with no #{} wrapper
expression = "#{" + expression + "}"; expression = "#{" + expression + "}";
@ -58,7 +59,7 @@ public class OnExpressionCondition extends SpringBootCondition {
if (metadata instanceof ClassMetadata) { if (metadata instanceof ClassMetadata) {
message.append(" on " + ((ClassMetadata) metadata).getClassName()); message.append(" on " + ((ClassMetadata) metadata).getClassName());
} }
message.append(": " + expression); message.append(": " + rawExpression);
return new ConditionOutcome(result, message.toString()); return new ConditionOutcome(result, message.toString());
} }