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.git
The following commit(s) were added to refs/heads/master by this push: new eb97fe9 CAMEL-15350: camel-sjms: update docs eb97fe9 is described below commit eb97fe99bdfd41aeecad6ee82a2cf163daa01862 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Aug 4 21:37:25 2020 +0200 CAMEL-15350: camel-sjms: update docs --- .../camel/component/sjms/batch/sjms-batch.json | 2 +- .../src/main/docs/sjms-batch-component.adoc | 2 +- .../component/sjms/batch/SjmsBatchConsumer.java | 1 + .../component/sjms/batch/SjmsBatchEndpoint.java | 4 ++-- .../dsl/SjmsBatchEndpointBuilderFactory.java | 24 +++++++++++----------- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/batch/sjms-batch.json b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/batch/sjms-batch.json index a6ee98b..2e26a3b 100644 --- a/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/batch/sjms-batch.json +++ b/components/camel-sjms/src/generated/resources/org/apache/camel/component/sjms/batch/sjms-batch.json @@ -49,7 +49,7 @@ "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }, "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." }, "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "secret": false, "description": "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 [...] - "keepAliveDelay": { "kind": "parameter", "displayName": "Keep Alive Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "The delay in millis between attempts to re-establish a valid session. If this is a positive value the SjmsBatchConsumer will attempt to create a new session if it sees an IllegalStateException during message consumption. This delay value [...] + "keepAliveDelay": { "kind": "parameter", "displayName": "Keep Alive Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "The delay in millis between attempts to re-establish a valid session. If this is a positive value the SjmsBatchConsumer will attempt to create a new session if it sees an Exception during message consumption. This delay value allows you [...] "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "secret": false, "description": "To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of javax.jms.Message objects when Camel is sending a JMS message." }, "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." }, "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }, diff --git a/components/camel-sjms/src/main/docs/sjms-batch-component.adoc b/components/camel-sjms/src/main/docs/sjms-batch-component.adoc index 340077a..2516bfa 100644 --- a/components/camel-sjms/src/main/docs/sjms-batch-component.adoc +++ b/components/camel-sjms/src/main/docs/sjms-batch-component.adoc @@ -187,7 +187,7 @@ with the following path and query parameters: | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy | *jmsKeyFormatStrategy* (advanced) | 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 the org.apache [...] -| *keepAliveDelay* (advanced) | The delay in millis between attempts to re-establish a valid session. If this is a positive value the SjmsBatchConsumer will attempt to create a new session if it sees an IllegalStateException during message consumption. This delay value allows you to pause between attempts to prevent spamming the logs. If this is a negative value (default is -1) then the SjmsBatchConsumer will behave as it always has before - that is it will bail out and the route will sh [...] +| *keepAliveDelay* (advanced) | The delay in millis between attempts to re-establish a valid session. If this is a positive value the SjmsBatchConsumer will attempt to create a new session if it sees an Exception during message consumption. This delay value allows you to pause between attempts to prevent spamming the logs. If this is a negative value (default is -1) then the SjmsBatchConsumer will behave as it always has before - that is it will bail out and the route will shut down if i [...] | *messageCreatedStrategy* (advanced) | To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of javax.jms.Message objects when Camel is sending a JMS message. | | MessageCreatedStrategy | *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | int | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java index 6452fc6..3f33100 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java @@ -303,6 +303,7 @@ public class SjmsBatchConsumer extends DefaultConsumer { public AtomicBoolean getCompletionTimeoutTrigger() { return completionTimeoutTrigger; } + public void setKeepAliveDelay(int i) { keepAliveDelay = i; } diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java index ed79517..15927f1 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java @@ -406,10 +406,10 @@ public class SjmsBatchEndpoint extends DefaultEndpoint implements HeaderFilterSt /** * The delay in millis between attempts to re-establish a valid session. - * If this is a positive value the SjmsBatchConsumer will attempt to create a new session if it sees an IllegalStateException + * If this is a positive value the SjmsBatchConsumer will attempt to create a new session if it sees an Exception * during message consumption. This delay value allows you to pause between attempts to prevent spamming the logs. * If this is a negative value (default is -1) then the SjmsBatchConsumer will behave as it always has before - that is - * it will bail out and the route will shut down if it sees an IllegalStateException. + * it will bail out and the route will shut down if it sees an Exception. */ public void setKeepAliveDelay(int keepAliveDelay) { this.keepAliveDelay = keepAliveDelay; diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java index ecfe62e..3ed075d 100644 --- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsBatchEndpointBuilderFactory.java @@ -655,12 +655,12 @@ public interface SjmsBatchEndpointBuilderFactory { /** * The delay in millis between attempts to re-establish a valid session. * If this is a positive value the SjmsBatchConsumer will attempt to - * create a new session if it sees an IllegalStateException during - * message consumption. This delay value allows you to pause between - * attempts to prevent spamming the logs. If this is a negative value - * (default is -1) then the SjmsBatchConsumer will behave as it always - * has before - that is it will bail out and the route will shut down if - * it sees an IllegalStateException. + * create a new session if it sees an Exception during message + * consumption. This delay value allows you to pause between attempts to + * prevent spamming the logs. If this is a negative value (default is + * -1) then the SjmsBatchConsumer will behave as it always has before - + * that is it will bail out and the route will shut down if it sees an + * Exception. * * The option is a: <code>int</code> type. * @@ -675,12 +675,12 @@ public interface SjmsBatchEndpointBuilderFactory { /** * The delay in millis between attempts to re-establish a valid session. * If this is a positive value the SjmsBatchConsumer will attempt to - * create a new session if it sees an IllegalStateException during - * message consumption. This delay value allows you to pause between - * attempts to prevent spamming the logs. If this is a negative value - * (default is -1) then the SjmsBatchConsumer will behave as it always - * has before - that is it will bail out and the route will shut down if - * it sees an IllegalStateException. + * create a new session if it sees an Exception during message + * consumption. This delay value allows you to pause between attempts to + * prevent spamming the logs. If this is a negative value (default is + * -1) then the SjmsBatchConsumer will behave as it always has before - + * that is it will bail out and the route will shut down if it sees an + * Exception. * * The option will be converted to a <code>int</code> type. *