This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit b16fb70536b77a485c7825fb9c130a7fa63eb5fc
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Apr 5 17:20:33 2023 +0200
Regen
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../catalog/components/vertx-websocket.json | 4 ++++
.../src/main/docs/vertx-websocket.json | 13 ++++++++++
.../VertxWebsocketComponentConfiguration.java | 28 ++++++++++++++++++++++
3 files changed, 45 insertions(+)
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 aa2d51cce5f..1adba0f1233 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
@@ -24,9 +24,11 @@
"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 [...]
+ "allowOriginHeader": { "kind": "property", "displayName": "Allow Origin
Header", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether the WebSocket
client should add the Origin header to the WebSocket handshake request." },
"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" },
+ "originHeaderUrl": { "kind": "property", "displayName": "Origin Header
Url", "group": "advanced", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The value of the Origin header that the
WebSocket client should use on the WebSocket handshake request. When not
specified, the WebSocket client will automatically determine the value for the
Origin from the request URL." },
"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" },
@@ -43,9 +45,11 @@
"port": { "kind": "path", "displayName": "Port", "group": "common",
"label": "", "required": true, "type": "integer", "javaType": "int",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "WebSocket port number to
use." },
"path": { "kind": "path", "displayName": "Path", "group": "common",
"label": "", "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": "WebSocket path to use."
},
"allowedOriginPattern": { "kind": "parameter", "displayName": "Allowed
Origin Pattern", "group": "consumer", "label": "consumer", "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": "Regex pattern to match
the origin header sent by WebSocket clients" },
+ "allowOriginHeader": { "kind": "parameter", "displayName": "Allow Origin
Header", "group": "consumer", "label": "producer,consumer", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "Whether the WebSocket
client should add the Origin header to th [...]
"consumeAsClient": { "kind": "parameter", "displayName": "Consume As
Client", "group": "consumer", "label": "consumer", "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": "When set to true, the
consumer acts as a WebSocket client, creating exchang [...]
"fireWebSocketConnectionEvents": { "kind": "parameter", "displayName":
"Fire Web Socket Connection Events", "group": "consumer", "label": "consumer",
"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": "Whether the server
consumer will create a mes [...]
"maxReconnectAttempts": { "kind": "parameter", "displayName": "Max
Reconnect Attempts", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 0, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "When consumeAsClient is
set to true this sets the maximum number of allow [...]
+ "originHeaderUrl": { "kind": "parameter", "displayName": "Origin Header
Url", "group": "consumer", "label": "producer,consumer", "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": "The value of the Origin
header that the WebSocket client should use on the WebSoc [...]
"reconnectInitialDelay": { "kind": "parameter", "displayName": "Reconnect
Initial Delay", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 0, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "When consumeAsClient is
set to true this sets the initial delay in mill [...]
"reconnectInterval": { "kind": "parameter", "displayName": "Reconnect
Interval", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1000, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "When consumeAsClient is
set to true this sets the interval in milliseconds at [...]
"router": { "kind": "parameter", "displayName": "Router", "group":
"consumer", "label": "consumer", "required": false, "type": "object",
"javaType": "io.vertx.ext.web.Router", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "To use an existing vertx
router for the HTTP server" },
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 f1ab5c9dc89..9d00b5c34ee 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
@@ -13,6 +13,13 @@
}
],
"properties": [
+ {
+ "name": "camel.component.vertx-websocket.allow-origin-header",
+ "type": "java.lang.Boolean",
+ "description": "Whether the WebSocket client should add the Origin
header to the WebSocket handshake request.",
+ "sourceType":
"org.apache.camel.component.vertx.websocket.springboot.VertxWebsocketComponentConfiguration",
+ "defaultValue": true
+ },
{
"name": "camel.component.vertx-websocket.autowired-enabled",
"type": "java.lang.Boolean",
@@ -59,6 +66,12 @@
"sourceType":
"org.apache.camel.component.vertx.websocket.springboot.VertxWebsocketComponentConfiguration",
"defaultValue": false
},
+ {
+ "name": "camel.component.vertx-websocket.origin-header-url",
+ "type": "java.lang.String",
+ "description": "The value of the Origin header that the WebSocket client
should use on the WebSocket handshake request. When not specified, the
WebSocket client will automatically determine the value for the Origin from the
request URL.",
+ "sourceType":
"org.apache.camel.component.vertx.websocket.springboot.VertxWebsocketComponentConfiguration"
+ },
{
"name": "camel.component.vertx-websocket.router",
"type": "io.vertx.ext.web.Router",
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 9f727b4d474..8f8070af301 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
@@ -58,6 +58,11 @@ public class VertxWebsocketComponentConfiguration
* and prolong the total processing time of the processing.
*/
private Boolean lazyStartProducer = false;
+ /**
+ * Whether the WebSocket client should add the Origin header to the
+ * WebSocket handshake request.
+ */
+ private Boolean allowOriginHeader = true;
/**
* Whether autowiring is enabled. This is used for automatic autowiring
* options (the option must be marked as autowired) by looking up in the
@@ -75,6 +80,13 @@ public class VertxWebsocketComponentConfiguration
* Default value for the port that the WebSocket should bind to
*/
private Integer defaultPort = 0;
+ /**
+ * The value of the Origin header that the WebSocket client should use on
+ * the WebSocket handshake request. When not specified, the WebSocket
client
+ * will automatically determine the value for the Origin from the request
+ * URL.
+ */
+ private String originHeaderUrl;
/**
* To provide a custom vertx router to use on the WebSocket server. The
* option is a io.vertx.ext.web.Router type.
@@ -111,6 +123,14 @@ public class VertxWebsocketComponentConfiguration
this.lazyStartProducer = lazyStartProducer;
}
+ public Boolean getAllowOriginHeader() {
+ return allowOriginHeader;
+ }
+
+ public void setAllowOriginHeader(Boolean allowOriginHeader) {
+ this.allowOriginHeader = allowOriginHeader;
+ }
+
public Boolean getAutowiredEnabled() {
return autowiredEnabled;
}
@@ -135,6 +155,14 @@ public class VertxWebsocketComponentConfiguration
this.defaultPort = defaultPort;
}
+ public String getOriginHeaderUrl() {
+ return originHeaderUrl;
+ }
+
+ public void setOriginHeaderUrl(String originHeaderUrl) {
+ this.originHeaderUrl = originHeaderUrl;
+ }
+
public Router getRouter() {
return router;
}
