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 81a66bd373f6c18ebe6709414e0f81614356ebd7 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Apr 16 09:29:47 2021 +0200 CAMEL-16520: camel-spring-boot - Auto configuration options for cloud and cluster should not clash with component --- .../camel-jgroups-starter/src/main/docs/jgroups-starter.adoc | 8 ++++---- .../springboot/JGroupsLockClusterServiceAutoConfiguration.java | 2 +- .../springboot/JGroupsLockClusterServiceConfiguration.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components-starter/camel-jgroups-starter/src/main/docs/jgroups-starter.adoc b/components-starter/camel-jgroups-starter/src/main/docs/jgroups-starter.adoc index 8b9a8e7..5ffa371 100644 --- a/components-starter/camel-jgroups-starter/src/main/docs/jgroups-starter.adoc +++ b/components-starter/camel-jgroups-starter/src/main/docs/jgroups-starter.adoc @@ -24,6 +24,10 @@ The component supports 11 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type +| *camel.cluster.jgroups.enabled* | Sets if the jgroups lock cluster service should be enabled or not, default is false. | false | Boolean +| *camel.cluster.jgroups.id* | Cluster Service ID | | String +| *camel.cluster.jgroups.jgroups-cluster-name* | JGroups Cluster name | | String +| *camel.cluster.jgroups.jgroups-config* | JGrups configuration File name | | String | *camel.component.jgroups.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.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.channel* | Channel to use. The option is a org.jgroups.JChannel type. | | JChannel @@ -31,9 +35,5 @@ The component supports 11 options, which are listed below. | *camel.component.jgroups.enable-view-messages* | If set to true, the consumer endpoint will receive org.jgroups.View messages as well (not only org.jgroups.Message instances). By default only regular messages are consumed by the endpoint. | false | Boolean | *camel.component.jgroups.enabled* | Whether to enable auto configuration of the jgroups component. This is enabled by default. | | Boolean | *camel.component.jgroups.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed th [...] -| *camel.component.jgroups.lock.cluster.service.enabled* | Sets if the jgroups lock cluster service should be enabled or not, default is false. | false | Boolean -| *camel.component.jgroups.lock.cluster.service.id* | Cluster Service ID | | String -| *camel.component.jgroups.lock.cluster.service.jgroups-cluster-name* | JGroups Cluster name | | String -| *camel.component.jgroups.lock.cluster.service.jgroups-config* | JGrups configuration File name | | String |=== // spring-boot-auto-configure options: END diff --git a/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceAutoConfiguration.java b/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceAutoConfiguration.java index 1e78d47e..8f6b5aa 100644 --- a/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceAutoConfiguration.java +++ b/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Scope; @Configuration @AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class }) -@ConditionalOnProperty(prefix = "camel.component.jgroups.lock.cluster.service", name = "enabled") +@ConditionalOnProperty(prefix = "camel.cluster.jgroups", name = "enabled") @EnableConfigurationProperties(JGroupsLockClusterServiceConfiguration.class) public class JGroupsLockClusterServiceAutoConfiguration { @Autowired diff --git a/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceConfiguration.java b/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceConfiguration.java index fcc7013..5327892 100644 --- a/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceConfiguration.java +++ b/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceConfiguration.java @@ -18,7 +18,7 @@ package org.apache.camel.component.jgroups.springboot.cluster.springboot; import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "camel.component.jgroups.lock.cluster.service") +@ConfigurationProperties(prefix = "camel.cluster.jgroups") public class JGroupsLockClusterServiceConfiguration { /** * Sets if the jgroups lock cluster service should be enabled or not, default is false.
