From e0fdaa5b39bb9357b945308b92602748c9a8a864 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 19 Mar 2021 16:16:46 +0100 Subject: [PATCH] polishing backport comments --- .../cloud/stream/function/FunctionConfiguration.java | 3 --- 1 file changed, 3 deletions(-) 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 a045b2d72..df0e7b378 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 @@ -762,10 +762,7 @@ public class FunctionConfiguration { private void determineFunctionName(FunctionCatalog catalog, Environment environment) { -//======= -// private boolean determineFunctionName(FunctionCatalog catalog, Environment environment) { boolean autodetect = environment.getProperty("spring.cloud.stream.function.autodetect", boolean.class, true); -//>>>>>>> 9db08ec6... GH-2035 Add autodetect property to give user control over function autodetection String definition = streamFunctionProperties.getDefinition(); if (!StringUtils.hasText(definition)) { definition = environment.getProperty("spring.cloud.function.definition");