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 575da15 CAMEL-15350: camel-sjms batch consumer changed default value
for keepAliveDelay from -1 to 5000.
575da15 is described below
commit 575da15b88b332c7ae6f81e708fa975de224118c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Aug 5 07:44:40 2020 +0200
CAMEL-15350: camel-sjms batch consumer changed default value for
keepAliveDelay from -1 to 5000.
---
.../apache/camel/component/sjms/batch/sjms-batch.json | 2 +-
.../camel-sjms/src/main/docs/sjms-batch-component.adoc | 2 +-
.../camel/component/sjms/batch/SjmsBatchEndpoint.java | 10 ++++++----
.../endpoint/dsl/SjmsBatchEndpointBuilderFactory.java | 18 ++++++++----------
.../modules/ROOT/pages/camel-3x-upgrade-guide-3_5.adoc | 9 ++++++---
5 files changed, 22 insertions(+), 19 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 2e26a3b..fced897 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 Exception during message
consumption. This delay value allows you [...]
+ "keepAliveDelay": { "kind": "parameter", "displayName": "Keep Alive
Delay", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "5000", "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 yo [...]
"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 2516bfa..9cf77eb 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 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 [...]
+| *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 then the SjmsBatchConsumer will
bail out and the consumer will not stop consuming new messages. The default is
5000 ms, that is, 5 seconds. [...]
| *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/SjmsBatchEndpoint.java
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java
index 15927f1..e4a3869 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
@@ -93,8 +93,8 @@ public class SjmsBatchEndpoint extends DefaultEndpoint
implements HeaderFilterSt
private boolean asyncStartListener;
@UriParam(label = "advanced", defaultValue = "5000")
private int recoveryInterval = 5000;
- @UriParam(label = "advanced", defaultValue = "-1")
- private int keepAliveDelay = -1;
+ @UriParam(label = "advanced", defaultValue = "5000")
+ private int keepAliveDelay = 5000;
public SjmsBatchEndpoint() {
}
@@ -408,8 +408,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 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.
+ * If this is a negative value then the SjmsBatchConsumer will bail out
and the consumer will not stop
+ * consuming new messages.
+ *
+ * The default is 5000 ms, that is, 5 seconds.
*/
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 3ed075d..96ecfe7 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
@@ -657,14 +657,13 @@ public interface SjmsBatchEndpointBuilderFactory {
* 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
- * Exception.
+ * prevent spamming the logs. If this is a negative value then the
+ * SjmsBatchConsumer will bail out and the consumer will not stop
+ * consuming new messages. The default is 5000 ms, that is, 5 seconds.
*
* The option is a: <code>int</code> type.
*
- * Default: -1
+ * Default: 5000
* Group: advanced
*/
default AdvancedSjmsBatchEndpointBuilder keepAliveDelay(
@@ -677,14 +676,13 @@ public interface SjmsBatchEndpointBuilderFactory {
* 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
- * Exception.
+ * prevent spamming the logs. If this is a negative value then the
+ * SjmsBatchConsumer will bail out and the consumer will not stop
+ * consuming new messages. The default is 5000 ms, that is, 5 seconds.
*
* The option will be converted to a <code>int</code> type.
*
- * Default: -1
+ * Default: 5000
* Group: advanced
*/
default AdvancedSjmsBatchEndpointBuilder keepAliveDelay(
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_5.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_5.adoc
index c7a6795..244b43a 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_5.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_5.adoc
@@ -32,13 +32,16 @@ This could have direct impact on the type of parameter
`beanRef` if you are usin
There is a new parameter `datacenter` (with default value `datacenter1`). Data
center has to be defined for the proper
behavior of the default load balancing policy.
+=== camel-sjms
-=== Camel Karaf
-
-The following features has been removed due they become not compatible with
OSGi: `camel-couchbase`.
+The default value for `keepAliveDelay` is changed from `-1` to `5000` in the
batch jms consumer.
=== camel-weather
The option `httpClient` is now a query parameter.
A new parameter `geoLocationProvider` was introduced to allow the use of a
custom `GeolocationProvider` implementation.
+
+=== Camel Karaf
+
+The following features has been removed due they become not compatible with
OSGi: `camel-couchbase`.
