You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/02/09 08:14:23 UTC
[camel] branch camel-3.x updated: Regen for commit bf23f3b06ac7acbb9f98f3967dfa01c9a8003321
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 02437efd25f Regen for commit bf23f3b06ac7acbb9f98f3967dfa01c9a8003321
02437efd25f is described below
commit 02437efd25f1e58eba54d7103ecf13bdaf3d203a
Author: jamesnetherton <ja...@users.noreply.github.com>
AuthorDate: Thu Feb 9 07:57:23 2023 +0000
Regen for commit bf23f3b06ac7acbb9f98f3967dfa01c9a8003321
Signed-off-by: GitHub <no...@github.com>
---
.../camel/catalog/components/vertx-websocket.json | 4 ++-
.../vertx/websocket/VertxWebSocketEventTest.java | 38 +++++++++++-----------
2 files changed, 22 insertions(+), 20 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 d51955b2e8c..be44143f226 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
@@ -33,7 +33,8 @@
"headers": {
"CamelVertxWebsocket.connectionKey": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Sends the message to the client with the given connection key. You can use a comma separated list of keys to send a message to multiple clients", "constantName": "org.apache.camel.component.vertx.websocket.VertxWebsocketConstants#CONNECTION_KEY" },
"CamelVertxWebsocket.sendToAll": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Sends the message to all clients which are currently connected. You can use the sendToAll option on the endpoint instead of using this header.", "constantName": "org.apache.camel.component.vertx.websocket.VertxWebsocketConstants#SEND_T [...]
- "CamelVertxWebsocket.remoteAddress": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "io.vertx.core.net.SocketAddress", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The remote address.", "constantName": "org.apache.camel.component.vertx.websocket.VertxWebsocketConstants#REMOTE_ADDRESS" }
+ "CamelVertxWebsocket.remoteAddress": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "io.vertx.core.net.SocketAddress", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The remote address.", "constantName": "org.apache.camel.component.vertx.websocket.VertxWebsocketConstants#REMOTE_ADDRESS" },
+ "CamelVertxWebsocket.event": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "org.apache.camel.component.vertx.websocket.VertxWebsocketEvent", "enum": [ "CLOSE", "ERROR", "MESSAGE", "OPEN" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The WebSocket event that triggered the message exchange.", "constantName": "org.apache.camel.component.vertx.websocket.VertxWebsocketCo [...]
},
"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." },
@@ -41,6 +42,7 @@
"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 [...]
+ "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 [...]
"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 [...]
diff --git a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketEventTest.java b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketEventTest.java
index ec581d33730..8c1237ffc57 100644
--- a/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketEventTest.java
+++ b/components/camel-vertx/camel-vertx-websocket/src/test/java/org/apache/camel/component/vertx/websocket/VertxWebSocketEventTest.java
@@ -78,25 +78,25 @@ public class VertxWebSocketEventTest extends VertxWebSocketTestSupport {
fromF("vertx-websocket:localhost:%d/test?fireWebSocketConnectionEvents=true&serverOptions=#serverOptions&bridgeErrorHandler=true",
port)
- .choice()
- .when(simple("${header.CamelVertxWebsocket.event} == 'OPEN'"))
- .process(exchange -> {
- Message message = exchange.getMessage();
- webSocket = message.getBody(ServerWebSocket.class);
- })
- .setBody().constant("WebSocket Open")
- .to("mock:result")
- .endChoice()
-
- .when(simple("${header.CamelVertxWebsocket.event} == 'MESSAGE'"))
- .setBody().constant("WebSocket Message")
- .to("mock:result")
- .endChoice()
-
- .when(simple("${header.CamelVertxWebsocket.event} == 'CLOSE'"))
- .setBody().constant("WebSocket Close")
- .to("mock:result")
- .endChoice();
+ .choice()
+ .when(simple("${header.CamelVertxWebsocket.event} == 'OPEN'"))
+ .process(exchange -> {
+ Message message = exchange.getMessage();
+ webSocket = message.getBody(ServerWebSocket.class);
+ })
+ .setBody().constant("WebSocket Open")
+ .to("mock:result")
+ .endChoice()
+
+ .when(simple("${header.CamelVertxWebsocket.event} == 'MESSAGE'"))
+ .setBody().constant("WebSocket Message")
+ .to("mock:result")
+ .endChoice()
+
+ .when(simple("${header.CamelVertxWebsocket.event} == 'CLOSE'"))
+ .setBody().constant("WebSocket Close")
+ .to("mock:result")
+ .endChoice();
}
};
}