This is an automated email from the ASF dual-hosted git repository. Croway pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit f18e74c38f19af6268466d581690b565dd9431e0 Author: croway <[email protected]> AuthorDate: Fri Jul 10 18:19:03 2026 +0200 CAMEL-24000: camel-spring-boot - use @ConditionalOnBooleanProperty for route controller auto-configurations Replace @ConditionalOnProperty(name = "enabled") with the clearer @ConditionalOnBooleanProperty (Spring Boot 3.4+) on the supervising and clustered route controller auto-configurations, and drop the redundant in-method isEnabled() re-check and the discouraged null @Bean return in SupervisingRouteControllerAutoConfiguration (the class-level condition already guarantees the property is true). Co-Authored-By: Claude Fable 5 <[email protected]> --- .../ClusteredRouteControllerAutoConfiguration.java | 4 +- ...upervisingRouteControllerAutoConfiguration.java | 69 ++++++++++------------ 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java index b9652cbbc9a..ed9b9d56710 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java @@ -30,13 +30,13 @@ import org.apache.camel.util.ObjectHelper; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @AutoConfiguration(before = CamelAutoConfiguration.class) -@ConditionalOnProperty(prefix = "camel.clustered.controller", name = "enabled") +@ConditionalOnBooleanProperty("camel.clustered.controller.enabled") @EnableConfigurationProperties(ClusteredRouteControllerConfiguration.class) public class ClusteredRouteControllerAutoConfiguration { diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerAutoConfiguration.java index cc4717a9310..fc8025c6e33 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerAutoConfiguration.java @@ -17,58 +17,53 @@ package org.apache.camel.spring.boot.routecontroller; import org.apache.camel.impl.engine.DefaultSupervisingRouteController; -import org.apache.camel.spi.RouteController; import org.apache.camel.spi.SupervisingRouteController; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @AutoConfiguration(before = CamelAutoConfiguration.class) -@ConditionalOnProperty(prefix = "camel.routecontroller", name = "enabled") +@ConditionalOnBooleanProperty("camel.routecontroller.enabled") @EnableConfigurationProperties(SupervisingRouteControllerConfiguration.class) public class SupervisingRouteControllerAutoConfiguration { @Bean @ConditionalOnMissingBean public SupervisingRouteController supervisingRouteController(SupervisingRouteControllerConfiguration config) { - SupervisingRouteController src = null; - - if (config.isEnabled()) { - // switch to supervising route controller - src = new DefaultSupervisingRouteController(); - if (config.getIncludeRoutes() != null) { - src.setIncludeRoutes(config.getIncludeRoutes()); - } - if (config.getExcludeRoutes() != null) { - src.setExcludeRoutes(config.getExcludeRoutes()); - } - if (config.getThreadPoolSize() > 0) { - src.setThreadPoolSize(config.getThreadPoolSize()); - } - if (config.getBackOffDelay() > 0) { - src.setBackOffDelay(config.getBackOffDelay()); - } - if (config.getInitialDelay() > 0) { - src.setInitialDelay(config.getInitialDelay()); - } - if (config.getBackOffMaxAttempts() > 0) { - src.setBackOffMaxAttempts(config.getBackOffMaxAttempts()); - } - if (config.getBackOffMaxDelay() > 0) { - src.setBackOffMaxDelay(config.getBackOffMaxDelay()); - } - if (config.getBackOffMaxElapsedTime() > 0) { - src.setBackOffMaxElapsedTime(config.getBackOffMaxElapsedTime()); - } - if (config.getBackOffMultiplier() > 0) { - src.setBackOffMultiplier(config.getBackOffMultiplier()); - } - src.setUnhealthyOnExhausted(config.isUnhealthyOnExhausted()); - src.setUnhealthyOnRestarting(config.isUnhealthyOnRestarting()); + // switch to supervising route controller + SupervisingRouteController src = new DefaultSupervisingRouteController(); + if (config.getIncludeRoutes() != null) { + src.setIncludeRoutes(config.getIncludeRoutes()); + } + if (config.getExcludeRoutes() != null) { + src.setExcludeRoutes(config.getExcludeRoutes()); + } + if (config.getThreadPoolSize() > 0) { + src.setThreadPoolSize(config.getThreadPoolSize()); + } + if (config.getBackOffDelay() > 0) { + src.setBackOffDelay(config.getBackOffDelay()); + } + if (config.getInitialDelay() > 0) { + src.setInitialDelay(config.getInitialDelay()); + } + if (config.getBackOffMaxAttempts() > 0) { + src.setBackOffMaxAttempts(config.getBackOffMaxAttempts()); + } + if (config.getBackOffMaxDelay() > 0) { + src.setBackOffMaxDelay(config.getBackOffMaxDelay()); + } + if (config.getBackOffMaxElapsedTime() > 0) { + src.setBackOffMaxElapsedTime(config.getBackOffMaxElapsedTime()); + } + if (config.getBackOffMultiplier() > 0) { + src.setBackOffMultiplier(config.getBackOffMultiplier()); } + src.setUnhealthyOnExhausted(config.isUnhealthyOnExhausted()); + src.setUnhealthyOnRestarting(config.isUnhealthyOnRestarting()); return src; }
