[bs-22] Add tests for variour @Conditional implementations

[#48127729] [bs-22] Add missing unit tests
This commit is contained in:
Dave Syer
2013-05-21 09:51:49 +01:00
parent c6b4c48181
commit caf1aab9db
6 changed files with 288 additions and 3 deletions

View File

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Conditional;
* @author Dave Syer
*
*/
@Conditional(ExpressionCondition.class)
@Conditional(OnExpressionCondition.class)
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE, ElementType.METHOD })
public @interface ConditionalOnExpression {

View File

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.config.BeanExpressionResolver;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.annotation.Condition;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.context.expression.StandardBeanExpressionResolver;
import org.springframework.core.type.AnnotatedTypeMetadata;
import org.springframework.core.type.ClassMetadata;
@@ -31,9 +32,9 @@ import org.springframework.core.type.ClassMetadata;
* @author Dave Syer
*
*/
public class ExpressionCondition implements Condition {
public class OnExpressionCondition implements Condition {
private static Log logger = LogFactory.getLog(ExpressionCondition.class);
private static Log logger = LogFactory.getLog(OnExpressionCondition.class);
@Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
@@ -61,6 +62,9 @@ public class ExpressionCondition implements Condition {
BeanExpressionResolver resolver = beanFactory.getBeanExpressionResolver();
BeanExpressionContext expressionContext = (beanFactory != null) ? new BeanExpressionContext(
beanFactory, null) : null;
if (resolver == null) {
resolver = new StandardBeanExpressionResolver();
}
Boolean result = (Boolean) resolver.evaluate(value, expressionContext);
if (logger.isDebugEnabled()) {
logger.debug(checking + "Finished matching and result is matches=" + result);