From fc9b96a26e03cc28b6095b6dc2f3be62853bff3c Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 14 Aug 2024 11:05:11 -0400 Subject: [PATCH] Fix `ControlBusController` to use any `FormattingConversionService` This would satisfy an MVC environment as well as WebFlux * Also fix `@since 6.4` for the `ControlBusController` --- .../integration/http/management/ControlBusController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/management/ControlBusController.java b/spring-integration-http/src/main/java/org/springframework/integration/http/management/ControlBusController.java index 047337b8a8..00eeb50554 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/management/ControlBusController.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/management/ControlBusController.java @@ -24,7 +24,6 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.format.support.FormattingConversionService; @@ -43,7 +42,7 @@ import org.springframework.web.bind.annotation.RestController; * * @author Artem Bilan * - * @since 4.3 + * @since 6.4 */ @RestController @RequestMapping("/control-bus") @@ -58,7 +57,7 @@ public class ControlBusController implements BeanFactoryAware, InitializingBean private EvaluationContext evaluationContext; public ControlBusController(ControlBusCommandRegistry controlBusCommandRegistry, - @Qualifier("mvcConversionService") FormattingConversionService conversionService) { + FormattingConversionService conversionService) { this.controlBusCommandRegistry = controlBusCommandRegistry; this.conversionService = conversionService;