From 99289b31bdbf1303ac3359e0376d605d8c2cd381 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Fri, 21 Sep 2018 12:05:42 +0200
Subject: [PATCH] Polishing, avoiding NPE for when functions are not present

Rebased and fixed merge conflicts

Resolves #1481
Resolves #1480
---
 .../cloud/stream/binder/AbstractMessageChannelBinder.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
index 7c470335a..4b7744f4b 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
@@ -117,7 +117,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 	@Autowired(required = false)
 	private IntegrationFlowFunctionSupport integrationFlowFunctionSupport;
 
-	@Autowired
+	@Autowired(required = false)
 	private StreamFunctionProperties streamFunctionProperties;
 
 	public AbstractMessageChannelBinder(String[] headersToEmbed, PP provisioningProvider) {
@@ -194,7 +194,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 		}
 		this.postProcessOutputChannel(outputChannel, producerProperties);
 
-		if (StringUtils.hasText(this.streamFunctionProperties.getDefinition()) && this.processor == null) {
+		if (this.streamFunctionProperties != null && StringUtils.hasText(this.streamFunctionProperties.getDefinition()) && this.processor == null) {
 			outputChannel = this.postProcessOutboundChannelForFunction(outputChannel);
 		}
 
@@ -343,7 +343,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 		try {
 			ConsumerDestination destination = this.provisioningProvider.provisionConsumerDestination(name, group, properties);
 			// the function support for the inbound channel is only for Sink
-			if (StringUtils.hasText(this.streamFunctionProperties.getDefinition()) && this.processor == null) {
+			if (this.streamFunctionProperties != null && StringUtils.hasText(this.streamFunctionProperties.getDefinition()) && this.processor == null) {
 				inputChannel = this.postProcessInboundChannelForFunction(inputChannel);
 			}
 			if (HeaderMode.embeddedHeaders.equals(properties.getHeaderMode())) {