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

GH-1873 Fix null content-type in FunctionConfiguration

Browse Source 
Resolves #1873
This commit is contained in:
Oleg Zhurakousky
2019-12-18 07:39:12 +01:00
parent c6bb38dcd6
commit e7e04ddca2
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,6 +109,7 @@ import org.springframework.util.StringUtils;
* @author Ilayaperumal Gopinathan
* @since 2.1
*/
@SuppressWarnings("deprecation")
@Configuration
@EnableConfigurationProperties(StreamFunctionProperties.class)
@Import({ BindingBeansRegistrar.class, BinderFactoryAutoConfiguration.class })
@@ -130,7 +131,7 @@ public class FunctionConfiguration {
FunctionBindingRegistrar bindingHolder, BinderAwareChannelResolver dynamicDestinationResolver) {
boolean shouldCreateInitializer = bindableProxyFactories != null
&& (applicationContext.containsBean("output")
&& (applicationContext.containsBean("output") // need this to compose to existing legacy message source
|| ObjectUtils.isEmpty(applicationContext.getBeanNamesForAnnotation(EnableBinding.class)));
return shouldCreateInitializer
@@ -163,19 +164,16 @@ public class FunctionConfiguration {
// gather output content types
List<String> contentTypes = new ArrayList<String>();
Assert.isTrue(proxyFactory.getOutputs().size() == 1, "Supplier with multiple outputs is not supported at the moment.");
for (String outputName : proxyFactory.getOutputs()) {
BindingProperties bindingProperties = serviceProperties.getBindingProperties(outputName);
String contentType = bindingProperties.getProducer() != null && bindingProperties.getProducer().isUseNativeEncoding()
? null : bindingProperties.getContentType();
contentTypes.add(contentType);
String outputName = proxyFactory.getOutputs().iterator().next();
BindingProperties bindingProperties = serviceProperties.getBindingProperties(outputName);
if (!(bindingProperties.getProducer() != null && bindingProperties.getProducer().isUseNativeEncoding())) {
contentTypes.add(bindingProperties.getContentType());
}
// obtain function wrapper with proper output content types
functionWrapper = functionCatalog.lookup(proxyFactory.getFunctionDefinition(), contentTypes.toArray(new String[0]));
Publisher<Object> beginPublishingTrigger = setupBindingTrigger(context);
//!!!!!! TEMPORARY (see assertion about multiple outputs above)
String outputName = proxyFactory.getOutputs().iterator().next();
// end temporary
if (!functionProperties.isComposeFrom() && !functionProperties.isComposeTo()) {
String integrationFlowName = proxyFactory.getFunctionDefinition() + "_integrationflow";
PollableBean pollable = extractPollableAnnotation(functionProperties, context, proxyFactory);