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 56bc95566e6031788c96996cf61ce24472cfaf32 Author: Claus Ibsen <[email protected]> AuthorDate: Fri Apr 16 09:11:23 2021 +0200 CAMEL-16520: camel-spring-boot - Auto configuration options for cloud and cluster should not clash with component --- .../src/main/docs/atomix-starter.adoc | 22 +++++++++++----------- .../AtomixClusterServiceAutoConfiguration.java | 8 ++++---- .../AtomixClusterServiceConfiguration.java | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/components-starter/camel-atomix-starter/src/main/docs/atomix-starter.adoc b/components-starter/camel-atomix-starter/src/main/docs/atomix-starter.adoc index 80453e4..f5755d9 100644 --- a/components-starter/camel-atomix-starter/src/main/docs/atomix-starter.adoc +++ b/components-starter/camel-atomix-starter/src/main/docs/atomix-starter.adoc @@ -24,6 +24,17 @@ The component supports 121 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type +| *camel.cluster.atomix.address* | The address of the node - node only. | | String +| *camel.cluster.atomix.attributes* | Custom service attributes. | | Map +| *camel.cluster.atomix.configuration-uri* | The Atomix configuration uri. | | String +| *camel.cluster.atomix.enabled* | Sets if the atomix cluster service should be enabled or not, default is false. | false | Boolean +| *camel.cluster.atomix.ephemeral* | Sets if the local member should join groups as PersistentMember or not (node only). | | Boolean +| *camel.cluster.atomix.id* | The cluster id. | | String +| *camel.cluster.atomix.mode* | Sets the cluster mode. | | AtomixClusterServiceConfiguration$Mode +| *camel.cluster.atomix.nodes* | The address of the nodes composing the cluster. | | Set +| *camel.cluster.atomix.order* | Service lookup order/priority. | | Integer +| *camel.cluster.atomix.storage-level* | The storage mode - node only. | | StorageLevel +| *camel.cluster.atomix.storage-path* | The storage directory - node only. | | String | *camel.component.atomix-map.atomix* | The Atomix instance to use. The option is a io.atomix.Atomix type. | | Atomix | *camel.component.atomix-map.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.atomix-map.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 @@ -134,16 +145,5 @@ The component supports 121 options, which are listed below. | *camel.component.atomix-value.result-header* | The header that wil carry the result. | | String | *camel.component.atomix-value.transport-class-name* | The class name (fqn) of the Atomix transport | io.atomix.catalyst.transport.netty.NettyTransport | String | *camel.component.atomix-value.ttl* | The resource ttl. The option is a long type. | | Long -| *camel.component.atomix.cluster.service.address* | The address of the node - node only. | | String -| *camel.component.atomix.cluster.service.attributes* | Custom service attributes. | | Map -| *camel.component.atomix.cluster.service.configuration-uri* | The Atomix configuration uri. | | String -| *camel.component.atomix.cluster.service.enabled* | Sets if the atomix cluster service should be enabled or not, default is false. | false | Boolean -| *camel.component.atomix.cluster.service.ephemeral* | Sets if the local member should join groups as PersistentMember or not (node only). | | Boolean -| *camel.component.atomix.cluster.service.id* | The cluster id. | | String -| *camel.component.atomix.cluster.service.mode* | Sets the cluster mode. | | AtomixClusterServiceConfiguration$Mode -| *camel.component.atomix.cluster.service.nodes* | The address of the nodes composing the cluster. | | Set -| *camel.component.atomix.cluster.service.order* | Service lookup order/priority. | | Integer -| *camel.component.atomix.cluster.service.storage-level* | The storage mode - node only. | | StorageLevel -| *camel.component.atomix.cluster.service.storage-path* | The storage directory - node only. | | String |=== // spring-boot-auto-configure options: END diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceAutoConfiguration.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceAutoConfiguration.java index 7517acb..12b8412 100644 --- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceAutoConfiguration.java +++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceAutoConfiguration.java @@ -46,7 +46,7 @@ public class AtomixClusterServiceAutoConfiguration { @Bean(name = "atomix-cluster-service") @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON) - @ConditionalOnProperty(prefix = "camel.component.atomix.cluster.service", name = "mode", havingValue = "node") + @ConditionalOnProperty(prefix = "camel.cluster.atomix", name = "mode", havingValue = "node") public CamelClusterService atomixClusterService() { AtomixClusterService service = new AtomixClusterService(); service.setNodes(configuration.getNodes().stream().map(Address::new).collect(Collectors.toList())); @@ -65,7 +65,7 @@ public class AtomixClusterServiceAutoConfiguration { @Bean(name = "atomix-cluster-client-service") @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON) - @ConditionalOnProperty(prefix = "camel.component.atomix.cluster.service", name = "mode", havingValue = "client") + @ConditionalOnProperty(prefix = "camel.cluster.atomix", name = "mode", havingValue = "client") public CamelClusterService atomixClusterClientService() { AtomixClusterClientService service = new AtomixClusterClientService(); service.setNodes(configuration.getNodes().stream().map(Address::new).collect(Collectors.toList())); @@ -87,11 +87,11 @@ public class AtomixClusterServiceAutoConfiguration { super(ConfigurationPhase.REGISTER_BEAN); } - @ConditionalOnProperty(prefix = "camel.component.atomix.cluster.service", name = "enabled") + @ConditionalOnProperty(prefix = "camel.cluster.atomix", name = "enabled") static class IfEnabled { } - @ConditionalOnProperty(prefix = "camel.component.atomix.cluster.service", name = "mode") + @ConditionalOnProperty(prefix = "camel.cluster.atomix", name = "mode") static class WithMode { } } diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceConfiguration.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceConfiguration.java index 20202bf..3e8ad74 100644 --- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceConfiguration.java +++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceConfiguration.java @@ -23,7 +23,7 @@ import java.util.Set; import io.atomix.copycat.server.storage.StorageLevel; import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "camel.component.atomix.cluster.service") +@ConfigurationProperties(prefix = "camel.cluster.atomix") public class AtomixClusterServiceConfiguration { enum Mode { node,
