From e3ecd990239244b1ad95b7d22ccca6ef08c4ad53 Mon Sep 17 00:00:00 2001 From: David Turanski Date: Wed, 17 Jun 2020 11:30:28 -0400 Subject: [PATCH] Fix condition on SpelExpressionConverterConfiguration --- .../common/config/SpelExpressionConverterConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java b/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java index 5c95a320..1360a5ec 100644 --- a/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java +++ b/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java @@ -20,6 +20,7 @@ import java.beans.Introspector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.context.annotation.Bean; @@ -36,7 +37,8 @@ import org.springframework.integration.expression.SpelPropertyAccessorRegistrar; import org.springframework.integration.json.JsonPropertyAccessor; @Configuration -@ConditionalOnMissingBean(SpelPropertyAccessorRegistrar.class) +@AutoConfigureAfter(name = "org.springframework.cloud.stream.config.SpelExpressionConverterConfiguration") +@ConditionalOnMissingBean(type = "org.springframework.cloud.stream.config.SpelExpressionConverterConfiguration") public class SpelExpressionConverterConfiguration { @Bean public static SpelPropertyAccessorRegistrar spelPropertyAccessorRegistrar() {