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.git
The following commit(s) were added to refs/heads/main by this push:
new 66c8a46d4da CAMEL-17895: Add option for vertx-websocket consumer to
connect as a WS client
66c8a46d4da is described below
commit 66c8a46d4daca68324c5fba2e19321117a7bd6ac
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Jan 18 07:53:33 2023 +0100
CAMEL-17895: Add option for vertx-websocket consumer to connect as a WS
client
---
.../org/apache/camel/catalog/components/vertx-websocket.json | 2 +-
.../component/vertx/websocket/VertxWebsocketEndpointUriFactory.java | 2 +-
.../org/apache/camel/component/vertx/websocket/vertx-websocket.json | 2 +-
.../camel/component/vertx/websocket/VertxWebsocketConfiguration.java | 1 -
.../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 4 ++--
.../builder/endpoint/dsl/VertxWebsocketEndpointBuilderFactory.java | 4 ++--
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
index 0cb487a2259..94dbf67af3c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
@@ -38,7 +38,7 @@
"properties": {
"host": { "kind": "path", "displayName": "Host", "group": "common",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "WebSocket hostname, such
as localhost or a remote host when in client mode." },
"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": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "WebSocket path 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" },
"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 [...]
"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 [...]
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriFactory.java
b/components/camel-vertx/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriFactory.java
index 549d1a1811c..163e74fa89c 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriFactory.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriFactory.java
@@ -59,7 +59,7 @@ public class VertxWebsocketEndpointUriFactory extends
org.apache.camel.support.c
uri = buildPathParameter(syntax, uri, "host", null, true, copy);
uri = buildPathParameter(syntax, uri, "port", null, true, copy);
- uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+ uri = buildPathParameter(syntax, uri, "path", null, false, copy);
uri = buildQueryParameters(uri, copy, encode);
return uri;
}
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/generated/resources/org/apache/camel/component/vertx/websocket/vertx-websocket.json
b/components/camel-vertx/camel-vertx-websocket/src/generated/resources/org/apache/camel/component/vertx/websocket/vertx-websocket.json
index 0cb487a2259..94dbf67af3c 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/generated/resources/org/apache/camel/component/vertx/websocket/vertx-websocket.json
+++
b/components/camel-vertx/camel-vertx-websocket/src/generated/resources/org/apache/camel/component/vertx/websocket/vertx-websocket.json
@@ -38,7 +38,7 @@
"properties": {
"host": { "kind": "path", "displayName": "Host", "group": "common",
"label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "WebSocket hostname, such
as localhost or a remote host when in client mode." },
"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": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "WebSocket path 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" },
"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 [...]
"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 [...]
diff --git
a/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConfiguration.java
b/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConfiguration.java
index 56170c4a4ad..1d13ff2dc46 100644
---
a/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConfiguration.java
+++
b/components/camel-vertx/camel-vertx-websocket/src/main/java/org/apache/camel/component/vertx/websocket/VertxWebsocketConfiguration.java
@@ -39,7 +39,6 @@ public class VertxWebsocketConfiguration {
@Metadata(required = true)
private int port;
@UriPath
- @Metadata(required = true)
private String path;
@UriParam(label = "consumer")
private String allowedOriginPattern;
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 9f1dcb1cc30..5afc9c9d36f 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -14300,7 +14300,7 @@ public class StaticEndpointBuilders {
* Path parameter: port (required)
* WebSocket port number to use.
*
- * Path parameter: path (required)
+ * Path parameter: path
* WebSocket path to use.
*
* @param path host:port/path
@@ -14328,7 +14328,7 @@ public class StaticEndpointBuilders {
* Path parameter: port (required)
* WebSocket port number to use.
*
- * Path parameter: path (required)
+ * Path parameter: path
* WebSocket path to use.
*
* @param componentName to use a custom component name for the endpoint
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/VertxWebsocketEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/VertxWebsocketEndpointBuilderFactory.java
index 8b0faa30412..55526c08e42 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/VertxWebsocketEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/VertxWebsocketEndpointBuilderFactory.java
@@ -707,7 +707,7 @@ public interface VertxWebsocketEndpointBuilderFactory {
* Path parameter: port (required)
* WebSocket port number to use.
*
- * Path parameter: path (required)
+ * Path parameter: path
* WebSocket path to use.
*
* @param path host:port/path
@@ -734,7 +734,7 @@ public interface VertxWebsocketEndpointBuilderFactory {
* Path parameter: port (required)
* WebSocket port number to use.
*
- * Path parameter: path (required)
+ * Path parameter: path
* WebSocket path to use.
*
* @param componentName to use a custom component name for the endpoint
