This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 9513e2f Regen
9513e2f is described below
commit 9513e2f0e02fa424b6c009a2c4ccc4b4df57de95
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Jan 27 09:25:06 2022 +0100
Regen
---
.../catalog/components/dynamic-router.json | 25 ++++++++++++----------
.../src/main/docs/dynamic-router.json | 7 ------
.../DynamicRouterComponentConfiguration.java | 17 ---------------
.../camel-elasticsearch-rest-starter/pom.xml | 5 -----
4 files changed, 14 insertions(+), 40 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dynamic-router.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dynamic-router.json
index c5bb6ad..6c8e4f0 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dynamic-router.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dynamic-router.json
@@ -15,27 +15,30 @@
"scheme": "dynamic-router",
"extendsScheme": "",
"syntax": "dynamic-router:channel",
+ "alternativeSyntax":
"dynamic-router:channel\/controlAction\/subscribeChannel",
"async": false,
"api": false,
"consumerOnly": false,
- "producerOnly": false,
+ "producerOnly": true,
"lenientProperties": false
},
"componentProperties": {
- "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 me [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during star [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
},
"properties": {
- "channel": { "kind": "path", "displayName": "Channel", "group": "common",
"label": "common", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Channel of the Dynamic Router" },
- "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 m [...]
- "exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
- "exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
- "block": { "kind": "parameter", "displayName": "Block", "group":
"producer", "label": "producer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Flag that determines if the
producer should block while waiting for a consumer." },
- "failIfNoConsumers": { "kind": "parameter", "displayName": "Fail If No
Consumers", "group": "producer", "label": "producer", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Flag to fail if
there are no consumers." },
+ "channel": { "kind": "path", "displayName": "Channel", "group": "common",
"label": "common", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Channel of the Dynamic
Router" },
+ "controlAction": { "kind": "path", "displayName": "Control Action",
"group": "control", "label": "control", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "subscribe", "unsubscribe" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Control channel action:
subscribe or unsub [...]
+ "subscribeChannel": { "kind": "path", "displayName": "Subscribe Channel",
"group": "control", "label": "control", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "The channel to subscribe
to" },
+ "recipientMode": { "kind": "parameter", "displayName": "Recipient Mode",
"group": "common", "label": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "firstMatch", "allMatch" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"firstMatch", "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Recipient mode:
firstMatch or allM [...]
+ "synchronous": { "kind": "parameter", "displayName": "Synchronous",
"group": "common", "label": "common", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Flag to ensure
synchronous processing." },
+ "warnDroppedMessage": { "kind": "parameter", "displayName": "Warn Dropped
Message", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "Flag to log a warning if
no predicates match for an exchange." },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during sta [...]
- "timeout": { "kind": "parameter", "displayName": "Timeout", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 30000, "description": "The time limit, in milliseconds,
if\/when the producer blocks while waiting for a consumer." },
- "warnDroppedMessage": { "kind": "parameter", "displayName": "Warn Dropped
Message", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Flag to log a warning
if no predicates match for an exchange." },
- "synchronous": { "kind": "parameter", "displayName": "Synchronous",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "Flag to ensure synchronous
processing." }
+ "destinationUri": { "kind": "parameter", "displayName": "Destination Uri",
"group": "control", "label": "control", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "The destination URI for
exchanges that match." },
+ "expressionLanguage": { "kind": "parameter", "displayName": "Expression
Language", "group": "control", "label": "control", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "simple", "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "The subscription
predicate language." },
+ "predicate": { "kind": "parameter", "displayName": "Predicate", "group":
"control", "label": "control", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "The subscription
predicate." },
+ "predicateBean": { "kind": "parameter", "displayName": "Predicate Bean",
"group": "control", "label": "control", "required": false, "type": "object",
"javaType": "org.apache.camel.Predicate", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "A Predicate instance in
the registry." },
+ "priority": { "kind": "parameter", "displayName": "Priority", "group":
"control", "label": "control", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "The subscription
priority." },
+ "subscriptionId": { "kind": "parameter", "displayName": "Subscription Id",
"group": "control", "label": "control", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.dynamicrouter.DynamicRouterConfiguration",
"configurationField": "configuration", "description": "The subscription ID; if
unspecified, one will be assigned and returned." }
}
}
diff --git
a/components-starter/camel-dynamic-router-starter/src/main/docs/dynamic-router.json
b/components-starter/camel-dynamic-router-starter/src/main/docs/dynamic-router.json
index 6baab7d..a407eba 100644
---
a/components-starter/camel-dynamic-router-starter/src/main/docs/dynamic-router.json
+++
b/components-starter/camel-dynamic-router-starter/src/main/docs/dynamic-router.json
@@ -21,13 +21,6 @@
"defaultValue": true
},
{
- "name": "camel.component.dynamic-router.bridge-error-handler",
- "type": "java.lang.Boolean",
- "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 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.",
- "sourceType":
"org.apache.camel.component.dynamicrouter.springboot.DynamicRouterComponentConfiguration",
- "defaultValue": false
- },
- {
"name": "camel.component.dynamic-router.customizer.enabled",
"type": "java.lang.Boolean",
"sourceType":
"org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties"
diff --git
a/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/springboot/DynamicRouterComponentConfiguration.java
b/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/springboot/DynamicRouterComponentConfiguration.java
index 41c2b95..f6eabb0 100644
---
a/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/springboot/DynamicRouterComponentConfiguration.java
+++
b/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/springboot/DynamicRouterComponentConfiguration.java
@@ -38,15 +38,6 @@ public class DynamicRouterComponentConfiguration
*/
private Boolean enabled;
/**
- * 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.
- */
- private Boolean bridgeErrorHandler = false;
- /**
* Whether the producer should be started lazy (on the first message). By
* starting lazy you can use this to allow CamelContext and routes to
* startup in situations where a producer may otherwise fail during
starting
@@ -67,14 +58,6 @@ public class DynamicRouterComponentConfiguration
*/
private Boolean autowiredEnabled = true;
- public Boolean getBridgeErrorHandler() {
- return bridgeErrorHandler;
- }
-
- public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
- this.bridgeErrorHandler = bridgeErrorHandler;
- }
-
public Boolean getLazyStartProducer() {
return lazyStartProducer;
}
diff --git a/components-starter/camel-elasticsearch-rest-starter/pom.xml
b/components-starter/camel-elasticsearch-rest-starter/pom.xml
index 874d8ef..de465ae 100644
--- a/components-starter/camel-elasticsearch-rest-starter/pom.xml
+++ b/components-starter/camel-elasticsearch-rest-starter/pom.xml
@@ -28,16 +28,12 @@
<packaging>jar</packaging>
<name>Camel SB Starters :: ElasticSearch :: REST</name>
<description>Spring-Boot Starter for Camel ElasticSearch REST
support</description>
-
-
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring-boot-version}</version>
</dependency>
-
<!-- in favor of elasticsearch version used from camel-->
<dependency>
<groupId>org.elasticsearch.client</groupId>
@@ -59,7 +55,6 @@
<artifactId>elasticsearch-rest-client</artifactId>
<version>${elasticsearch-rest-version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-elasticsearch-rest</artifactId>
