You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/01 09:16:28 UTC
[camel-spring-boot] 02/02: CAMEL-14635: Make broker-u-r-l as
broker-url in spring boot auto configuration
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 ce8a626ebde024eb088d433876bcaebc137b71da
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Mar 1 10:16:14 2020 +0100
CAMEL-14635: Make broker-u-r-l as broker-url in spring boot auto configuration
---
.../src/main/docs/activemq-starter.adoc | 8 ++---
.../springboot/ActiveMQComponentConfiguration.java | 42 +++++++++++-----------
.../src/main/docs/amqp-starter.adoc | 6 ++--
.../springboot/AMQPComponentConfiguration.java | 32 ++++++++---------
.../src/main/docs/stomp-starter.adoc | 2 +-
.../springboot/StompComponentConfiguration.java | 10 +++---
.../src/main/resources/application.properties | 2 +-
.../maven/SpringBootAutoConfigurationMojo.java | 16 +++++++++
8 files changed, 67 insertions(+), 51 deletions(-)
diff --git a/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc b/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc
index 103061a..d90a359 100644
--- a/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc
+++ b/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc
@@ -39,7 +39,7 @@ The component supports 100 options, which are listed below.
| *camel.component.activemq.auto-startup* | Specifies whether the consumer container should auto-startup. | true | Boolean
| *camel.component.activemq.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.activemq.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.activemq.broker-u-r-l* | Sets the broker URL to use to connect to ActiveMQ | | String
+| *camel.component.activemq.broker-url* | Sets the broker URL to use to connect to ActiveMQ | | String
| *camel.component.activemq.cache-level* | Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details. | | Integer
| *camel.component.activemq.cache-level-name* | Sets the cache level by name for the underlying JMS resources. Possible values are: CACHE_AUTO, CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default setting is CACHE_AUTO. See the Spring documentation and Transactions Cache Levels for more information. | CACHE_AUTO | String
| *camel.component.activemq.client-id* | Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. | | String
@@ -70,8 +70,8 @@ The component supports 100 options, which are listed below.
| *camel.component.activemq.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String
| *camel.component.activemq.idle-consumer-limit* | Specify the limit for the number of consumers that are allowed to be idle at any given time. | 1 | Integer
| *camel.component.activemq.idle-task-execution-limit* | Specifies the limit for idle executions of a receive task, not having received any message within its execution. If this limit is reached, the task will shut down and leave receiving to other executing tasks (in the case of dynamic scheduling; see the maxConcurrentConsumers setting). There is additional doc available from Spring. | 1 | Integer
-| *camel.component.activemq.include-all-j-m-s-x-properties* | Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true will include properties such as JMSXAppID, and JMSXUserID etc. Note: If you are using a custom headerFilterStrategy then this option does not apply. | false | Boolean
-| *camel.component.activemq.include-sent-j-m-s-message-i-d* | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | Boolean
+| *camel.component.activemq.include-all-jmsx-properties* | Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true will include properties such as JMSXAppID, and JMSXUserID etc. Note: If you are using a custom headerFilterStrategy then this option does not apply. | false | Boolean
+| *camel.component.activemq.include-sent-jms-message-id* | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | Boolean
| *camel.component.activemq.jms-key-format-strategy* | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides two implementations out of the box: default and passthrough. The default strategy will safely marshal dots and hyphens (. and -). The passthrough strategy leaves the key as is. Can be used for JMS brokers which do not care whether JMS header keys contain illegal characters. You can provide your own implementation [...]
| *camel.component.activemq.jms-message-type* | Allows you to force the use of a specific javax.jms.Message implementation for sending JMS messages. Possible values are: Bytes, Map, Object, Stream, Text. By default, Camel would determine which JMS message type to use from the In body type. This option allows you to specify it. | | JmsMessageType
| *camel.component.activemq.lazy-create-transaction-manager* | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | Boolean
@@ -118,7 +118,7 @@ The component supports 100 options, which are listed below.
| *camel.component.activemq.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this opti [...]
| *camel.component.activemq.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. The following fields are transferred: In body, Out body, Fault body, In headers, Out headers, Fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. You must enable this option on both the producer and consumer side, so Camel knows the p [...]
| *camel.component.activemq.trust-all-packages* | Define if all Java packages are trusted or not (for Java object JMS message types). Notice its not recommended practice to send Java serialized objects over network. Setting this to true can expose security risks, so use this with care. | false | Boolean
-| *camel.component.activemq.use-message-i-d-as-correlation-i-d* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
+| *camel.component.activemq.use-message-id-as-correlation-id* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
| *camel.component.activemq.use-pooled-connection* | Enables or disables whether a PooledConnectionFactory will be used so that when messages are sent to ActiveMQ from outside of a message consuming thread, pooling will be used rather than the default with the Spring JmsTemplate which will create a new connection, session, producer for each message then close them all down again. The default value is true. | false | Boolean
| *camel.component.activemq.use-single-connection* | Enables or disables whether a Spring SingleConnectionFactory will be used so that when messages are sent to ActiveMQ from outside of a message consuming thread, pooling will be used rather than the default with the Spring JmsTemplate which will create a new connection, session, producer for each message then close them all down again. The default value is false and a pooled connection is used by default. | false | Boolean
| *camel.component.activemq.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
diff --git a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
index c4813c2..ecca044 100644
--- a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
+++ b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
@@ -47,7 +47,7 @@ public class ActiveMQComponentConfiguration
/**
* Sets the broker URL to use to connect to ActiveMQ
*/
- private String brokerURL;
+ private String brokerUrl;
/**
* Sets the JMS client ID to use. Note that this value, if specified, must
* be unique and can only be used by a single JMS connection instance. It is
@@ -463,7 +463,7 @@ public class ActiveMQComponentConfiguration
* actual JMSMessageID that was used by the JMS client when the message was
* sent to the JMS destination.
*/
- private Boolean includeSentJMSMessageID = false;
+ private Boolean includeSentJmsMessageId = false;
/**
* Sets the cache level by name for the reply consumer when doing
* request/reply over JMS. This option only applies when using fixed reply
@@ -579,7 +579,7 @@ public class ActiveMQComponentConfiguration
* and JMSXUserID etc. Note: If you are using a custom headerFilterStrategy
* then this option does not apply.
*/
- private Boolean includeAllJMSXProperties = false;
+ private Boolean includeAllJmsxProperties = false;
/**
* Pluggable strategy for encoding and decoding JMS keys so they can be
* compliant with the JMS specification. Camel provides two implementations
@@ -702,7 +702,7 @@ public class ActiveMQComponentConfiguration
* Specifies whether JMSMessageID should always be used as JMSCorrelationID
* for InOut messages.
*/
- private Boolean useMessageIDAsCorrelationID = false;
+ private Boolean useMessageIdAsCorrelationId = false;
/**
* Number of times to wait for provisional correlation id to be updated to
* the actual correlation id when doing request/reply over JMS and when the
@@ -764,12 +764,12 @@ public class ActiveMQComponentConfiguration
*/
private Integer transactionTimeout = -1;
- public String getBrokerURL() {
- return brokerURL;
+ public String getBrokerUrl() {
+ return brokerUrl;
}
- public void setBrokerURL(String brokerURL) {
- this.brokerURL = brokerURL;
+ public void setBrokerUrl(String brokerUrl) {
+ this.brokerUrl = brokerUrl;
}
public String getClientId() {
@@ -1209,12 +1209,12 @@ public class ActiveMQComponentConfiguration
this.forceSendOriginalMessage = forceSendOriginalMessage;
}
- public Boolean getIncludeSentJMSMessageID() {
- return includeSentJMSMessageID;
+ public Boolean getIncludeSentJmsMessageId() {
+ return includeSentJmsMessageId;
}
- public void setIncludeSentJMSMessageID(Boolean includeSentJMSMessageID) {
- this.includeSentJMSMessageID = includeSentJMSMessageID;
+ public void setIncludeSentJmsMessageId(Boolean includeSentJmsMessageId) {
+ this.includeSentJmsMessageId = includeSentJmsMessageId;
}
public String getReplyToCacheLevelName() {
@@ -1332,12 +1332,12 @@ public class ActiveMQComponentConfiguration
this.idleTaskExecutionLimit = idleTaskExecutionLimit;
}
- public Boolean getIncludeAllJMSXProperties() {
- return includeAllJMSXProperties;
+ public Boolean getIncludeAllJmsxProperties() {
+ return includeAllJmsxProperties;
}
- public void setIncludeAllJMSXProperties(Boolean includeAllJMSXProperties) {
- this.includeAllJMSXProperties = includeAllJMSXProperties;
+ public void setIncludeAllJmsxProperties(Boolean includeAllJmsxProperties) {
+ this.includeAllJmsxProperties = includeAllJmsxProperties;
}
public JmsKeyFormatStrategy getJmsKeyFormatStrategy() {
@@ -1463,13 +1463,13 @@ public class ActiveMQComponentConfiguration
this.transferExchange = transferExchange;
}
- public Boolean getUseMessageIDAsCorrelationID() {
- return useMessageIDAsCorrelationID;
+ public Boolean getUseMessageIdAsCorrelationId() {
+ return useMessageIdAsCorrelationId;
}
- public void setUseMessageIDAsCorrelationID(
- Boolean useMessageIDAsCorrelationID) {
- this.useMessageIDAsCorrelationID = useMessageIDAsCorrelationID;
+ public void setUseMessageIdAsCorrelationId(
+ Boolean useMessageIdAsCorrelationId) {
+ this.useMessageIdAsCorrelationId = useMessageIdAsCorrelationId;
}
public Integer getWaitForProvisionCorrelationToBeUpdatedCounter() {
diff --git a/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc b/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc
index a0885d4..54c3f5a 100644
--- a/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc
+++ b/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc
@@ -69,9 +69,9 @@ The component supports 97 options, which are listed below.
| *camel.component.amqp.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String
| *camel.component.amqp.idle-consumer-limit* | Specify the limit for the number of consumers that are allowed to be idle at any given time. | 1 | Integer
| *camel.component.amqp.idle-task-execution-limit* | Specifies the limit for idle executions of a receive task, not having received any message within its execution. If this limit is reached, the task will shut down and leave receiving to other executing tasks (in the case of dynamic scheduling; see the maxConcurrentConsumers setting). There is additional doc available from Spring. | 1 | Integer
-| *camel.component.amqp.include-all-j-m-s-x-properties* | Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true will include properties such as JMSXAppID, and JMSXUserID etc. Note: If you are using a custom headerFilterStrategy then this option does not apply. | false | Boolean
+| *camel.component.amqp.include-all-jmsx-properties* | Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true will include properties such as JMSXAppID, and JMSXUserID etc. Note: If you are using a custom headerFilterStrategy then this option does not apply. | false | Boolean
| *camel.component.amqp.include-amqp-annotations* | Whether to include AMQP annotations when mapping from AMQP to Camel Message. Setting this to true will map AMQP message annotations to message headers. Due to limitations in Apache Qpid JMS API, currently delivery annotations are ignored. | false | Boolean
-| *camel.component.amqp.include-sent-j-m-s-message-i-d* | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | Boolean
+| *camel.component.amqp.include-sent-jms-message-id* | Only applicable when sending to JMS destination using InOnly (eg fire and forget). Enabling this option will enrich the Camel Exchange with the actual JMSMessageID that was used by the JMS client when the message was sent to the JMS destination. | false | Boolean
| *camel.component.amqp.jms-key-format-strategy* | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides two implementations out of the box: default and passthrough. The default strategy will safely marshal dots and hyphens (. and -). The passthrough strategy leaves the key as is. Can be used for JMS brokers which do not care whether JMS header keys contain illegal characters. You can provide your own implementation of t [...]
| *camel.component.amqp.jms-message-type* | Allows you to force the use of a specific javax.jms.Message implementation for sending JMS messages. Possible values are: Bytes, Map, Object, Stream, Text. By default, Camel would determine which JMS message type to use from the In body type. This option allows you to specify it. | | JmsMessageType
| *camel.component.amqp.lazy-create-transaction-manager* | If true, Camel will create a JmsTransactionManager, if there is no transactionManager injected when option transacted=true. | true | Boolean
@@ -117,7 +117,7 @@ The component supports 97 options, which are listed below.
| *camel.component.amqp.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
| *camel.component.amqp.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option t [...]
| *camel.component.amqp.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. The following fields are transferred: In body, Out body, Fault body, In headers, Out headers, Fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. You must enable this option on both the producer and consumer side, so Camel knows the paylo [...]
-| *camel.component.amqp.use-message-i-d-as-correlation-i-d* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
+| *camel.component.amqp.use-message-id-as-correlation-id* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
| *camel.component.amqp.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
| *camel.component.amqp.wait-for-provision-correlation-to-be-updated-counter* | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | Integer
| *camel.component.amqp.wait-for-provision-correlation-to-be-updated-thread-sleeping-time* | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | Long
diff --git a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
index 12d59a0..9756a11 100644
--- a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
+++ b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
@@ -435,7 +435,7 @@ public class AMQPComponentConfiguration
* actual JMSMessageID that was used by the JMS client when the message was
* sent to the JMS destination.
*/
- private Boolean includeSentJMSMessageID = false;
+ private Boolean includeSentJmsMessageId = false;
/**
* Sets the cache level by name for the reply consumer when doing
* request/reply over JMS. This option only applies when using fixed reply
@@ -556,7 +556,7 @@ public class AMQPComponentConfiguration
* and JMSXUserID etc. Note: If you are using a custom headerFilterStrategy
* then this option does not apply.
*/
- private Boolean includeAllJMSXProperties = false;
+ private Boolean includeAllJmsxProperties = false;
/**
* Pluggable strategy for encoding and decoding JMS keys so they can be
* compliant with the JMS specification. Camel provides two implementations
@@ -679,7 +679,7 @@ public class AMQPComponentConfiguration
* Specifies whether JMSMessageID should always be used as JMSCorrelationID
* for InOut messages.
*/
- private Boolean useMessageIDAsCorrelationID = false;
+ private Boolean useMessageIdAsCorrelationId = false;
/**
* Number of times to wait for provisional correlation id to be updated to
* the actual correlation id when doing request/reply over JMS and when the
@@ -1154,12 +1154,12 @@ public class AMQPComponentConfiguration
this.forceSendOriginalMessage = forceSendOriginalMessage;
}
- public Boolean getIncludeSentJMSMessageID() {
- return includeSentJMSMessageID;
+ public Boolean getIncludeSentJmsMessageId() {
+ return includeSentJmsMessageId;
}
- public void setIncludeSentJMSMessageID(Boolean includeSentJMSMessageID) {
- this.includeSentJMSMessageID = includeSentJMSMessageID;
+ public void setIncludeSentJmsMessageId(Boolean includeSentJmsMessageId) {
+ this.includeSentJmsMessageId = includeSentJmsMessageId;
}
public String getReplyToCacheLevelName() {
@@ -1285,12 +1285,12 @@ public class AMQPComponentConfiguration
this.idleTaskExecutionLimit = idleTaskExecutionLimit;
}
- public Boolean getIncludeAllJMSXProperties() {
- return includeAllJMSXProperties;
+ public Boolean getIncludeAllJmsxProperties() {
+ return includeAllJmsxProperties;
}
- public void setIncludeAllJMSXProperties(Boolean includeAllJMSXProperties) {
- this.includeAllJMSXProperties = includeAllJMSXProperties;
+ public void setIncludeAllJmsxProperties(Boolean includeAllJmsxProperties) {
+ this.includeAllJmsxProperties = includeAllJmsxProperties;
}
public JmsKeyFormatStrategy getJmsKeyFormatStrategy() {
@@ -1416,13 +1416,13 @@ public class AMQPComponentConfiguration
this.transferExchange = transferExchange;
}
- public Boolean getUseMessageIDAsCorrelationID() {
- return useMessageIDAsCorrelationID;
+ public Boolean getUseMessageIdAsCorrelationId() {
+ return useMessageIdAsCorrelationId;
}
- public void setUseMessageIDAsCorrelationID(
- Boolean useMessageIDAsCorrelationID) {
- this.useMessageIDAsCorrelationID = useMessageIDAsCorrelationID;
+ public void setUseMessageIdAsCorrelationId(
+ Boolean useMessageIdAsCorrelationId) {
+ this.useMessageIdAsCorrelationId = useMessageIdAsCorrelationId;
}
public Integer getWaitForProvisionCorrelationToBeUpdatedCounter() {
diff --git a/components-starter/camel-stomp-starter/src/main/docs/stomp-starter.adoc b/components-starter/camel-stomp-starter/src/main/docs/stomp-starter.adoc
index f52a918..f407536 100644
--- a/components-starter/camel-stomp-starter/src/main/docs/stomp-starter.adoc
+++ b/components-starter/camel-stomp-starter/src/main/docs/stomp-starter.adoc
@@ -26,7 +26,7 @@ The component supports 14 options, which are listed below.
| Name | Description | Default | Type
| *camel.component.stomp.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.stomp.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.stomp.broker-u-r-l* | The URI of the Stomp broker to connect to | tcp://localhost:61613 | String
+| *camel.component.stomp.broker-url* | The URI of the Stomp broker to connect to | tcp://localhost:61613 | String
| *camel.component.stomp.configuration* | Component configuration. The option is a org.apache.camel.component.stomp.StompConfiguration type. | | String
| *camel.component.stomp.custom-headers* | To set custom headers. The option is a java.util.Properties type. | | String
| *camel.component.stomp.enabled* | Whether to enable auto configuration of the stomp component. This is enabled by default. | | Boolean
diff --git a/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java b/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
index e0ca993..584c6a5 100644
--- a/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
+++ b/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
@@ -40,7 +40,7 @@ public class StompComponentConfiguration
/**
* The URI of the Stomp broker to connect to
*/
- private String brokerURL = "tcp://localhost:61613";
+ private String brokerUrl = "tcp://localhost:61613";
/**
* To set custom headers. The option is a java.util.Properties type.
*/
@@ -107,12 +107,12 @@ public class StompComponentConfiguration
*/
private Boolean useGlobalSslContextParameters = false;
- public String getBrokerURL() {
- return brokerURL;
+ public String getBrokerUrl() {
+ return brokerUrl;
}
- public void setBrokerURL(String brokerURL) {
- this.brokerURL = brokerURL;
+ public void setBrokerUrl(String brokerUrl) {
+ this.brokerUrl = brokerUrl;
}
public String getCustomHeaders() {
diff --git a/examples/camel-example-spring-boot-activemq/src/main/resources/application.properties b/examples/camel-example-spring-boot-activemq/src/main/resources/application.properties
index feee4eb..fb00b51 100644
--- a/examples/camel-example-spring-boot-activemq/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-activemq/src/main/resources/application.properties
@@ -21,6 +21,6 @@ camel.springboot.main-run-controller = true
# setup camel-activemq-starter with the url of the remote broker
# you can change the port number to 61617 and reconfigure conf/activemq.xml to use port 61617 instead of 61616
# to try using a different port than the default
-camel.component.activemq.broker-u-r-l=tcp://localhost:61616
+camel.component.activemq.broker-url=tcp://localhost:61616
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index 17a08c0..e599773 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -528,6 +528,8 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
overrideComponentName = model.getArtifactId().replace("camel-", "");
}
+ beforeGenerateComponentSource(model);
+
createComponentConfigurationSource(pkg, model, overrideComponentName);
createComponentAutoConfigurationSource(pkg, model, aliases, overrideComponentName);
createComponentSpringFactorySource(pkg, model);
@@ -535,6 +537,20 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
}
}
+ private void beforeGenerateComponentSource(ComponentModel model) {
+ if ("activemq".equals(model.getScheme()) || "amqp".equals(model.getScheme()) || "stomp".equals(model.getScheme())) {
+ // we want brokerURL to be brokerUrl so its generated with a nice name for spring boot (and some other options too)
+ model.getComponentOptions().stream()
+ .filter(o -> "brokerURL".equals(o.getName())).findFirst().ifPresent(o -> o.setName("brokerUrl"));
+ model.getComponentOptions().stream()
+ .filter(o -> "useMessageIDAsCorrelationID".equals(o.getName())).findFirst().ifPresent(o -> o.setName("useMessageIdAsCorrelationId"));
+ model.getComponentOptions().stream()
+ .filter(o -> "includeAllJMSXProperties".equals(o.getName())).findFirst().ifPresent(o -> o.setName("includeAllJmsxProperties"));
+ model.getComponentOptions().stream()
+ .filter(o -> "includeSentJMSMessageID".equals(o.getName())).findFirst().ifPresent(o -> o.setName("includeSentJmsMessageId"));
+ }
+ }
+
private void executeDataFormats(JarFile componentJar, Map<String, Supplier<String>> jsonFiles) throws MojoFailureException {
// find the data format names
List<String> dataFormatNames = findDataFormatNames(componentJar);