Repository: camel Updated Branches: refs/heads/master b3619ddb6 -> a0eb2b35f
CAMEL-11917: camel-jgroups-starter : JGroupsLockClusterService auto configuration lacks enable flag Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a0eb2b35 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a0eb2b35 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a0eb2b35 Branch: refs/heads/master Commit: a0eb2b35f827a074238ee20a962793d7ca94d0f4 Parents: 891a25c Author: lburgazzoli <lburgazz...@gmail.com> Authored: Tue Oct 17 11:17:25 2017 +0200 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Tue Oct 17 11:17:42 2017 +0200 ---------------------------------------------------------------------- .../JGroupsLockClusterServiceAutoConfiguration.java | 2 ++ .../JGroupsLockClusterServiceConfiguration.java | 13 +++++++++++++ 2 files changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a0eb2b35/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceAutoConfiguration.java index d41d82d..00c5a53 100644 --- a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceAutoConfiguration.java @@ -24,6 +24,7 @@ import org.apache.camel.util.IntrospectionSupport; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Scope; @Configuration @AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class }) +@ConditionalOnProperty(prefix = "camel.component.jgroups.lock.cluster.service", name = "enabled") @EnableConfigurationProperties(JGroupsLockClusterServiceConfiguration.class) public class JGroupsLockClusterServiceAutoConfiguration { @Autowired http://git-wip-us.apache.org/repos/asf/camel/blob/a0eb2b35/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceConfiguration.java b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceConfiguration.java index 2c52696..9a2821e 100644 --- a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceConfiguration.java @@ -21,6 +21,11 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties(prefix = "camel.component.jgroups.lock.cluster.service") public class JGroupsLockClusterServiceConfiguration { /** + * Sets if the jgroups lock cluster service should be enabled or not, default is false. + */ + private boolean enabled; + + /** * Cluster Service ID */ private String id; @@ -36,6 +41,14 @@ public class JGroupsLockClusterServiceConfiguration { private String jgroupsClusterName; + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public String getId() { return id; }
