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 cc166458159 Regen and fix compile
cc166458159 is described below
commit cc166458159a433899c91464f9558bcd4cd160ae
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Mar 24 22:06:44 2023 +0100
Regen and fix compile
---
.../camel/springboot/catalog/components/http.json | 1 -
.../camel/springboot/catalog/components/https.json | 1 -
.../catalog/components/vertx-websocket.json | 4 +++-
.../camel-http-starter/src/main/docs/http.json | 6 ------
.../springboot/HttpComponentConfiguration.java | 13 ------------
.../springboot/KameletConsumerUoWIssueTest.java | 1 -
.../kamelet/springboot/KameletUoWIssueTest.java | 1 -
.../src/main/docs/vertx-websocket.json | 14 +++++++++++++
.../VertxWebsocketComponentConfiguration.java | 24 ++++++++++++++++++++++
9 files changed, 41 insertions(+), 24 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
index a1007a00b0c..c36f860ab69 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
@@ -64,7 +64,6 @@
"connectionRequestTimeout": { "kind": "property", "displayName":
"Connection Request Timeout", "group": "timeout", "label": "timeout",
"required": false, "type": "object", "javaType":
"org.apache.hc.core5.util.Timeout", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "3 minutes", "description": "Returns the
connection lease request timeout used when requesting a connection from the
connection manager. A timeout value of zero is interpreted as a disabled time
[...]
"connectTimeout": { "kind": "property", "displayName": "Connect Timeout",
"group": "timeout", "label": "timeout", "required": false, "type": "object",
"javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "3 minutes",
"description": "Determines the timeout until a new connection is fully
established. A timeout value of zero is interpreted as an infinite timeout." },
"responseTimeout": { "kind": "property", "displayName": "Response
Timeout", "group": "timeout", "label": "timeout", "required": false, "type":
"object", "javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "0", "description":
"Determines the timeout until arrival of a response from the opposite endpoint.
A timeout value of zero is interpreted as an infinite timeout. Please note that
response timeout may be unsupport [...]
- "socketTimeout": { "kind": "property", "displayName": "Socket Timeout",
"group": "timeout", "label": "timeout", "required": false, "type": "object",
"javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "null (undefined)",
"description": "Determines the default socket timeout value for I\/O
operations." },
"soTimeout": { "kind": "property", "displayName": "So Timeout", "group":
"timeout", "label": "timeout", "required": false, "type": "object", "javaType":
"org.apache.hc.core5.util.Timeout", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "3 minutes", "description": "Determines the
default socket timeout value for blocking I\/O operations." }
},
"headers": {
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
index 110f698f8d3..2ee804cf1b7 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
@@ -64,7 +64,6 @@
"connectionRequestTimeout": { "kind": "property", "displayName":
"Connection Request Timeout", "group": "timeout", "label": "timeout",
"required": false, "type": "object", "javaType":
"org.apache.hc.core5.util.Timeout", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "3 minutes", "description": "Returns the
connection lease request timeout used when requesting a connection from the
connection manager. A timeout value of zero is interpreted as a disabled time
[...]
"connectTimeout": { "kind": "property", "displayName": "Connect Timeout",
"group": "timeout", "label": "timeout", "required": false, "type": "object",
"javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "3 minutes",
"description": "Determines the timeout until a new connection is fully
established. A timeout value of zero is interpreted as an infinite timeout." },
"responseTimeout": { "kind": "property", "displayName": "Response
Timeout", "group": "timeout", "label": "timeout", "required": false, "type":
"object", "javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "0", "description":
"Determines the timeout until arrival of a response from the opposite endpoint.
A timeout value of zero is interpreted as an infinite timeout. Please note that
response timeout may be unsupport [...]
- "socketTimeout": { "kind": "property", "displayName": "Socket Timeout",
"group": "timeout", "label": "timeout", "required": false, "type": "object",
"javaType": "org.apache.hc.core5.util.Timeout", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "null (undefined)",
"description": "Determines the default socket timeout value for I\/O
operations." },
"soTimeout": { "kind": "property", "displayName": "So Timeout", "group":
"timeout", "label": "timeout", "required": false, "type": "object", "javaType":
"org.apache.hc.core5.util.Timeout", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "3 minutes", "description": "Determines the
default socket timeout value for blocking I\/O operations." }
},
"headers": {
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
index 0ddfdebdc28..aa2d51cce5f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-websocket.json
@@ -25,6 +25,8 @@
"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 [...]
+ "defaultHost": { "kind": "property", "displayName": "Default Host",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "0.0.0.0", "description": "Default value for
host name that the WebSocket should bind to" },
+ "defaultPort": { "kind": "property", "displayName": "Default Port",
"group": "advanced", "label": "advanced", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 0, "description": "Default value for the port that the
WebSocket should bind to" },
"router": { "kind": "property", "displayName": "Router", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "io.vertx.ext.web.Router", "deprecated": false, "autowired": false,
"secret": false, "description": "To provide a custom vertx router to use on the
WebSocket server" },
"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" },
"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" },
@@ -53,7 +55,7 @@
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
"clientOptions": { "kind": "parameter", "displayName": "Client Options",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "io.vertx.core.http.HttpClientOptions", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "Sets customized options
for configuring the WebSocket client used in the pr [...]
"clientSubProtocols": { "kind": "parameter", "displayName": "Client Sub
Protocols", "group": "producer", "label": "producer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "Comma separated list of
WebSocket subprotocols that the client should use for the Se [...]
- "sendToAll": { "kind": "parameter", "displayName": "Send To All", "group":
"producer", "label": "producer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "To send to all websocket
subscribers. Can be used to configure on endpoint level, inste [...]
+ "sendToAll": { "kind": "parameter", "displayName": "Send To All", "group":
"producer", "label": "producer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "To send to all websocket
subscribers. Can be used to configure at the endpoint level, i [...]
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer (advanced)", "label": "producer,advanced",
"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 other [...]
"sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context
Parameters", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "To configure security
using SSLContextParameters" }
}
diff --git a/components-starter/camel-http-starter/src/main/docs/http.json
b/components-starter/camel-http-starter/src/main/docs/http.json
index 745eff848e9..0ee4e07bb87 100644
--- a/components-starter/camel-http-starter/src/main/docs/http.json
+++ b/components-starter/camel-http-starter/src/main/docs/http.json
@@ -263,12 +263,6 @@
"description": "Determines the default socket timeout value for blocking
I\/O operations. The option is a org.apache.hc.core5.util.Timeout type.",
"sourceType":
"org.apache.camel.component.http.springboot.HttpComponentConfiguration"
},
- {
- "name": "camel.component.http.socket-timeout",
- "type": "org.apache.hc.core5.util.Timeout",
- "description": "Determines the default socket timeout value for I\/O
operations. The option is a org.apache.hc.core5.util.Timeout type.",
- "sourceType":
"org.apache.camel.component.http.springboot.HttpComponentConfiguration"
- },
{
"name": "camel.component.http.ssl-context-parameters",
"type": "org.apache.camel.support.jsse.SSLContextParameters",
diff --git
a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
index ee03199d446..ecddeb21fd4 100644
---
a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
+++
b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
@@ -261,11 +261,6 @@ public class HttpComponentConfiguration
* org.apache.hc.core5.util.Timeout type.
*/
private Timeout responseTimeout;
- /**
- * Determines the default socket timeout value for I/O operations. The
- * option is a org.apache.hc.core5.util.Timeout type.
- */
- private Timeout socketTimeout;
/**
* Determines the default socket timeout value for blocking I/O operations.
* The option is a org.apache.hc.core5.util.Timeout type.
@@ -590,14 +585,6 @@ public class HttpComponentConfiguration
this.responseTimeout = responseTimeout;
}
- public Timeout getSocketTimeout() {
- return socketTimeout;
- }
-
- public void setSocketTimeout(Timeout socketTimeout) {
- this.socketTimeout = socketTimeout;
- }
-
public Timeout getSoTimeout() {
return soTimeout;
}
diff --git
a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumerUoWIssueTest.java
b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumerUoWIssueTest.java
index 3d6b11c3187..b4ef3e0767d 100644
---
a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumerUoWIssueTest.java
+++
b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletConsumerUoWIssueTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.kamelet.springboot;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedExchange;
import org.apache.camel.Processor;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletUoWIssueTest.java
b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletUoWIssueTest.java
index 3fbdfc80f2d..72e74b268ae 100644
---
a/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletUoWIssueTest.java
+++
b/components-starter/camel-kamelet-starter/src/test/java/org/apache/camel/component/kamelet/springboot/KameletUoWIssueTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.kamelet.springboot;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedExchange;
import org.apache.camel.Processor;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/components-starter/camel-vertx-websocket-starter/src/main/docs/vertx-websocket.json
b/components-starter/camel-vertx-websocket-starter/src/main/docs/vertx-websocket.json
index 6fd34ce0364..f1ab5c9dc89 100644
---
a/components-starter/camel-vertx-websocket-starter/src/main/docs/vertx-websocket.json
+++
b/components-starter/camel-vertx-websocket-starter/src/main/docs/vertx-websocket.json
@@ -32,6 +32,20 @@
"type": "java.lang.Boolean",
"sourceType":
"org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties"
},
+ {
+ "name": "camel.component.vertx-websocket.default-host",
+ "type": "java.lang.String",
+ "description": "Default value for host name that the WebSocket should
bind to",
+ "sourceType":
"org.apache.camel.component.vertx.websocket.springboot.VertxWebsocketComponentConfiguration",
+ "defaultValue": "0.0.0.0"
+ },
+ {
+ "name": "camel.component.vertx-websocket.default-port",
+ "type": "java.lang.Integer",
+ "description": "Default value for the port that the WebSocket should
bind to",
+ "sourceType":
"org.apache.camel.component.vertx.websocket.springboot.VertxWebsocketComponentConfiguration",
+ "defaultValue": 0
+ },
{
"name": "camel.component.vertx-websocket.enabled",
"type": "java.lang.Boolean",
diff --git
a/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentConfiguration.java
b/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentConfiguration.java
index c779ef94ea0..9f727b4d474 100644
---
a/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentConfiguration.java
+++
b/components-starter/camel-vertx-websocket-starter/src/main/java/org/apache/camel/component/vertx/websocket/springboot/VertxWebsocketComponentConfiguration.java
@@ -67,6 +67,14 @@ public class VertxWebsocketComponentConfiguration
* etc.
*/
private Boolean autowiredEnabled = true;
+ /**
+ * Default value for host name that the WebSocket should bind to
+ */
+ private String defaultHost = "0.0.0.0";
+ /**
+ * Default value for the port that the WebSocket should bind to
+ */
+ private Integer defaultPort = 0;
/**
* To provide a custom vertx router to use on the WebSocket server. The
* option is a io.vertx.ext.web.Router type.
@@ -111,6 +119,22 @@ public class VertxWebsocketComponentConfiguration
this.autowiredEnabled = autowiredEnabled;
}
+ public String getDefaultHost() {
+ return defaultHost;
+ }
+
+ public void setDefaultHost(String defaultHost) {
+ this.defaultHost = defaultHost;
+ }
+
+ public Integer getDefaultPort() {
+ return defaultPort;
+ }
+
+ public void setDefaultPort(Integer defaultPort) {
+ this.defaultPort = defaultPort;
+ }
+
public Router getRouter() {
return router;
}
