SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issues with binders and BindingProvider

Browse Source 
When multiple binders are present with at least one of them is marked with BindingProvider,
it skips scanning functions for regular message channel based binders.

Resolves #1820
This commit is contained in:
Soby Chacko
2019-10-16 18:42:53 -04:00
committed by Oleg Zhurakousky
parent ad64df05a1
commit 713c252576
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
View File

@@ -588,12 +588,7 @@ public class FunctionConfiguration {
@Override
public void afterPropertiesSet() throws Exception {
Class<?>[] configurationClasses = binderTypeRegistry.getAll().values().iterator().next()
.getConfigurationClasses();
boolean bindingProvider = Stream.of(configurationClasses)
.filter(clazz -> AnnotationUtils.findAnnotation(clazz, BindingProvider.class) != null)
.findFirst().isPresent();
if (!bindingProvider
if (nonBindingProviderBindersFound()
&& ObjectUtils.isEmpty(applicationContext.getBeanNamesForAnnotation(EnableBinding.class))
&& this.determineFunctionName(functionCatalog, environment)) {
BeanDefinitionRegistry registry = (BeanDefinitionRegistry) applicationContext.getBeanFactory();
@@ -626,6 +621,11 @@ public class FunctionConfiguration {
}
}
private boolean nonBindingProviderBindersFound() {
return binderTypeRegistry.getAll().values().stream().anyMatch(binderType -> Stream.of(binderType.getConfigurationClasses())
.anyMatch(clazz -> AnnotationUtils.findAnnotation(clazz, BindingProvider.class) == null));
}
private boolean determineFunctionName(FunctionCatalog catalog, Environment environment) {
String definition = streamFunctionProperties.getDefinition();
if (!StringUtils.hasText(definition)) {