Skip to content

Commit fc9b96a

Browse files
committed
Fix ControlBusController to use any FormattingConversionService
This would satisfy an MVC environment as well as WebFlux * Also fix `@since 6.4` for the `ControlBusController`
1 parent b5ec098 commit fc9b96a

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

spring-integration-http/src/main/java/org/springframework/integration/http/management/ControlBusController.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.beans.factory.BeanFactory;
2525
import org.springframework.beans.factory.BeanFactoryAware;
2626
import org.springframework.beans.factory.InitializingBean;
27-
import org.springframework.beans.factory.annotation.Qualifier;
2827
import org.springframework.expression.EvaluationContext;
2928
import org.springframework.expression.Expression;
3029
import org.springframework.format.support.FormattingConversionService;
@@ -43,7 +42,7 @@
4342
*
4443
* @author Artem Bilan
4544
*
46-
* @since 4.3
45+
* @since 6.4
4746
*/
4847
@RestController
4948
@RequestMapping("/control-bus")
@@ -58,7 +57,7 @@ public class ControlBusController implements BeanFactoryAware, InitializingBean
5857
private EvaluationContext evaluationContext;
5958

6059
public ControlBusController(ControlBusCommandRegistry controlBusCommandRegistry,
61-
@Qualifier("mvcConversionService") FormattingConversionService conversionService) {
60+
FormattingConversionService conversionService) {
6261

6362
this.controlBusCommandRegistry = controlBusCommandRegistry;
6463
this.conversionService = conversionService;

0 commit comments

Comments
 (0)