From cbcf725860d57daa9fac5a3117706d90fc07c416 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 8 Aug 2023 16:08:06 -0400 Subject: [PATCH] GH-8697: No autowire for Int ConversionService Fixes https://github.com/spring-projects/spring-integration/issues/8697 The `IntegrationUtils.INTEGRATION_CONVERSION_SERVICE_BEAN_NAME` is not designed for end-user code autowire, rather internal framework requirement * Mark `BeanDefinition` for `IntegrationUtils.INTEGRATION_CONVERSION_SERVICE_BEAN_NAME` as `setAutowireCandidate(false)` (cherry picked from commit f9dc75c7397509cd9c58bf8baf37385ef7f4ed57) --- .../integration/config/IntegrationConverterInitializer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConverterInitializer.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConverterInitializer.java index 8fa83c1716..ee55655a9b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConverterInitializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConverterInitializer.java @@ -65,10 +65,11 @@ public class IntegrationConverterInitializer implements IntegrationConfiguration } if (!registry.containsBeanDefinition(IntegrationUtils.INTEGRATION_CONVERSION_SERVICE_BEAN_NAME)) { + RootBeanDefinition beanDefinition = new RootBeanDefinition(CustomConversionServiceFactoryBean.class); + beanDefinition.setAutowireCandidate(false); registry.registerBeanDefinition(IntegrationUtils.INTEGRATION_CONVERSION_SERVICE_BEAN_NAME, - new RootBeanDefinition(CustomConversionServiceFactoryBean.class)); + beanDefinition); } - } private static boolean isIntegrationConverter(BeanDefinition beanDefinition) {