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 7d510d121a8 Regen
7d510d121a8 is described below
commit 7d510d121a8f1f8e0a718bdacd1802ee7de1a2ce
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Nov 5 11:27:02 2022 +0100
Regen
---
.../camel/springboot/catalog/components/controlbus.json | 2 +-
.../camel/springboot/catalog/components/vertx-http.json | 1 +
.../camel-vertx-http-starter/src/main/docs/vertx-http.json | 6 ++++++
.../http/springboot/VertxHttpComponentConfiguration.java | 14 ++++++++++++++
.../vertx/http/springboot/VertxHttpComponentConverter.java | 2 ++
5 files changed, 24 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
index 37d0ec216e0..e5c94d42181 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
@@ -27,7 +27,7 @@
},
"properties": {
"command": { "kind": "path", "displayName": "Command", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "enum": [ "route", "language" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Command can be either route or language" },
- "language": { "kind": "path", "displayName": "Language", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.Language", "enum": [ "bean", "constant", "el",
"exchangeProperty", "file", "groovy", "header", "jsonpath", "mvel", "ognl",
"ref", "simple", "spel", "sql", "terser", "tokenize", "xpath", "xquery",
"xtokenize" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Allows you to specify the name of a Langu [...]
+ "language": { "kind": "path", "displayName": "Language", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.Language", "enum": [ "bean", "constant", "csimple",
"datasonnet", "exchangeProperty", "file", "groovy", "header", "hl7terser",
"joor", "jq", "jsonpath", "mvel", "ognl", "python", "ref", "simple", "spel",
"tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "autowired":
false, "secret": false, "description": "Al [...]
"action": { "kind": "parameter", "displayName": "Action", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "start", "stop", "fail", "suspend", "resume",
"restart", "status", "stats" ], "deprecated": false, "autowired": false,
"secret": false, "description": "To denote an action that can be either: start,
stop, or status. To either start or stop a route, or to get the status of the
route as output in the message body. You [...]
"async": { "kind": "parameter", "displayName": "Async", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to execute the control bus task
asynchronously. Important: If this option is enabled, then any result from the
task is not set on the Exchange. This is only possible if executing tasks
synchronously." },
"loggingLevel": { "kind": "parameter", "displayName": "Logging Level",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG",
"INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "INFO", "description": "Logging level used for
logging when task is done, or if any exceptions occurred during processing the
task." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json
index 245f65a50dd..01be6e279b6 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json
@@ -29,6 +29,7 @@
"vertx": { "kind": "property", "displayName": "Vertx", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "io.vertx.core.Vertx", "deprecated": false, "autowired": false,
"secret": false, "description": "To use an existing vertx instead of creating a
new instance" },
"vertxHttpBinding": { "kind": "property", "displayName": "Vertx Http
Binding", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.component.vertx.http.VertxHttpBinding",
"deprecated": false, "autowired": false, "secret": false, "description": "A
custom VertxHttpBinding which can control how to bind between Vert.x and Camel"
},
"vertxOptions": { "kind": "property", "displayName": "Vertx Options",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "io.vertx.core.VertxOptions", "deprecated": false, "autowired":
false, "secret": false, "description": "To provide a custom set of vertx
options for configuring vertx" },
+ "webClientOptions": { "kind": "property", "displayName": "Web Client
Options", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "io.vertx.ext.web.client.WebClientOptions", "deprecated":
false, "autowired": false, "secret": false, "description": "To provide a custom
set of options for configuring vertx web client" },
"headerFilterStrategy": { "kind": "property", "displayName": "Header
Filter Strategy", "group": "filter", "label": "filter", "required": false,
"type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and
from Camel message." },
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group":
"proxy", "label": "proxy", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The proxy server host address" },
"proxyPassword": { "kind": "property", "displayName": "Proxy Password",
"group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The proxy server password if authentication is
required" },
diff --git
a/components-starter/camel-vertx-http-starter/src/main/docs/vertx-http.json
b/components-starter/camel-vertx-http-starter/src/main/docs/vertx-http.json
index c75bd87252e..e3d9cc11387 100644
--- a/components-starter/camel-vertx-http-starter/src/main/docs/vertx-http.json
+++ b/components-starter/camel-vertx-http-starter/src/main/docs/vertx-http.json
@@ -136,6 +136,12 @@
"type": "io.vertx.core.VertxOptions",
"description": "To provide a custom set of vertx options for configuring
vertx. The option is a io.vertx.core.VertxOptions type.",
"sourceType":
"org.apache.camel.component.vertx.http.springboot.VertxHttpComponentConfiguration"
+ },
+ {
+ "name": "camel.component.vertx-http.web-client-options",
+ "type": "io.vertx.ext.web.client.WebClientOptions",
+ "description": "To provide a custom set of options for configuring vertx
web client. The option is a io.vertx.ext.web.client.WebClientOptions type.",
+ "sourceType":
"org.apache.camel.component.vertx.http.springboot.VertxHttpComponentConfiguration"
}
],
"hints": []
diff --git
a/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConfiguration.java
b/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConfiguration.java
index 621329bfb62..10504f9cb87 100644
---
a/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConfiguration.java
+++
b/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConfiguration.java
@@ -20,6 +20,7 @@ import javax.annotation.Generated;
import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import io.vertx.core.net.ProxyType;
+import io.vertx.ext.web.client.WebClientOptions;
import org.apache.camel.component.vertx.http.VertxHttpBinding;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
@@ -90,6 +91,11 @@ public class VertxHttpComponentConfiguration
* option is a io.vertx.core.VertxOptions type.
*/
private VertxOptions vertxOptions;
+ /**
+ * To provide a custom set of options for configuring vertx web client. The
+ * option is a io.vertx.ext.web.client.WebClientOptions type.
+ */
+ private WebClientOptions webClientOptions;
/**
* To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
* header to and from Camel message. The option is a
@@ -194,6 +200,14 @@ public class VertxHttpComponentConfiguration
this.vertxOptions = vertxOptions;
}
+ public WebClientOptions getWebClientOptions() {
+ return webClientOptions;
+ }
+
+ public void setWebClientOptions(WebClientOptions webClientOptions) {
+ this.webClientOptions = webClientOptions;
+ }
+
public HeaderFilterStrategy getHeaderFilterStrategy() {
return headerFilterStrategy;
}
diff --git
a/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConverter.java
b/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConverter.java
index 2984af9464e..5d7efaaab49 100644
---
a/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConverter.java
+++
b/components-starter/camel-vertx-http-starter/src/main/java/org/apache/camel/component/vertx/http/springboot/VertxHttpComponentConverter.java
@@ -44,6 +44,7 @@ public class VertxHttpComponentConverter implements
GenericConverter {
answer.add(new ConvertiblePair(String.class,
io.vertx.core.Vertx.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.vertx.http.VertxHttpBinding.class));
answer.add(new ConvertiblePair(String.class,
io.vertx.core.VertxOptions.class));
+ answer.add(new ConvertiblePair(String.class,
io.vertx.ext.web.client.WebClientOptions.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.spi.HeaderFilterStrategy.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.support.jsse.SSLContextParameters.class));
return answer;
@@ -65,6 +66,7 @@ public class VertxHttpComponentConverter implements
GenericConverter {
case "io.vertx.core.Vertx": return applicationContext.getBean(ref,
io.vertx.core.Vertx.class);
case "org.apache.camel.component.vertx.http.VertxHttpBinding":
return applicationContext.getBean(ref,
org.apache.camel.component.vertx.http.VertxHttpBinding.class);
case "io.vertx.core.VertxOptions": return
applicationContext.getBean(ref, io.vertx.core.VertxOptions.class);
+ case "io.vertx.ext.web.client.WebClientOptions": return
applicationContext.getBean(ref, io.vertx.ext.web.client.WebClientOptions.class);
case "org.apache.camel.spi.HeaderFilterStrategy": return
applicationContext.getBean(ref,
org.apache.camel.spi.HeaderFilterStrategy.class);
case "org.apache.camel.support.jsse.SSLContextParameters": return
applicationContext.getBean(ref,
org.apache.camel.support.jsse.SSLContextParameters.class);
}
