From b634ab79a1575bbbea9377c785a75d43d24f340e Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 19 Jan 2022 11:20:24 +0100 Subject: [PATCH] Cleanup after merging eb-remove branch --- .../cloud/stream/function/FunctionConfiguration.java | 7 +------ .../cloud/stream/function/StreamBridge.java | 1 - .../stream/function/ImplicitFunctionBindingTests.java | 1 - 3 files changed, 1 insertion(+), 8 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 0985b6faa..75003babe 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 @@ -814,7 +814,6 @@ public class FunctionConfiguration { @Override public void afterPropertiesSet() throws Exception { -// if (ObjectUtils.isEmpty(applicationContext.getBeanNamesForAnnotation(EnableBinding.class))) { this.determineFunctionName(functionCatalog, environment); BeanDefinitionRegistry registry = (BeanDefinitionRegistry) applicationContext.getBeanFactory(); @@ -852,11 +851,7 @@ public class FunctionConfiguration { } this.createStandAloneBindingsIfNecessary(registry, applicationContext.getBean(BindingServiceProperties.class)); - } -// } - else { - logger.info("Functional binding is disabled due to the presense of @EnableBinding annotation in your configuration"); - } + } private void createStandAloneBindingsIfNecessary(BeanDefinitionRegistry registry, BindingServiceProperties bindingProperties) { diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StreamBridge.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StreamBridge.java index 4c5b92000..2c2dbeecd 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StreamBridge.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/StreamBridge.java @@ -30,7 +30,6 @@ import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.cloud.function.context.FunctionCatalog; import org.springframework.cloud.function.context.FunctionRegistration; import org.springframework.cloud.function.context.FunctionRegistry; -import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.cloud.function.context.message.MessageUtils; import org.springframework.cloud.stream.binder.Binder; diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java index 066aa911d..4e1e5f015 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java @@ -42,7 +42,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.function.context.FunctionRegistration; import org.springframework.cloud.function.context.catalog.FunctionAroundWrapper; -import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.cloud.stream.binder.Binding;