From ccf18001163b1de2387cb42d01d3cbc4a24fdfb5 Mon Sep 17 00:00:00 2001 From: tinexw Date: Sat, 28 Jan 2017 15:18:49 +0100 Subject: [PATCH 1/2] Handle null value in OnExpressionCondition Closes gh-2886 --- .../condition/OnExpressionCondition.java | 5 +- .../condition/OnExpressionConditionTest.java | 82 +++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTest.java 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 8027b2cdeb8..24a637e00a3 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 @@ -51,8 +51,9 @@ class OnExpressionCondition extends SpringBootCondition { if (resolver == null) { resolver = new StandardBeanExpressionResolver(); } - boolean result = (Boolean) resolver.evaluate(expression, expressionContext); - return new ConditionOutcome(result, ConditionMessage + Object result = resolver.evaluate(expression, expressionContext); + boolean match = result == null ? false : (boolean) result; + return new ConditionOutcome(match, ConditionMessage .forCondition(ConditionalOnExpression.class, "(" + rawExpression + ")") .resultedIn(result)); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTest.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTest.java new file mode 100644 index 00000000000..8c27633ae4c --- /dev/null +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTest.java @@ -0,0 +1,82 @@ +/* + * Copyright 2012-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.autoconfigure.condition; + +import java.util.Collections; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +import org.springframework.beans.factory.config.BeanExpressionResolver; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.context.annotation.ConditionContext; +import org.springframework.core.env.Environment; +import org.springframework.core.type.AnnotatedTypeMetadata; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.when; + +/** + * Tests for the {@link OnExpressionCondition}. + * + * @author Kristine Jetzke + */ +@RunWith(MockitoJUnitRunner.class) +public class OnExpressionConditionTest { + + @Mock + private ConditionContext context; + + @Mock + private AnnotatedTypeMetadata metadata; + + @Mock + private Environment environment; + + @Mock + private ConfigurableListableBeanFactory beanFactory; + + @Mock + private BeanExpressionResolver resolver; + + @Before + public void setup() { + when(this.context.getEnvironment()).thenReturn(this.environment); + when(this.environment.resolvePlaceholders(any())).thenReturn("foo"); + when(this.context.getBeanFactory()).thenReturn(this.beanFactory); + when(this.beanFactory.getBeanExpressionResolver()).thenReturn(this.resolver); + + when(this.metadata.getAnnotationAttributes(any())) + .thenReturn(Collections.singletonMap("value", "bar")); + } + + @Test + public void nullShouldEvaluateToFalse() { + when(this.resolver.evaluate(any(), any())).thenReturn(null); + + OnExpressionCondition condition = new OnExpressionCondition(); + ConditionOutcome conditionOutcome = condition.getMatchOutcome(this.context, + this.metadata); + + assertThat(conditionOutcome.isMatch()).isFalse(); + } + +} From 5114c9d651ee97851de3baecefa5a66cb5c4883e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 12 Apr 2017 15:39:45 +0200 Subject: [PATCH 2/2] Polish "Handle null value in OnExpressionCondition" Closes gh-8128 --- .../condition/OnExpressionCondition.java | 4 +- .../ConditionalOnExpressionTests.java | 25 +++++- .../condition/OnExpressionConditionTest.java | 82 ------------------- 3 files changed, 24 insertions(+), 87 deletions(-) delete mode 100644 spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTest.java 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 24a637e00a3..41310de7182 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ class OnExpressionCondition extends SpringBootCondition { resolver = new StandardBeanExpressionResolver(); } Object result = resolver.evaluate(expression, expressionContext); - boolean match = result == null ? false : (boolean) result; + boolean match = result != null && (boolean) result; return new ConditionOutcome(match, ConditionMessage .forCondition(ConditionalOnExpression.class, "(" + rawExpression + ")") .resultedIn(result)); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java index b85966e7d10..fe7823508c2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,13 +28,14 @@ import static org.assertj.core.api.Assertions.assertThat; * Tests for {@link ConditionalOnExpression}. * * @author Dave Syer + * @author Stephane Nicoll */ public class ConditionalOnExpressionTests { private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); @Test - public void testResourceExists() { + public void expressionIsTrue() { this.context.register(BasicConfiguration.class); this.context.refresh(); assertThat(this.context.containsBean("foo")).isTrue(); @@ -42,12 +43,19 @@ public class ConditionalOnExpressionTests { } @Test - public void testResourceNotExists() { + public void expressionIsFalse() { this.context.register(MissingConfiguration.class); this.context.refresh(); assertThat(this.context.containsBean("foo")).isFalse(); } + @Test + public void expressionIsNull() { + this.context.register(NullConfiguration.class); + this.context.refresh(); + assertThat(this.context.containsBean("foo")).isFalse(); + } + @Configuration @ConditionalOnExpression("false") protected static class MissingConfiguration { @@ -70,4 +78,15 @@ public class ConditionalOnExpressionTests { } + @Configuration + @ConditionalOnExpression("true ? null : false") + protected static class NullConfiguration { + + @Bean + public String foo() { + return "foo"; + } + + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTest.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTest.java deleted file mode 100644 index 8c27633ae4c..00000000000 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnExpressionConditionTest.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2012-2017 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.boot.autoconfigure.condition; - -import java.util.Collections; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import org.springframework.beans.factory.config.BeanExpressionResolver; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.context.annotation.ConditionContext; -import org.springframework.core.env.Environment; -import org.springframework.core.type.AnnotatedTypeMetadata; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.BDDMockito.when; - -/** - * Tests for the {@link OnExpressionCondition}. - * - * @author Kristine Jetzke - */ -@RunWith(MockitoJUnitRunner.class) -public class OnExpressionConditionTest { - - @Mock - private ConditionContext context; - - @Mock - private AnnotatedTypeMetadata metadata; - - @Mock - private Environment environment; - - @Mock - private ConfigurableListableBeanFactory beanFactory; - - @Mock - private BeanExpressionResolver resolver; - - @Before - public void setup() { - when(this.context.getEnvironment()).thenReturn(this.environment); - when(this.environment.resolvePlaceholders(any())).thenReturn("foo"); - when(this.context.getBeanFactory()).thenReturn(this.beanFactory); - when(this.beanFactory.getBeanExpressionResolver()).thenReturn(this.resolver); - - when(this.metadata.getAnnotationAttributes(any())) - .thenReturn(Collections.singletonMap("value", "bar")); - } - - @Test - public void nullShouldEvaluateToFalse() { - when(this.resolver.evaluate(any(), any())).thenReturn(null); - - OnExpressionCondition condition = new OnExpressionCondition(); - ConditionOutcome conditionOutcome = condition.getMatchOutcome(this.context, - this.metadata); - - assertThat(conditionOutcome.isMatch()).isFalse(); - } - -}