[camel-spring-boot] 06/11: CAMEL-16520: camel-spring-boot - Auto configuration options for cloud and cluster should not clash with component

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit ecc0a19656761aaf901c0b9e3dbfff79912992fa
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Apr 16 09:31:12 2021 +0200

    CAMEL-16520: camel-spring-boot - Auto configuration options for cloud and cluster should not clash with component
---
 .../src/main/docs/jgroups-raft-starter.adoc                    | 10 +++++-----
 .../springboot/JGroupsRaftClusterServiceAutoConfiguration.java |  2 +-
 .../springboot/JGroupsRaftClusterServiceConfiguration.java     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components-starter/camel-jgroups-raft-starter/src/main/docs/jgroups-raft-starter.adoc b/components-starter/camel-jgroups-raft-starter/src/main/docs/jgroups-raft-starter.adoc
index c9a19e7..c7a86c4 100644
--- a/components-starter/camel-jgroups-raft-starter/src/main/docs/jgroups-raft-starter.adoc
+++ b/components-starter/camel-jgroups-raft-starter/src/main/docs/jgroups-raft-starter.adoc
@@ -24,6 +24,11 @@ The component supports 13 options, which are listed below.
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.cluster.jgroups-raft.enabled* | Sets if the jgroups raft cluster service should be enabled or not, default is false. | false | Boolean
+| *camel.cluster.jgroups-raft.id* | Cluster Service ID |  | String
+| *camel.cluster.jgroups-raft.jgroups-raft-cluster-name* | JGroups Cluster name |  | String
+| *camel.cluster.jgroups-raft.jgroups-raft-config* | JGrups-raft configuration File name |  | String
+| *camel.cluster.jgroups-raft.raft-id* | JGroups-raft ID |  | String
 | *camel.component.jgroups-raft.autowired-enabled* | Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc. | true | Boolean
 | *camel.component.jgroups-raft.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
 | *camel.component.jgroups-raft.channel-properties* | Specifies configuration properties of the RaftHandle JChannel used by the endpoint (ignored if raftHandle ref is provided). | raft.xml | String
@@ -32,10 +37,5 @@ The component supports 13 options, which are listed below.
 | *camel.component.jgroups-raft.raft-handle* | RaftHandle to use. The option is a org.jgroups.raft.RaftHandle type. |  | RaftHandle
 | *camel.component.jgroups-raft.raft-id* | Unique raftId to use. |  | String
 | *camel.component.jgroups-raft.state-machine* | StateMachine to use. The option is a org.jgroups.protocols.raft.StateMachine type. |  | StateMachine
-| *camel.component.jgroups.raft.cluster.service.enabled* | Sets if the jgroups raft cluster service should be enabled or not, default is false. | false | Boolean
-| *camel.component.jgroups.raft.cluster.service.id* | Cluster Service ID |  | String
-| *camel.component.jgroups.raft.cluster.service.jgroups-raft-cluster-name* | JGroups Cluster name |  | String
-| *camel.component.jgroups.raft.cluster.service.jgroups-raft-config* | JGrups-raft configuration File name |  | String
-| *camel.component.jgroups.raft.cluster.service.raft-id* | JGroups-raft ID |  | String
 |===
 // spring-boot-auto-configure options: END
diff --git a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/springboot/JGroupsRaftClusterServiceAutoConfiguration.java b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/springboot/JGroupsRaftClusterServiceAutoConfiguration.java
index 2f647a0..a83b497 100644
--- a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/springboot/JGroupsRaftClusterServiceAutoConfiguration.java
+++ b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/springboot/JGroupsRaftClusterServiceAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Scope;
 
 @Configuration(proxyBeanMethods = false)
 @AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
-@ConditionalOnProperty(prefix = "camel.component.jgroups.raft.cluster.service", name = "enabled")
+@ConditionalOnProperty(prefix = "camel.cluster.jgroups-raft", name = "enabled")
 @EnableConfigurationProperties(JGroupsRaftClusterServiceConfiguration.class)
 public class JGroupsRaftClusterServiceAutoConfiguration {
     @Autowired
diff --git a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/springboot/JGroupsRaftClusterServiceConfiguration.java b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/springboot/JGroupsRaftClusterServiceConfiguration.java
index d842fe5..6fd5078 100644
--- a/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/springboot/JGroupsRaftClusterServiceConfiguration.java
+++ b/components-starter/camel-jgroups-raft-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/springboot/JGroupsRaftClusterServiceConfiguration.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jgroups.raft.springboot.cluster.springboot;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-@ConfigurationProperties(prefix = "camel.component.jgroups.raft.cluster.service")
+@ConfigurationProperties(prefix = "camel.cluster.jgroups-raft")
 public class JGroupsRaftClusterServiceConfiguration {
     /**
      * Sets if the jgroups raft cluster service should be enabled or not, default is false.