This is an automated email from the ASF dual-hosted git repository.
janbednar 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 92c0295 CAMEL-15001: Support Metadata#excludeProperties for component
properties (#3797)
92c0295 is described below
commit 92c029529ebd8dfcbcc09c4809eb2d2d7325527b
Author: Jan Bednar <m...@janbednar.eu>
AuthorDate: Mon May 4 11:36:21 2020 +0200
CAMEL-15001: Support Metadata#excludeProperties for component properties
(#3797)
---
.../apache/camel/component/activemq/activemq.json | 1 -
.../src/main/docs/activemq-component.adoc | 3 +--
.../org/apache/camel/component/amqp/amqp.json | 1 -
.../camel-amqp/src/main/docs/amqp-component.adoc | 3 +--
.../component/jms/JmsComponentConfigurer.java | 5 ----
.../org/apache/camel/component/jms/jms.json | 1 -
.../camel-jms/src/main/docs/jms-component.adoc | 3 +--
.../apache/camel/component/jms/JmsComponent.java | 1 +
.../dsl/ActivemqComponentBuilderFactory.java | 20 --------------
.../component/dsl/AmqpComponentBuilderFactory.java | 20 --------------
.../component/dsl/JmsComponentBuilderFactory.java | 20 --------------
.../modules/ROOT/pages/activemq-component.adoc | 3 +--
.../modules/ROOT/pages/amqp-component.adoc | 3 +--
.../modules/ROOT/pages/jms-component.adoc | 3 +--
.../packaging/EndpointSchemaGeneratorMojo.java | 31 +++++++++++++++-------
15 files changed, 28 insertions(+), 90 deletions(-)
diff --git
a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
index d50ab33..1b4bbf6 100644
---
a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
+++
b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
@@ -35,7 +35,6 @@
"acknowledgementModeName": { "kind": "property", "displayName":
"Acknowledgement Mode Name", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String", "enum": [
"SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE",
"DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "secret": false, "defaultValue":
"AUTO_ACKNOWLEDGE", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", [...]
"asyncConsumer": { "kind": "property", "displayName": "Async Consumer",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Whether the JmsConsumer
processes the Exchange asynchronously. If enabled then the JmsConsumer may
pickup the next message f [...]
"autoStartup": { "kind": "property", "displayName": "Auto Startup",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies whether the consumer container
should auto-startup." },
- "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "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 [...]
"cacheLevel": { "kind": "property", "displayName": "Cache Level", "group":
"consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the cache level by ID for the underlying
JMS resources. See cacheLevelName option for more details." },
"cacheLevelName": { "kind": "property", "displayName": "Cache Level Name",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION",
"CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false,
"secret": false, "defaultValue": "CACHE_AUTO", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the ca [...]
"concurrentConsumers": { "kind": "property", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "1", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies the default number of concurrent
consumers when consuming from JMS (not for request\/reply over JMS). See al
[...]
diff --git a/components/camel-activemq/src/main/docs/activemq-component.adoc
b/components/camel-activemq/src/main/docs/activemq-component.adoc
index 60ffd97..3bde4be 100644
--- a/components/camel-activemq/src/main/docs/activemq-component.adoc
+++ b/components/camel-activemq/src/main/docs/activemq-component.adoc
@@ -52,7 +52,7 @@ activemq:foo
== Component options
// component options: START
-The ActiveMQ component supports 100 options, which are listed below.
+The ActiveMQ component supports 99 options, which are listed below.
@@ -73,7 +73,6 @@ The ActiveMQ component supports 100 options, which are listed
below.
| *acknowledgementModeName* (consumer) | The JMS acknowledgement name, which
is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE,
DUPS_OK_ACKNOWLEDGE. The value can be one of: SESSION_TRANSACTED,
CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE |
String
| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange
asynchronously. If enabled then the JmsConsumer may pickup the next message
from the JMS queue, while the previous message is being processed
asynchronously (by the Asynchronous Routing Engine). This means that messages
may be processed not 100% strictly in order. If disabled (as default) then the
Exchange is fully processed before the JmsConsumer will pickup the next message
from the JMS queue. Note if transac [...]
| *autoStartup* (consumer) | Specifies whether the consumer container should
auto-startup. | true | boolean
-| *bridgeErrorHandler* (consumer) | 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
| *cacheLevel* (consumer) | Sets the cache level by ID for the underlying JMS
resources. See cacheLevelName option for more details. | | int
| *cacheLevelName* (consumer) | 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. The value can be one of: CACHE_AUTO, CACHE_CONNECTION,
CACHE_CONSUMER, CACHE_NONE, CACHE_SESSION | CACHE_AUTO | String
| *concurrentConsumers* (consumer) | Specifies the default number of
concurrent consumers when consuming from JMS (not for request/reply over JMS).
See also the maxMessagesPerTask option to control dynamic scaling up/down of
threads. When doing request/reply over JMS then the option
replyToConcurrentConsumers is used to control number of concurrent consumers on
the reply message listener. | 1 | int
diff --git
a/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
b/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
index 79fa8a8..62e73ae 100644
---
a/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
+++
b/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
@@ -31,7 +31,6 @@
"acknowledgementModeName": { "kind": "property", "displayName":
"Acknowledgement Mode Name", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String", "enum": [
"SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE",
"DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "secret": false, "defaultValue":
"AUTO_ACKNOWLEDGE", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", [...]
"asyncConsumer": { "kind": "property", "displayName": "Async Consumer",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Whether the JmsConsumer
processes the Exchange asynchronously. If enabled then the JmsConsumer may
pickup the next message f [...]
"autoStartup": { "kind": "property", "displayName": "Auto Startup",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies whether the consumer container
should auto-startup." },
- "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "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 [...]
"cacheLevel": { "kind": "property", "displayName": "Cache Level", "group":
"consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the cache level by ID for the underlying
JMS resources. See cacheLevelName option for more details." },
"cacheLevelName": { "kind": "property", "displayName": "Cache Level Name",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION",
"CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false,
"secret": false, "defaultValue": "CACHE_AUTO", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the ca [...]
"concurrentConsumers": { "kind": "property", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "1", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies the default number of concurrent
consumers when consuming from JMS (not for request\/reply over JMS). See al
[...]
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc
b/components/camel-amqp/src/main/docs/amqp-component.adoc
index 6b55694..35eecc9 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -54,7 +54,7 @@ xref:jms-component.adoc[JMS] component after the destination
name.
// component options: START
-The AMQP component supports 97 options, which are listed below.
+The AMQP component supports 96 options, which are listed below.
@@ -71,7 +71,6 @@ The AMQP component supports 97 options, which are listed
below.
| *acknowledgementModeName* (consumer) | The JMS acknowledgement name, which
is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE,
DUPS_OK_ACKNOWLEDGE. The value can be one of: SESSION_TRANSACTED,
CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE |
String
| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange
asynchronously. If enabled then the JmsConsumer may pickup the next message
from the JMS queue, while the previous message is being processed
asynchronously (by the Asynchronous Routing Engine). This means that messages
may be processed not 100% strictly in order. If disabled (as default) then the
Exchange is fully processed before the JmsConsumer will pickup the next message
from the JMS queue. Note if transac [...]
| *autoStartup* (consumer) | Specifies whether the consumer container should
auto-startup. | true | boolean
-| *bridgeErrorHandler* (consumer) | 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
| *cacheLevel* (consumer) | Sets the cache level by ID for the underlying JMS
resources. See cacheLevelName option for more details. | | int
| *cacheLevelName* (consumer) | 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. The value can be one of: CACHE_AUTO, CACHE_CONNECTION,
CACHE_CONSUMER, CACHE_NONE, CACHE_SESSION | CACHE_AUTO | String
| *concurrentConsumers* (consumer) | Specifies the default number of
concurrent consumers when consuming from JMS (not for request/reply over JMS).
See also the maxMessagesPerTask option to control dynamic scaling up/down of
threads. When doing request/reply over JMS then the option
replyToConcurrentConsumers is used to control number of concurrent consumers on
the reply message listener. | 1 | int
diff --git
a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java
b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java
index 4968b33..4c9dd94 100644
---
a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java
+++
b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java
@@ -56,8 +56,6 @@ public class JmsComponentConfigurer extends
PropertyConfigurerSupport implements
case "autoStartup":
getOrCreateConfiguration(target).setAutoStartup(property(camelContext,
boolean.class, value)); return true;
case "basicpropertybinding":
case "basicPropertyBinding":
target.setBasicPropertyBinding(property(camelContext, boolean.class, value));
return true;
- case "bridgeerrorhandler":
- case "bridgeErrorHandler":
target.setBridgeErrorHandler(property(camelContext, boolean.class, value));
return true;
case "cachelevel":
case "cacheLevel":
getOrCreateConfiguration(target).setCacheLevel(property(camelContext,
int.class, value)); return true;
case "cachelevelname":
@@ -234,7 +232,6 @@ public class JmsComponentConfigurer extends
PropertyConfigurerSupport implements
answer.put("asyncStopListener", boolean.class);
answer.put("autoStartup", boolean.class);
answer.put("basicPropertyBinding", boolean.class);
- answer.put("bridgeErrorHandler", boolean.class);
answer.put("cacheLevel", int.class);
answer.put("cacheLevelName", java.lang.String.class);
answer.put("clientId", java.lang.String.class);
@@ -352,8 +349,6 @@ public class JmsComponentConfigurer extends
PropertyConfigurerSupport implements
case "autoStartup": return
getOrCreateConfiguration(target).isAutoStartup();
case "basicpropertybinding":
case "basicPropertyBinding": return target.isBasicPropertyBinding();
- case "bridgeerrorhandler":
- case "bridgeErrorHandler": return target.isBridgeErrorHandler();
case "cachelevel":
case "cacheLevel": return
getOrCreateConfiguration(target).getCacheLevel();
case "cachelevelname":
diff --git
a/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
b/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
index 1bd09c5..032f719 100644
---
a/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
+++
b/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
@@ -31,7 +31,6 @@
"acknowledgementModeName": { "kind": "property", "displayName":
"Acknowledgement Mode Name", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String", "enum": [
"SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE",
"DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "secret": false, "defaultValue":
"AUTO_ACKNOWLEDGE", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", [...]
"asyncConsumer": { "kind": "property", "displayName": "Async Consumer",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Whether the JmsConsumer
processes the Exchange asynchronously. If enabled then the JmsConsumer may
pickup the next message f [...]
"autoStartup": { "kind": "property", "displayName": "Auto Startup",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies whether the consumer container
should auto-startup." },
- "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "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 [...]
"cacheLevel": { "kind": "property", "displayName": "Cache Level", "group":
"consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the cache level by ID for the underlying
JMS resources. See cacheLevelName option for more details." },
"cacheLevelName": { "kind": "property", "displayName": "Cache Level Name",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION",
"CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false,
"secret": false, "defaultValue": "CACHE_AUTO", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the ca [...]
"concurrentConsumers": { "kind": "property", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "1", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies the default number of concurrent
consumers when consuming from JMS (not for request\/reply over JMS). See al
[...]
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc
b/components/camel-jms/src/main/docs/jms-component.adoc
index 871b863..bb35dae 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -186,7 +186,7 @@ about these properties by consulting the relevant Spring
documentation.
// component options: START
-The JMS component supports 96 options, which are listed below.
+The JMS component supports 95 options, which are listed below.
@@ -202,7 +202,6 @@ The JMS component supports 96 options, which are listed
below.
| *acknowledgementModeName* (consumer) | The JMS acknowledgement name, which
is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE,
DUPS_OK_ACKNOWLEDGE. The value can be one of: SESSION_TRANSACTED,
CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE |
String
| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange
asynchronously. If enabled then the JmsConsumer may pickup the next message
from the JMS queue, while the previous message is being processed
asynchronously (by the Asynchronous Routing Engine). This means that messages
may be processed not 100% strictly in order. If disabled (as default) then the
Exchange is fully processed before the JmsConsumer will pickup the next message
from the JMS queue. Note if transac [...]
| *autoStartup* (consumer) | Specifies whether the consumer container should
auto-startup. | true | boolean
-| *bridgeErrorHandler* (consumer) | 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
| *cacheLevel* (consumer) | Sets the cache level by ID for the underlying JMS
resources. See cacheLevelName option for more details. | | int
| *cacheLevelName* (consumer) | 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. The value can be one of: CACHE_AUTO, CACHE_CONNECTION,
CACHE_CONSUMER, CACHE_NONE, CACHE_SESSION | CACHE_AUTO | String
| *concurrentConsumers* (consumer) | Specifies the default number of
concurrent consumers when consuming from JMS (not for request/reply over JMS).
See also the maxMessagesPerTask option to control dynamic scaling up/down of
threads. When doing request/reply over JMS then the option
replyToConcurrentConsumers is used to control number of concurrent consumers on
the reply message listener. | 1 | int
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
index ba0e330..4cb3389 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
@@ -49,6 +49,7 @@ import static
org.apache.camel.util.StringHelper.removeStartingCharacters;
* JMS component which uses Spring JMS.
*/
@Component("jms")
+@Metadata(excludeProperties = "bridgeErrorHandler")
public class JmsComponent extends HeaderFilterStrategyComponent {
private static final Logger LOG =
LoggerFactory.getLogger(JmsComponent.class);
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
index ebae912..038eb32 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
@@ -269,25 +269,6 @@ public interface ActivemqComponentBuilderFactory {
return this;
}
/**
- * 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.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: consumer
- */
- default ActivemqComponentBuilder bridgeErrorHandler(
- boolean bridgeErrorHandler) {
- doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
- return this;
- }
- /**
* Sets the cache level by ID for the underlying JMS resources. See
* cacheLevelName option for more details.
*
@@ -1686,7 +1667,6 @@ public interface ActivemqComponentBuilderFactory {
case "acknowledgementModeName":
getOrCreateConfiguration((ActiveMQComponent)
component).setAcknowledgementModeName((java.lang.String) value); return true;
case "asyncConsumer": getOrCreateConfiguration((ActiveMQComponent)
component).setAsyncConsumer((boolean) value); return true;
case "autoStartup": getOrCreateConfiguration((ActiveMQComponent)
component).setAutoStartup((boolean) value); return true;
- case "bridgeErrorHandler": ((ActiveMQComponent)
component).setBridgeErrorHandler((boolean) value); return true;
case "cacheLevel": getOrCreateConfiguration((ActiveMQComponent)
component).setCacheLevel((int) value); return true;
case "cacheLevelName":
getOrCreateConfiguration((ActiveMQComponent)
component).setCacheLevelName((java.lang.String) value); return true;
case "concurrentConsumers":
getOrCreateConfiguration((ActiveMQComponent)
component).setConcurrentConsumers((int) value); return true;
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java
index 31a0eec..afca029 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java
@@ -204,25 +204,6 @@ public interface AmqpComponentBuilderFactory {
return this;
}
/**
- * 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.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: consumer
- */
- default AmqpComponentBuilder bridgeErrorHandler(
- boolean bridgeErrorHandler) {
- doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
- return this;
- }
- /**
* Sets the cache level by ID for the underlying JMS resources. See
* cacheLevelName option for more details.
*
@@ -1619,7 +1600,6 @@ public interface AmqpComponentBuilderFactory {
case "acknowledgementModeName":
getOrCreateConfiguration((AMQPComponent)
component).setAcknowledgementModeName((java.lang.String) value); return true;
case "asyncConsumer": getOrCreateConfiguration((AMQPComponent)
component).setAsyncConsumer((boolean) value); return true;
case "autoStartup": getOrCreateConfiguration((AMQPComponent)
component).setAutoStartup((boolean) value); return true;
- case "bridgeErrorHandler": ((AMQPComponent)
component).setBridgeErrorHandler((boolean) value); return true;
case "cacheLevel": getOrCreateConfiguration((AMQPComponent)
component).setCacheLevel((int) value); return true;
case "cacheLevelName": getOrCreateConfiguration((AMQPComponent)
component).setCacheLevelName((java.lang.String) value); return true;
case "concurrentConsumers":
getOrCreateConfiguration((AMQPComponent)
component).setConcurrentConsumers((int) value); return true;
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
index e6420b0..c41437a 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
@@ -188,25 +188,6 @@ public interface JmsComponentBuilderFactory {
return this;
}
/**
- * 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.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Default: false
- * Group: consumer
- */
- default JmsComponentBuilder bridgeErrorHandler(
- boolean bridgeErrorHandler) {
- doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
- return this;
- }
- /**
* Sets the cache level by ID for the underlying JMS resources. See
* cacheLevelName option for more details.
*
@@ -1602,7 +1583,6 @@ public interface JmsComponentBuilderFactory {
case "acknowledgementModeName":
getOrCreateConfiguration((JmsComponent)
component).setAcknowledgementModeName((java.lang.String) value); return true;
case "asyncConsumer": getOrCreateConfiguration((JmsComponent)
component).setAsyncConsumer((boolean) value); return true;
case "autoStartup": getOrCreateConfiguration((JmsComponent)
component).setAutoStartup((boolean) value); return true;
- case "bridgeErrorHandler": ((JmsComponent)
component).setBridgeErrorHandler((boolean) value); return true;
case "cacheLevel": getOrCreateConfiguration((JmsComponent)
component).setCacheLevel((int) value); return true;
case "cacheLevelName": getOrCreateConfiguration((JmsComponent)
component).setCacheLevelName((java.lang.String) value); return true;
case "concurrentConsumers":
getOrCreateConfiguration((JmsComponent) component).setConcurrentConsumers((int)
value); return true;
diff --git a/docs/components/modules/ROOT/pages/activemq-component.adoc
b/docs/components/modules/ROOT/pages/activemq-component.adoc
index 61d80ed..489ef65 100644
--- a/docs/components/modules/ROOT/pages/activemq-component.adoc
+++ b/docs/components/modules/ROOT/pages/activemq-component.adoc
@@ -54,7 +54,7 @@ activemq:foo
== Component options
// component options: START
-The ActiveMQ component supports 100 options, which are listed below.
+The ActiveMQ component supports 99 options, which are listed below.
@@ -75,7 +75,6 @@ The ActiveMQ component supports 100 options, which are listed
below.
| *acknowledgementModeName* (consumer) | The JMS acknowledgement name, which
is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE,
DUPS_OK_ACKNOWLEDGE. The value can be one of: SESSION_TRANSACTED,
CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE |
String
| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange
asynchronously. If enabled then the JmsConsumer may pickup the next message
from the JMS queue, while the previous message is being processed
asynchronously (by the Asynchronous Routing Engine). This means that messages
may be processed not 100% strictly in order. If disabled (as default) then the
Exchange is fully processed before the JmsConsumer will pickup the next message
from the JMS queue. Note if transac [...]
| *autoStartup* (consumer) | Specifies whether the consumer container should
auto-startup. | true | boolean
-| *bridgeErrorHandler* (consumer) | 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
| *cacheLevel* (consumer) | Sets the cache level by ID for the underlying JMS
resources. See cacheLevelName option for more details. | | int
| *cacheLevelName* (consumer) | 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. The value can be one of: CACHE_AUTO, CACHE_CONNECTION,
CACHE_CONSUMER, CACHE_NONE, CACHE_SESSION | CACHE_AUTO | String
| *concurrentConsumers* (consumer) | Specifies the default number of
concurrent consumers when consuming from JMS (not for request/reply over JMS).
See also the maxMessagesPerTask option to control dynamic scaling up/down of
threads. When doing request/reply over JMS then the option
replyToConcurrentConsumers is used to control number of concurrent consumers on
the reply message listener. | 1 | int
diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc
b/docs/components/modules/ROOT/pages/amqp-component.adoc
index d5efb6e..5f43275 100644
--- a/docs/components/modules/ROOT/pages/amqp-component.adoc
+++ b/docs/components/modules/ROOT/pages/amqp-component.adoc
@@ -56,7 +56,7 @@ xref:jms-component.adoc[JMS] component after the destination
name.
// component options: START
-The AMQP component supports 97 options, which are listed below.
+The AMQP component supports 96 options, which are listed below.
@@ -73,7 +73,6 @@ The AMQP component supports 97 options, which are listed
below.
| *acknowledgementModeName* (consumer) | The JMS acknowledgement name, which
is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE,
DUPS_OK_ACKNOWLEDGE. The value can be one of: SESSION_TRANSACTED,
CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE |
String
| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange
asynchronously. If enabled then the JmsConsumer may pickup the next message
from the JMS queue, while the previous message is being processed
asynchronously (by the Asynchronous Routing Engine). This means that messages
may be processed not 100% strictly in order. If disabled (as default) then the
Exchange is fully processed before the JmsConsumer will pickup the next message
from the JMS queue. Note if transac [...]
| *autoStartup* (consumer) | Specifies whether the consumer container should
auto-startup. | true | boolean
-| *bridgeErrorHandler* (consumer) | 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
| *cacheLevel* (consumer) | Sets the cache level by ID for the underlying JMS
resources. See cacheLevelName option for more details. | | int
| *cacheLevelName* (consumer) | 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. The value can be one of: CACHE_AUTO, CACHE_CONNECTION,
CACHE_CONSUMER, CACHE_NONE, CACHE_SESSION | CACHE_AUTO | String
| *concurrentConsumers* (consumer) | Specifies the default number of
concurrent consumers when consuming from JMS (not for request/reply over JMS).
See also the maxMessagesPerTask option to control dynamic scaling up/down of
threads. When doing request/reply over JMS then the option
replyToConcurrentConsumers is used to control number of concurrent consumers on
the reply message listener. | 1 | int
diff --git a/docs/components/modules/ROOT/pages/jms-component.adoc
b/docs/components/modules/ROOT/pages/jms-component.adoc
index 0e26abf..e5a68bc 100644
--- a/docs/components/modules/ROOT/pages/jms-component.adoc
+++ b/docs/components/modules/ROOT/pages/jms-component.adoc
@@ -188,7 +188,7 @@ about these properties by consulting the relevant Spring
documentation.
// component options: START
-The JMS component supports 96 options, which are listed below.
+The JMS component supports 95 options, which are listed below.
@@ -204,7 +204,6 @@ The JMS component supports 96 options, which are listed
below.
| *acknowledgementModeName* (consumer) | The JMS acknowledgement name, which
is one of: SESSION_TRANSACTED, CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE,
DUPS_OK_ACKNOWLEDGE. The value can be one of: SESSION_TRANSACTED,
CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE | AUTO_ACKNOWLEDGE |
String
| *asyncConsumer* (consumer) | Whether the JmsConsumer processes the Exchange
asynchronously. If enabled then the JmsConsumer may pickup the next message
from the JMS queue, while the previous message is being processed
asynchronously (by the Asynchronous Routing Engine). This means that messages
may be processed not 100% strictly in order. If disabled (as default) then the
Exchange is fully processed before the JmsConsumer will pickup the next message
from the JMS queue. Note if transac [...]
| *autoStartup* (consumer) | Specifies whether the consumer container should
auto-startup. | true | boolean
-| *bridgeErrorHandler* (consumer) | 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
| *cacheLevel* (consumer) | Sets the cache level by ID for the underlying JMS
resources. See cacheLevelName option for more details. | | int
| *cacheLevelName* (consumer) | 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. The value can be one of: CACHE_AUTO, CACHE_CONNECTION,
CACHE_CONSUMER, CACHE_NONE, CACHE_SESSION | CACHE_AUTO | String
| *concurrentConsumers* (consumer) | Specifies the default number of
concurrent consumers when consuming from JMS (not for request/reply over JMS).
See also the maxMessagesPerTask option to control dynamic scaling up/down of
threads. When doing request/reply over JMS then the option
replyToConcurrentConsumers is used to control number of concurrent consumers on
the reply message listener. | 1 | int
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 1fcbf2f..5c2447b 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -213,20 +213,26 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
// component options
Class<?> componentClassElement =
loadClass(componentModel.getJavaType());
+ String excludedComponentProperties = "";
if (componentClassElement != null) {
findComponentClassProperties(componentModel,
componentClassElement, "", null, null);
+ Metadata componentMetadata =
componentClassElement.getAnnotation(Metadata.class);
+ if (componentMetadata != null) {
+ excludedComponentProperties =
componentMetadata.excludeProperties();
+ }
}
// endpoint options
findClassProperties(componentModel, classElement, new HashSet<>(), "",
null, null, false);
- String excludedProperties = "";
- Metadata metadata = classElement.getAnnotation(Metadata.class);
- if (metadata != null) {
- excludedProperties = metadata.excludeProperties();
+ String excludedEndpointProperties = "";
+ Metadata endpointMetadata = classElement.getAnnotation(Metadata.class);
+ if (endpointMetadata != null) {
+ excludedEndpointProperties = endpointMetadata.excludeProperties();
}
+
// enhance and generate
- enhanceComponentModel(componentModel, parentData, excludedProperties);
+ enhanceComponentModel(componentModel, parentData,
excludedEndpointProperties, excludedComponentProperties);
// if the component has known class name
if (!"@@@JAVATYPE@@@".equals(componentModel.getJavaType())) {
@@ -270,7 +276,7 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
return data;
}
- private void enhanceComponentModel(ComponentModel componentModel,
ComponentModel parentData, String excludeProperties) {
+ private void enhanceComponentModel(ComponentModel componentModel,
ComponentModel parentData, String excludedEndpointProperties, String
excludedComponentProperties) {
componentModel.getComponentOptions().removeIf(option ->
filterOutOption(componentModel, option));
componentModel.getComponentOptions().forEach(option -> fixDoc(option,
parentData != null ? parentData.getComponentOptions() : null));
componentModel.getComponentOptions().sort(EndpointHelper.createGroupAndLabelComparator());
@@ -281,7 +287,8 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
if (parentData != null) {
Set<String> componentOptionNames =
componentModel.getComponentOptions().stream().map(BaseOptionModel::getName).collect(Collectors.toSet());
Set<String> endpointOptionNames =
componentModel.getEndpointOptions().stream().map(BaseOptionModel::getName).collect(Collectors.toSet());
- Collections.addAll(endpointOptionNames,
excludeProperties.split(","));
+ Collections.addAll(componentOptionNames,
excludedComponentProperties.split(","));
+ Collections.addAll(endpointOptionNames,
excludedEndpointProperties.split(","));
parentData.getComponentOptions().stream()
.filter(option ->
!componentOptionNames.contains(option.getName()))
.forEach(option ->
componentModel.getComponentOptions().add(option));
@@ -528,10 +535,14 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
protected void findComponentClassProperties(ComponentModel componentModel,
Class<?> classElement,
String prefix, String
nestedTypeName, String nestedFieldName) {
final Class<?> orgClassElement = classElement;
+ Set<String> excludes = new HashSet<>();
while (true) {
Metadata componentAnnotation =
classElement.getAnnotation(Metadata.class);
- if (componentAnnotation != null && Objects.equals("verifiers",
componentAnnotation.label())) {
- componentModel.setVerifiers(componentAnnotation.enums());
+ if (componentAnnotation != null) {
+ if (Objects.equals("verifiers", componentAnnotation.label())) {
+ componentModel.setVerifiers(componentAnnotation.enums());
+ }
+ Collections.addAll(excludes,
componentAnnotation.excludeProperties().split(","));
}
List<Method> methods =
Stream.of(classElement.getDeclaredMethods()).filter(method -> {
@@ -682,7 +693,7 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
String group = EndpointHelper.labelAsGroupName(label,
componentModel.isConsumerOnly(), componentModel.isProducerOnly());
// filter out consumer/producer only
- boolean accept = true;
+ boolean accept = !excludes.contains(name);
if (componentModel.isConsumerOnly() &&
"producer".equals(group)) {
accept = false;
} else if (componentModel.isProducerOnly() &&
"consumer".equals(group)) {
