You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/10/17 09:20:32 UTC

[2/2] camel git commit: CAMEL-11917: camel-jgroups-starter : JGroupsLockClusterService auto configuration lacks enable flag

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/a9a289d2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9a289d2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9a289d2

Branch: refs/heads/camel-2.20.x
Commit: a9a289d283d8f0347c09d1183f839a9692cf80dc
Parents: f28dc0a
Author: lburgazzoli <lb...@gmail.com>
Authored: Tue Oct 17 11:17:25 2017 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Tue Oct 17 11:20:17 2017 +0200

----------------------------------------------------------------------
 .../JGroupsLockClusterServiceAutoConfiguration.java    |  2 ++
 .../JGroupsLockClusterServiceConfiguration.java        | 13 +++++++++++++
 2 files changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a9a289d2/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/a9a289d2/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;
     }