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 9a5d66541c04a040479a2da4b2a0ccc32912753e Author: Claus Ibsen <[email protected]> AuthorDate: Fri Apr 16 09:19:19 2021 +0200 CAMEL-16520: camel-spring-boot - Auto configuration options for cloud and cluster should not clash with component --- .../camel-file-starter/src/main/docs/file-starter.adoc | 14 +++++++------- .../cluster/FileLockClusterServiceAutoConfiguration.java | 2 +- .../cluster/FileLockClusterServiceConfiguration.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components-starter/camel-file-starter/src/main/docs/file-starter.adoc b/components-starter/camel-file-starter/src/main/docs/file-starter.adoc index 6e99ac0..72887cb 100644 --- a/components-starter/camel-file-starter/src/main/docs/file-starter.adoc +++ b/components-starter/camel-file-starter/src/main/docs/file-starter.adoc @@ -24,15 +24,15 @@ The component supports 11 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type +| *camel.cluster.file.acquire-lock-delay* | The time to wait before starting to try to acquire lock. | | String +| *camel.cluster.file.acquire-lock-interval* | The time to wait between attempts to try to acquire lock. | | String +| *camel.cluster.file.attributes* | Custom service attributes. | | Map +| *camel.cluster.file.enabled* | Sets if the file cluster service should be enabled or not, default is false. | false | Boolean +| *camel.cluster.file.id* | Cluster Service ID | | String +| *camel.cluster.file.order* | Service lookup order/priority. | | Integer +| *camel.cluster.file.root* | The root path. | | String | *camel.component.file.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.file.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.file.cluster.service.acquire-lock-delay* | The time to wait before starting to try to acquire lock. | | String -| *camel.component.file.cluster.service.acquire-lock-interval* | The time to wait between attempts to try to acquire lock. | | String -| *camel.component.file.cluster.service.attributes* | Custom service attributes. | | Map -| *camel.component.file.cluster.service.enabled* | Sets if the file cluster service should be enabled or not, default is false. | false | Boolean -| *camel.component.file.cluster.service.id* | Cluster Service ID | | String -| *camel.component.file.cluster.service.order* | Service lookup order/priority. | | Integer -| *camel.component.file.cluster.service.root* | The root path. | | String | *camel.component.file.enabled* | Whether to enable auto configuration of the file component. This is enabled by default. | | Boolean | *camel.component.file.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 then [...] |=== diff --git a/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java b/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java index fd5756c..f2efc6d 100644 --- a/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java +++ b/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Scope; @Configuration @AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class }) -@ConditionalOnProperty(prefix = "camel.component.file.cluster.service", name = "enabled") +@ConditionalOnProperty(prefix = "camel.cluster.file", name = "enabled") @EnableConfigurationProperties(FileLockClusterServiceConfiguration.class) public class FileLockClusterServiceAutoConfiguration { @Autowired diff --git a/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceConfiguration.java b/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceConfiguration.java index 7c11ea0..d761fee 100644 --- a/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceConfiguration.java +++ b/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceConfiguration.java @@ -20,7 +20,7 @@ import java.util.Map; import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "camel.component.file.cluster.service") +@ConfigurationProperties(prefix = "camel.cluster.file") public class FileLockClusterServiceConfiguration { /** * Sets if the file cluster service should be enabled or not, default is false.
