SpringCloud/spring-functions-catalog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ConditionalOnMissingBean to fix bean override error

Browse Source
This commit is contained in:
David Turanski
2020-05-29 16:52:15 -04:00
parent 7ff0da8869
commit 49a2f4ef91
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/config-common/pom.xml
View File

@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>

2
common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java
View File

@@ -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.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -35,6 +36,7 @@ import org.springframework.integration.expression.SpelPropertyAccessorRegistrar;
import org.springframework.integration.json.JsonPropertyAccessor;
@Configuration
@ConditionalOnMissingBean(SpelPropertyAccessorRegistrar.class)
public class SpelExpressionConverterConfiguration {
@Bean
public static SpelPropertyAccessorRegistrar spelPropertyAccessorRegistrar() {