From 16222270b8f27d808c33c5800c8857d1b0e3aee6 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 28 Nov 2013 13:08:19 +0000 Subject: [PATCH] Improve reporting of SpEL condition matching --- .../boot/autoconfigure/condition/OnExpressionCondition.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java index 34f100677a..ac63835832 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnExpressionCondition.java @@ -38,6 +38,7 @@ public class OnExpressionCondition extends SpringBootCondition { String expression = (String) metadata.getAnnotationAttributes( ConditionalOnExpression.class.getName()).get("value"); + String rawExpression = expression; if (!expression.startsWith("#{")) { // For convenience allow user to provide bare expression with no #{} wrapper expression = "#{" + expression + "}"; @@ -58,7 +59,7 @@ public class OnExpressionCondition extends SpringBootCondition { if (metadata instanceof ClassMetadata) { message.append(" on " + ((ClassMetadata) metadata).getClassName()); } - message.append(": " + expression); + message.append(": " + rawExpression); return new ConditionOutcome(result, message.toString()); }