From efb515d7ee79a5cd520d06b92f388b5f2233483a Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Thu, 28 May 2020 14:12:35 +0200
Subject: [PATCH] Upgrade to s-c-function 3.0.7.RELEASE

---
 pom.xml                                                       | 4 ++--
 .../cloud/stream/function/FunctionConfiguration.java          | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index c0f0688c8..7ad0dffd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.0.BUILD-SNAPSHOT</version>
+		<version>2.3.0.RELEASE</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -25,7 +25,7 @@
 		<java.version>1.8</java.version>
 		<reactor.version>Dysprosium-SR6</reactor.version>
 		<objenesis.version>2.1</objenesis.version>
-		<spring-cloud-function.version>3.0.7.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.0.7.RELEASE</spring-cloud-function.version>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
 		<maven-checkstyle-plugin.includeTestSourceDirectory>true</maven-checkstyle-plugin.includeTestSourceDirectory>
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
index 2ab8dd3ae..1694e6d76 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
@@ -665,7 +665,7 @@ public class FunctionConfiguration {
 			return outputCount;
 		}
 
-		private boolean determineFunctionName(FunctionCatalog catalog, Environment environment) {
+		private void determineFunctionName(FunctionCatalog catalog, Environment environment) {
 			String definition = streamFunctionProperties.getDefinition();
 			if (!StringUtils.hasText(definition)) {
 				definition = environment.getProperty("spring.cloud.function.definition");
@@ -681,7 +681,6 @@ public class FunctionConfiguration {
 			else {
 				streamFunctionProperties.setDefinition(((FunctionInspector) functionCatalog).getName(functionCatalog.lookup("")));
 			}
-			return StringUtils.hasText(streamFunctionProperties.getDefinition());
 		}
 
 		@Override