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
The following commit(s) were added to refs/heads/main by this push:
new cd35e3b [create-pull-request] automated change
cd35e3b is described below
commit cd35e3b0ebd934711cf21bac2fe75eb643f486b8
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sun Jul 11 00:50:19 2021 +0000
[create-pull-request] automated change
---
.../springboot/catalog/components/websocket.json | 2 ++
.../src/main/docs/websocket-starter.adoc | 3 ++-
.../springboot/WebsocketComponentConfiguration.java | 19 +++++++++++++++++++
docs/modules/ROOT/pages/websocket-starter.adoc | 3 ++-
tooling/camel-spring-boot-dependencies/pom.xml | 5 +++++
5 files changed, 30 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/websocket.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/websocket.json
index 3fb2057..5ce6ff0 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/websocket.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/websocket.json
@@ -31,6 +31,7 @@
"enableJmx": { "kind": "property", "displayName": "Enable Jmx", "group":
"advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "If this option is true, Jetty JMX
support will be enabled for this endpoint. See Jetty JMX support for more
details." },
"maxThreads": { "kind": "property", "displayName": "Max Threads", "group":
"advanced", "label": "advanced", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "description": "To set a value for maximum number of threads
in server thread pool. MaxThreads\/minThreads or threadPool fields are required
due to switch to Jetty9. The default values for maxThreads is 1 2 noCores." },
"minThreads": { "kind": "property", "displayName": "Min Threads", "group":
"advanced", "label": "advanced", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "description": "To set a value for minimum number of threads
in server thread pool. MaxThreads\/minThreads or threadPool fields are required
due to switch to Jetty9. The default values for minThreads is 1." },
+ "subprotocol": { "kind": "property", "displayName": "Subprotocol",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "any", "description": "This is a
comma-separated list of subprotocols that are supported by the application. The
list is in priority order. The first subprotocol on this list that is proposed
by the client is the one that will be accept [...]
"threadPool": { "kind": "property", "displayName": "Thread Pool", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.eclipse.jetty.util.thread.ThreadPool", "deprecated": false,
"autowired": false, "secret": false, "description": "To use a custom thread
pool for the server. MaxThreads\/minThreads or threadPool fields are required
due to switch to Jetty9." },
"sslContextParameters": { "kind": "property", "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, "description": "To configure security
using SSLContextParameters" },
"sslKeyPassword": { "kind": "property", "displayName": "Ssl Key Password",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "description": "The password for the keystore when using SSL."
},
@@ -46,6 +47,7 @@
"bridgeErrorHandler": { "kind": "parameter", "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 m [...]
"sessionSupport": { "kind": "parameter", "displayName": "Session Support",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "Whether to enable session support
which enables HttpSession for each http request." },
"staticResources": { "kind": "parameter", "displayName": "Static
Resources", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Set a resource path for
static resources (such as .html files etc). The resources can be loaded from
classpath, if you prefix with classpath:, otherwise the resources is loaded
from file system or from JAR files. For example t [...]
+ "subprotocol": { "kind": "parameter", "displayName": "Subprotocol",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "any", "description": "This is a
comma-separated list of subprotocols that are supported by the application. The
list is in priority order. The first subprotocol on this list that is proposed
by the client is the one that will be accep [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
"lazyStartProducer": { "kind": "parameter", "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 sta [...]
diff --git
a/components-starter/camel-websocket-starter/src/main/docs/websocket-starter.adoc
b/components-starter/camel-websocket-starter/src/main/docs/websocket-starter.adoc
index d03df5f..60b1b53 100644
---
a/components-starter/camel-websocket-starter/src/main/docs/websocket-starter.adoc
+++
b/components-starter/camel-websocket-starter/src/main/docs/websocket-starter.adoc
@@ -17,7 +17,7 @@ When using websocket with Spring Boot make sure to use the
following Maven depen
----
-The component supports 16 options, which are listed below.
+The component supports 17 options, which are listed below.
@@ -38,6 +38,7 @@ The component supports 16 options, which are listed below.
| *camel.component.websocket.ssl-keystore* | The path to the keystore. | |
String
| *camel.component.websocket.ssl-password* | The password when using SSL. | |
String
| *camel.component.websocket.static-resources* | Set a resource path for
static resources (such as .html files etc). The resources can be loaded from
classpath, if you prefix with classpath:, otherwise the resources is loaded
from file system or from JAR files. For example to load from root classpath use
classpath:., or classpath:WEB-INF/static If not configured (eg null) then no
static resource is in use. | | String
+| *camel.component.websocket.subprotocol* | This is a comma-separated list of
subprotocols that are supported by the application. The list is in priority
order. The first subprotocol on this list that is proposed by the client is the
one that will be accepted. If no subprotocol on this list is proposed by the
client, then the websocket connection is refused. The special value 'any' means
that any subprotocol is acceptable. 'any' can be used on its own, or as a
failsafe at the end of a li [...]
| *camel.component.websocket.thread-pool* | To use a custom thread pool for
the server. MaxThreads/minThreads or threadPool fields are required due to
switch to Jetty9. The option is a org.eclipse.jetty.util.thread.ThreadPool
type. | | ThreadPool
| *camel.component.websocket.use-global-ssl-context-parameters* | Enable usage
of global SSL context parameters. | false | Boolean
|===
diff --git
a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
b/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
index c744f0b..07714cd 100644
---
a/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
+++
b/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java
@@ -102,6 +102,17 @@ public class WebsocketComponentConfiguration
*/
private Integer minThreads;
/**
+ * This is a comma-separated list of subprotocols that are supported by the
+ * application. The list is in priority order. The first subprotocol on
this
+ * list that is proposed by the client is the one that will be accepted. If
+ * no subprotocol on this list is proposed by the client, then the
websocket
+ * connection is refused. The special value 'any' means that any
subprotocol
+ * is acceptable. 'any' can be used on its own, or as a failsafe at the end
+ * of a list of more specific protocols. 'any' will also match the case
+ * where no subprotocol is proposed by the client.
+ */
+ private String subprotocol = "any";
+ /**
* To use a custom thread pool for the server. MaxThreads/minThreads or
* threadPool fields are required due to switch to Jetty9. The option is a
* org.eclipse.jetty.util.thread.ThreadPool type.
@@ -201,6 +212,14 @@ public class WebsocketComponentConfiguration
this.minThreads = minThreads;
}
+ public String getSubprotocol() {
+ return subprotocol;
+ }
+
+ public void setSubprotocol(String subprotocol) {
+ this.subprotocol = subprotocol;
+ }
+
public ThreadPool getThreadPool() {
return threadPool;
}
diff --git a/docs/modules/ROOT/pages/websocket-starter.adoc
b/docs/modules/ROOT/pages/websocket-starter.adoc
index d03df5f..60b1b53 100644
--- a/docs/modules/ROOT/pages/websocket-starter.adoc
+++ b/docs/modules/ROOT/pages/websocket-starter.adoc
@@ -17,7 +17,7 @@ When using websocket with Spring Boot make sure to use the
following Maven depen
----
-The component supports 16 options, which are listed below.
+The component supports 17 options, which are listed below.
@@ -38,6 +38,7 @@ The component supports 16 options, which are listed below.
| *camel.component.websocket.ssl-keystore* | The path to the keystore. | |
String
| *camel.component.websocket.ssl-password* | The password when using SSL. | |
String
| *camel.component.websocket.static-resources* | Set a resource path for
static resources (such as .html files etc). The resources can be loaded from
classpath, if you prefix with classpath:, otherwise the resources is loaded
from file system or from JAR files. For example to load from root classpath use
classpath:., or classpath:WEB-INF/static If not configured (eg null) then no
static resource is in use. | | String
+| *camel.component.websocket.subprotocol* | This is a comma-separated list of
subprotocols that are supported by the application. The list is in priority
order. The first subprotocol on this list that is proposed by the client is the
one that will be accepted. If no subprotocol on this list is proposed by the
client, then the websocket connection is refused. The special value 'any' means
that any subprotocol is acceptable. 'any' can be used on its own, or as a
failsafe at the end of a li [...]
| *camel.component.websocket.thread-pool* | To use a custom thread pool for
the server. MaxThreads/minThreads or threadPool fields are required due to
switch to Jetty9. The option is a org.eclipse.jetty.util.thread.ThreadPool
type. | | ThreadPool
| *camel.component.websocket.use-global-ssl-context-parameters* | Enable usage
of global SSL context parameters. | false | Boolean
|===
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 4355f75..06ce794 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -342,6 +342,11 @@
<version>1.7</version>
</dependency>
<dependency>
+ <groupId>info.picocli</groupId>
+ <artifactId>picocli</artifactId>
+ <version>4.5.0</version>
+ </dependency>
+ <dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-data-models</artifactId>
<version>1.0.16.Final</version>
