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 2020/05/18 13:08:11 UTC
[camel-spring-boot] 01/01: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 2006dd885ae4e86a542137485334a284dd556e9a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon May 18 15:07:22 2020 +0200
Regen
---
.../catalog/components/atmosphere-websocket.json | 2 +-
.../springboot/catalog/components/resteasy.json | 81 +++++++++---------
.../springboot/catalog/components/servlet.json | 2 +-
components-starter/README.adoc | 2 +-
.../main/docs/atmosphere-websocket-starter.adoc | 3 +-
.../WebsocketComponentConfiguration.java | 2 +-
components-starter/camel-resteasy-starter/pom.xml | 2 +-
.../src/main/docs/resteasy-starter.adoc | 4 +-
.../springboot/ResteasyComponentConfiguration.java | 98 +++++++++++-----------
.../src/main/docs/servlet-starter.adoc | 3 +-
.../springboot/ServletComponentConfiguration.java | 2 +-
.../ROOT/pages/atmosphere-websocket-starter.adoc | 3 +-
docs/modules/ROOT/pages/list.adoc | 2 +-
docs/modules/ROOT/pages/resteasy-starter.adoc | 4 +-
docs/modules/ROOT/pages/servlet-starter.adoc | 3 +-
docs/modules/ROOT/pages/spring-boot.adoc | 5 --
tooling/camel-spring-boot-dependencies/pom.xml | 4 +-
17 files changed, 105 insertions(+), 117 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
index 5f2ef41..80fa257 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
@@ -26,7 +26,7 @@
"servletName": { "kind": "property", "displayName": "Servlet Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "CamelServlet", "description": "Default name of servlet to use. The default name is CamelServlet." },
"attachmentMultipartBinding": { "kind": "property", "displayName": "Attachment Multipart Binding", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to automatic bind multipart\/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together. Remove di [...]
"fileNameExtWhitelist": { "kind": "property", "displayName": "File Name Ext Whitelist", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml." },
- "httpRegistry": { "kind": "property", "displayName": "Http Registry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.servlet.HttpRegistry", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.component.servlet.HttpRegistry." },
+ "httpRegistry": { "kind": "property", "displayName": "Http Registry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.HttpRegistry", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.component.servlet.HttpRegistry." },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 starting and cause the r [...]
"allowJavaSerializedObject": { "kind": "property", "displayName": "Allow Java Serialized Object", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incomin [...]
"basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/resteasy.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/resteasy.json
index 713edcf..091963d 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/resteasy.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/resteasy.json
@@ -5,26 +5,28 @@
"title": "Resteasy",
"description": "Defines the Resteasy Endpoint.",
"deprecated": false,
- "firstVersion": "3.3.0",
+ "firstVersion": "3.4.0",
"label": "rest",
"javaType": "org.apache.camel.component.resteasy.ResteasyComponent",
- "supportLevel": "Stable",
+ "supportLevel": "Preview",
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-resteasy-starter",
- "version": "3.3.0-SNAPSHOT",
+ "version": "3.4.0-SNAPSHOT",
"scheme": "resteasy",
"extendsScheme": "http",
"syntax": "resteasy:contextPath",
"async": false,
- "consumerOnly": true,
+ "consumerOnly": false,
"producerOnly": false,
"lenientProperties": false,
"verifiers": "parameters,connectivity"
},
"componentProperties": {
+ "httpRegistry": { "kind": "property", "displayName": "Http Registry", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.HttpRegistry", "deprecated": false, "secret": false, "description": "Sets httpRegistry which can be externalized to be used by camel" },
+ "proxyConsumersClasses": { "kind": "property", "displayName": "Proxy Consumers Classes", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the proxy class for consumer enpoints" },
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 message and handled by [...]
- "httpRegistry": { "kind": "property", "displayName": "Http Registry", "group": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.resteasy.HttpRegistry", "deprecated": false, "secret": false, "description": "Sets httpRegistry which can be externalized to be used by camel" },
- "proxyConsumersClasses": { "kind": "property", "displayName": "Proxy Consumers Classes", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the proxy class for consumer enpoints" },
+ "cookieStore": { "kind": "property", "displayName": "Cookie Store", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.http.client.CookieStore", "deprecated": false, "secret": false, "description": "To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop c [...]
+ "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 starting and cause the r [...]
"allowJavaSerializedObject": { "kind": "property", "displayName": "Allow Java Serialized Object", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incomin [...]
"basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
"clientConnectionManager": { "kind": "property", "displayName": "Client Connection Manager", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.conn.HttpClientConnectionManager", "deprecated": false, "secret": false, "description": "To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component." },
@@ -41,54 +43,37 @@
"x509HostnameVerifier": { "kind": "property", "displayName": "X509 Hostname Verifier", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "secret": false, "description": "To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier." },
"connectionRequestTimeout": { "kind": "property", "displayName": "Connection Request Timeout", "group": "timeout", "label": "timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "The timeout in milliseconds used when requesting a connection from the connection manager. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A n [...]
"connectTimeout": { "kind": "property", "displayName": "Connect Timeout", "group": "timeout", "label": "timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "Determines the timeout in milliseconds until a connection is established. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefi [...]
- "socketTimeout": { "kind": "property", "displayName": "Socket Timeout", "group": "timeout", "label": "timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "Defines the socket timeout in milliseconds, which is the timeout for waiting for data or, put differently, a maximum period inactivity between two consecutive data packets). A timeout value of zero is interpreted as an infinite timeout. A nega [...]
- "cookieStore": { "kind": "property", "displayName": "Cookie Store", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.http.client.CookieStore", "deprecated": false, "secret": false, "description": "To use a custom org.apache.http.client.CookieStore. By default the org.apache.http.impl.client.BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop c [...]
- "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 starting and cause the r [...]
+ "socketTimeout": { "kind": "property", "displayName": "Socket Timeout", "group": "timeout", "label": "timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "-1", "description": "Defines the socket timeout in milliseconds, which is the timeout for waiting for data or, put differently, a maximum period inactivity between two consecutive data packets). A timeout value of zero is interpreted as an infinite timeout. A nega [...]
},
"properties": {
"httpUri": { "kind": "path", "displayName": "Http Uri", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.net.URI", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The url of the HTTP endpoint to call." },
- "httpBinding": { "kind": "parameter", "displayName": "Http Binding", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.HttpBinding", "deprecated": false, "secret": false, "description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient." },
- "chunked": { "kind": "parameter", "displayName": "Chunked", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response" },
+ "basicAuth": { "kind": "parameter", "displayName": "Basic Auth", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "Sets the flag to basicAuth on endpoint" },
+ "chunked": { "kind": "parameter", "displayName": "Chunked", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response" },
"disableStreamCache": { "kind": "parameter", "displayName": "Disable Stream Cache", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Determines whether or not the raw input stream from Servlet is cached or not (Camel will read the stream into a in memory\/overflow to file, Stream caching) cache. By default Camel will cache the Servlet input stream to support [...]
+ "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
+ "password": { "kind": "parameter", "displayName": "Password", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the password" },
+ "proxyClientClass": { "kind": "parameter", "displayName": "Proxy Client Class", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the resteasy proxyClientClass" },
+ "proxyMethod": { "kind": "parameter", "displayName": "Proxy Method", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the proxy method defined in an interface" },
+ "restEasyHttpBindingRef": { "kind": "parameter", "displayName": "Rest Easy Http Binding Ref", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.resteasy.ResteasyHttpBinding", "deprecated": false, "secret": false, "description": "Sets the restEasyHttpBinding if you have a customised one registered in the context" },
+ "resteasyMethod": { "kind": "parameter", "displayName": "Resteasy Method", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the resteasy method to process the request" },
+ "servletName": { "kind": "parameter", "displayName": "Servlet Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the servlet name" },
+ "setHttpResponseDuringProcessing": { "kind": "parameter", "displayName": "Set Http Response During Processing", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "Sets the flag to use the endpoint where you can either populate camel exchange from servlet response or use request itself which may be thought as if it is a proxy." },
+ "skipServletProcessing": { "kind": "parameter", "displayName": "Skip Servlet Processing", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "Sets the flag to use skip servlet processing and let camel take over processing" },
+ "throwExceptionOnFailure": { "kind": "parameter", "displayName": "Throw Exception On Failure", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "ets the flag to propogate the exception" },
+ "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application\/x-java-serialized-object content type. On the producer side the exception will be d [...]
+ "username": { "kind": "parameter", "displayName": "Username", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the username" },
+ "httpBinding": { "kind": "parameter", "displayName": "Http Binding", "group": "common (advanced)", "label": "common,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.HttpBinding", "deprecated": false, "secret": false, "description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient." },
"async": { "kind": "parameter", "displayName": "Async", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Configure the consumer to work in async mode" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 message and handled b [...]
- "camelProxy": { "kind": "parameter", "displayName": "Camel Proxy", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "Sets the flag to use camel for proxying without resteasy interfaces" },
- "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
"httpMethodRestrict": { "kind": "parameter", "displayName": "Http Method Restrict", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Used to only allow consuming if the HttpMethod matches, such as GET\/POST\/PUT etc. Multiple methods can be specified separated by comma." },
"matchOnUriPrefix": { "kind": "parameter", "displayName": "Match On Uri Prefix", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not the consumer should try to find a target consumer by matching the URI prefix if no exact match is found." },
"muteException": { "kind": "parameter", "displayName": "Mute Exception", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled and an Exchange failed processing on the consumer side the response's body won't contain the exception's stack trace." },
- "password": { "kind": "parameter", "displayName": "Password", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the password" },
- "proxy": { "kind": "parameter", "displayName": "Proxy", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "Sets the flag to use the endpoint as proxy" },
- "proxyClientClass": { "kind": "parameter", "displayName": "Proxy Client Class", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the resteasy proxyClientClass" },
- "proxyMethod": { "kind": "parameter", "displayName": "Proxy Method", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the proxy method defined in an interface" },
"responseBufferSize": { "kind": "parameter", "displayName": "Response Buffer Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "To use a custom buffer size on the javax.servlet.ServletResponse." },
- "restEasyHttpBindingRef": { "kind": "parameter", "displayName": "Rest Easy Http Binding Ref", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.resteasy.ResteasyHttpBinding", "deprecated": false, "secret": false, "description": "Sets the restEasyHttpBinding if you have a customised one registered in the context" },
- "resteasyMethod": { "kind": "parameter", "displayName": "Resteasy Method", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the resteasy method to process the request" },
- "servletName": { "kind": "parameter", "displayName": "Servlet Name", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the servlet name" },
- "throwExceptionOnFailure": { "kind": "parameter", "displayName": "Throw Exception On Failure", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "ets the flag to propogate the exception" },
- "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application\/x-java-serialized-object content type. On the producer side the exception will be [...]
- "username": { "kind": "parameter", "displayName": "Username", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the username" },
"eagerCheckContentAvailable": { "kind": "parameter", "displayName": "Eager Check Content Available", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to eager check whether the HTTP requests has content if the content-length header is 0 or not present. This can be turned on in case HTTP clients do not send streamed data." },
"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, "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 consumer will deal with [...]
"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, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
"optionsEnabled": { "kind": "parameter", "displayName": "Options Enabled", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off." },
"traceEnabled": { "kind": "parameter", "displayName": "Trace Enabled", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off." },
- "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
- "clientBuilder": { "kind": "parameter", "displayName": "Client Builder", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.impl.client.HttpClientBuilder", "deprecated": false, "secret": false, "description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint." },
- "clientConnectionManager": { "kind": "parameter", "displayName": "Client Connection Manager", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.conn.HttpClientConnectionManager", "deprecated": false, "secret": false, "description": "To use a custom HttpClientConnectionManager to manage connections" },
- "connectionsPerRoute": { "kind": "parameter", "displayName": "Connections Per Route", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "20", "description": "The maximum number of connections per route." },
- "httpClient": { "kind": "parameter", "displayName": "Http Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.client.HttpClient", "deprecated": false, "secret": false, "description": "Sets a custom HttpClient to be used by the producer" },
- "httpClientConfigurer": { "kind": "parameter", "displayName": "Http Client Configurer", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.http.HttpClientConfigurer", "deprecated": false, "secret": false, "description": "Register a custom configuration strategy for new HttpClient instances created by producers or consumers such as to configure authentication mechanisms etc." },
- "httpClientOptions": { "kind": "parameter", "displayName": "Http Client Options", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "httpClient.", "multiValue": true, "deprecated": false, "secret": false, "description": "To configure the HttpClient using the key\/values from the Map." },
- "httpContext": { "kind": "parameter", "displayName": "Http Context", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.protocol.HttpContext", "deprecated": false, "secret": false, "description": "To use a custom HttpContext instance" },
- "mapHttpMessageBody": { "kind": "parameter", "displayName": "Map Http Message Body", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping." },
- "mapHttpMessageFormUrlEncodedBody": { "kind": "parameter", "displayName": "Map Http Message Form Url Encoded Body", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping." },
- "mapHttpMessageHeaders": { "kind": "parameter", "displayName": "Map Http Message Headers", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping." },
- "maxTotalConnections": { "kind": "parameter", "displayName": "Max Total Connections", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "200", "description": "The maximum number of connections." },
- "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
- "useSystemProperties": { "kind": "parameter", "displayName": "Use System Properties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "To use System Properties as fallback for configuration" },
- "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different [...]
- "x509HostnameVerifier": { "kind": "parameter", "displayName": "X509 Hostname Verifier", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "secret": false, "description": "To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier" },
"bridgeEndpoint": { "kind": "parameter", "displayName": "Bridge Endpoint", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response [...]
"clearExpiredCookies": { "kind": "parameter", "displayName": "Clear Expired Cookies", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired." },
"connectionClose": { "kind": "parameter", "displayName": "Connection Close", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false." },
@@ -103,6 +88,20 @@
"deleteWithBody": { "kind": "parameter", "displayName": "Delete With Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body." },
"getWithBody": { "kind": "parameter", "displayName": "Get With Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body." },
"okStatusCodeRange": { "kind": "parameter", "displayName": "Ok Status Code Range", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "200-299", "description": "The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single num [...]
+ "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
+ "clientBuilder": { "kind": "parameter", "displayName": "Client Builder", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.impl.client.HttpClientBuilder", "deprecated": false, "secret": false, "description": "Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint." },
+ "clientConnectionManager": { "kind": "parameter", "displayName": "Client Connection Manager", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.conn.HttpClientConnectionManager", "deprecated": false, "secret": false, "description": "To use a custom HttpClientConnectionManager to manage connections" },
+ "connectionsPerRoute": { "kind": "parameter", "displayName": "Connections Per Route", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "20", "description": "The maximum number of connections per route." },
+ "httpClient": { "kind": "parameter", "displayName": "Http Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.client.HttpClient", "deprecated": false, "secret": false, "description": "Sets a custom HttpClient to be used by the producer" },
+ "httpClientConfigurer": { "kind": "parameter", "displayName": "Http Client Configurer", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.http.HttpClientConfigurer", "deprecated": false, "secret": false, "description": "Register a custom configuration strategy for new HttpClient instances created by producers or consumers such as to configure authentication mechanisms etc." },
+ "httpClientOptions": { "kind": "parameter", "displayName": "Http Client Options", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "httpClient.", "multiValue": true, "deprecated": false, "secret": false, "description": "To configure the HttpClient using the key\/values from the Map." },
+ "httpContext": { "kind": "parameter", "displayName": "Http Context", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.http.protocol.HttpContext", "deprecated": false, "secret": false, "description": "To use a custom HttpContext instance" },
+ "mapHttpMessageBody": { "kind": "parameter", "displayName": "Map Http Message Body", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping." },
+ "mapHttpMessageFormUrlEncodedBody": { "kind": "parameter", "displayName": "Map Http Message Form Url Encoded Body", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping." },
+ "mapHttpMessageHeaders": { "kind": "parameter", "displayName": "Map Http Message Headers", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping." },
+ "maxTotalConnections": { "kind": "parameter", "displayName": "Max Total Connections", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "200", "description": "The maximum number of connections." },
+ "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+ "useSystemProperties": { "kind": "parameter", "displayName": "Use System Properties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "To use System Properties as fallback for configuration" },
"proxyAuthDomain": { "kind": "parameter", "displayName": "Proxy Auth Domain", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication domain to use with NTML" },
"proxyAuthHost": { "kind": "parameter", "displayName": "Proxy Auth Host", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Proxy authentication host" },
"proxyAuthMethod": { "kind": "parameter", "displayName": "Proxy Auth Method", "group": "proxy", "label": "producer,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "secret": false, "description": "Proxy authentication method to use" },
@@ -118,6 +117,8 @@
"authMethod": { "kind": "parameter", "displayName": "Auth Method", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Authentication methods allowed to use as a comma separated list of values Basic, Digest or NTLM." },
"authMethodPriority": { "kind": "parameter", "displayName": "Auth Method Priority", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "Basic", "Digest", "NTLM" ], "deprecated": false, "secret": false, "description": "Which authentication method to prioritize to use, either as Basic, Digest or NTLM." },
"authPassword": { "kind": "parameter", "displayName": "Auth Password", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Authentication password" },
- "authUsername": { "kind": "parameter", "displayName": "Auth Username", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Authentication username" }
+ "authUsername": { "kind": "parameter", "displayName": "Auth Username", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Authentication username" },
+ "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent. If you need to use 2 or more different [...]
+ "x509HostnameVerifier": { "kind": "parameter", "displayName": "X509 Hostname Verifier", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "secret": false, "description": "To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier" }
}
}
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json
index cb2d6b5..8f7c11c 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json
@@ -26,7 +26,7 @@
"servletName": { "kind": "property", "displayName": "Servlet Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "CamelServlet", "description": "Default name of servlet to use. The default name is CamelServlet." },
"attachmentMultipartBinding": { "kind": "property", "displayName": "Attachment Multipart Binding", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to automatic bind multipart\/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together. Remove di [...]
"fileNameExtWhitelist": { "kind": "property", "displayName": "File Name Ext Whitelist", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml." },
- "httpRegistry": { "kind": "property", "displayName": "Http Registry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.servlet.HttpRegistry", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.component.servlet.HttpRegistry." },
+ "httpRegistry": { "kind": "property", "displayName": "Http Registry", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.HttpRegistry", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.component.servlet.HttpRegistry." },
"allowJavaSerializedObject": { "kind": "property", "displayName": "Allow Java Serialized Object", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incomin [...]
"basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
"httpBinding": { "kind": "property", "displayName": "Http Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.HttpBinding", "deprecated": false, "secret": false, "description": "To use a custom HttpBinding to control the mapping between Camel message and HttpClient." },
diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index a6c3666..7184f1e 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -792,7 +792,7 @@ Number of Camel components: 330 in 263 JAR artifacts (1 deprecated)
`rest-swagger:specificationUri#operationId` | 2.19 | Configure REST producers based on a Swagger (OpenAPI) specification document delegating to a component implementing the RestProducerFactory interface.
| link:https://camel.apache.org/components/latest/resteasy-component.html[Resteasy] (camel-resteasy-starter) +
-`resteasy:contextPath` | 3.3 | Defines the Resteasy Endpoint.
+`resteasy:contextPath` | 3.4 | Defines the Resteasy Endpoint.
| link:https://camel.apache.org/components/latest/robotframework-component.html[Robot Framework] (camel-robotframework-starter) +
`robotframework:resourceUri` | 3.0 | Pass camel exchanges to acceptence test written in Robot DSL.
diff --git a/components-starter/camel-atmosphere-websocket-starter/src/main/docs/atmosphere-websocket-starter.adoc b/components-starter/camel-atmosphere-websocket-starter/src/main/docs/atmosphere-websocket-starter.adoc
index aa92426..8b33d94 100644
--- a/components-starter/camel-atmosphere-websocket-starter/src/main/docs/atmosphere-websocket-starter.adoc
+++ b/components-starter/camel-atmosphere-websocket-starter/src/main/docs/atmosphere-websocket-starter.adoc
@@ -33,9 +33,8 @@ The component supports 12 options, which are listed below.
| *camel.component.atmosphere-websocket.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String
| *camel.component.atmosphere-websocket.http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.http.common.HttpBinding type. | | String
| *camel.component.atmosphere-websocket.http-configuration* | To use the shared HttpConfiguration as base configuration. The option is a org.apache.camel.http.common.HttpConfiguration type. | | String
-| *camel.component.atmosphere-websocket.http-registry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. The option is a org.apache.camel.component.servlet.HttpRegistry type. | | String
+| *camel.component.atmosphere-websocket.http-registry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. The option is a org.apache.camel.http.common.HttpRegistry type. | | String
| *camel.component.atmosphere-websocket.lazy-start-producer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is [...]
| *camel.component.atmosphere-websocket.servlet-name* | Default name of servlet to use. The default name is CamelServlet. | CamelServlet | String
|===
-
// spring-boot-auto-configure options: END
diff --git a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
index 6ed58c0..d0e1fa7 100644
--- a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
+++ b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
@@ -65,7 +65,7 @@ public class WebsocketComponentConfiguration
private String fileNameExtWhitelist;
/**
* To use a custom org.apache.camel.component.servlet.HttpRegistry. The
- * option is a org.apache.camel.component.servlet.HttpRegistry type.
+ * option is a org.apache.camel.http.common.HttpRegistry type.
*/
private String httpRegistry;
/**
diff --git a/components-starter/camel-resteasy-starter/pom.xml b/components-starter/camel-resteasy-starter/pom.xml
index d80d155..643c943 100644
--- a/components-starter/camel-resteasy-starter/pom.xml
+++ b/components-starter/camel-resteasy-starter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>components-starter</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<artifactId>camel-resteasy-starter</artifactId>
<packaging>jar</packaging>
diff --git a/components-starter/camel-resteasy-starter/src/main/docs/resteasy-starter.adoc b/components-starter/camel-resteasy-starter/src/main/docs/resteasy-starter.adoc
index 5febf5b..aceb5c4 100644
--- a/components-starter/camel-resteasy-starter/src/main/docs/resteasy-starter.adoc
+++ b/components-starter/camel-resteasy-starter/src/main/docs/resteasy-starter.adoc
@@ -39,7 +39,7 @@ The component supports 23 options, which are listed below.
| *camel.component.resteasy.http-client-configurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. The option is a org.apache.camel.component.http.HttpClientConfigurer type. | | String
| *camel.component.resteasy.http-configuration* | To use the shared HttpConfiguration as base configuration. The option is a org.apache.camel.http.common.HttpConfiguration type. | | String
| *camel.component.resteasy.http-context* | To use a custom org.apache.http.protocol.HttpContext when executing requests. The option is a org.apache.http.protocol.HttpContext type. | | String
-| *camel.component.resteasy.http-registry* | Sets httpRegistry which can be externalized to be used by camel. The option is a org.apache.camel.component.resteasy.HttpRegistry type. | | String
+| *camel.component.resteasy.http-registry* | Sets httpRegistry which can be externalized to be used by camel. The option is a org.apache.camel.http.common.HttpRegistry type. | | String
| *camel.component.resteasy.lazy-start-producer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
| *camel.component.resteasy.max-total-connections* | The maximum number of connections. | 200 | Integer
| *camel.component.resteasy.proxy-consumers-classes* | Sets the proxy class for consumer enpoints | | String
@@ -48,6 +48,4 @@ The component supports 23 options, which are listed below.
| *camel.component.resteasy.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
| *camel.component.resteasy.x509-hostname-verifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier. The option is a javax.net.ssl.HostnameVerifier type. | | String
|===
-
-
// spring-boot-auto-configure options: END
diff --git a/components-starter/camel-resteasy-starter/src/main/java/org/apache/camel/component/resteasy/springboot/ResteasyComponentConfiguration.java b/components-starter/camel-resteasy-starter/src/main/java/org/apache/camel/component/resteasy/springboot/ResteasyComponentConfiguration.java
index 354ba48..c0c2354 100644
--- a/components-starter/camel-resteasy-starter/src/main/java/org/apache/camel/component/resteasy/springboot/ResteasyComponentConfiguration.java
+++ b/components-starter/camel-resteasy-starter/src/main/java/org/apache/camel/component/resteasy/springboot/ResteasyComponentConfiguration.java
@@ -37,6 +37,15 @@ public class ResteasyComponentConfiguration
*/
private Boolean enabled;
/**
+ * Sets httpRegistry which can be externalized to be used by camel. The
+ * option is a org.apache.camel.http.common.HttpRegistry type.
+ */
+ private String httpRegistry;
+ /**
+ * Sets the proxy class for consumer enpoints
+ */
+ private String proxyConsumersClasses;
+ /**
* 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 message and
@@ -46,14 +55,25 @@ public class ResteasyComponentConfiguration
*/
private Boolean bridgeErrorHandler = false;
/**
- * Sets httpRegistry which can be externalized to be used by camel. The
- * option is a org.apache.camel.component.resteasy.HttpRegistry type.
+ * To use a custom org.apache.http.client.CookieStore. By default the
+ * org.apache.http.impl.client.BasicCookieStore is used which is an
+ * in-memory only cookie store. Notice if bridgeEndpoint=true then the
+ * cookie store is forced to be a noop cookie store as cookie shouldn't be
+ * stored as we are just bridging (eg acting as a proxy). The option is a
+ * org.apache.http.client.CookieStore type.
*/
- private String httpRegistry;
+ private String cookieStore;
/**
- * Sets the proxy class for consumer enpoints
+ * 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 starting
+ * and cause the route to fail being started. By deferring this startup to
+ * be lazy then the startup failure can be handled during routing messages
+ * via Camel's routing error handlers. Beware that when the first message is
+ * processed then creating and starting the producer may take a little time
+ * and prolong the total processing time of the processing.
*/
- private String proxyConsumersClasses;
+ private Boolean lazyStartProducer = false;
/**
* Whether to allow java serialization when a request uses
* context-type=application/x-java-serialized-object. This is by default
@@ -155,34 +175,6 @@ public class ResteasyComponentConfiguration
* default).
*/
private Integer socketTimeout = -1;
- /**
- * To use a custom org.apache.http.client.CookieStore. By default the
- * org.apache.http.impl.client.BasicCookieStore is used which is an
- * in-memory only cookie store. Notice if bridgeEndpoint=true then the
- * cookie store is forced to be a noop cookie store as cookie shouldn't be
- * stored as we are just bridging (eg acting as a proxy). The option is a
- * org.apache.http.client.CookieStore type.
- */
- private String cookieStore;
- /**
- * 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 starting
- * and cause the route to fail being started. By deferring this startup to
- * be lazy then the startup failure can be handled during routing messages
- * via Camel's routing error handlers. Beware that when the first message is
- * processed then creating and starting the producer may take a little time
- * and prolong the total processing time of the processing.
- */
- private Boolean lazyStartProducer = false;
-
- public Boolean getBridgeErrorHandler() {
- return bridgeErrorHandler;
- }
-
- public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
- this.bridgeErrorHandler = bridgeErrorHandler;
- }
public String getHttpRegistry() {
return httpRegistry;
@@ -200,6 +192,30 @@ public class ResteasyComponentConfiguration
this.proxyConsumersClasses = proxyConsumersClasses;
}
+ public Boolean getBridgeErrorHandler() {
+ return bridgeErrorHandler;
+ }
+
+ public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
+ this.bridgeErrorHandler = bridgeErrorHandler;
+ }
+
+ public String getCookieStore() {
+ return cookieStore;
+ }
+
+ public void setCookieStore(String cookieStore) {
+ this.cookieStore = cookieStore;
+ }
+
+ public Boolean getLazyStartProducer() {
+ return lazyStartProducer;
+ }
+
+ public void setLazyStartProducer(Boolean lazyStartProducer) {
+ this.lazyStartProducer = lazyStartProducer;
+ }
+
public Boolean getAllowJavaSerializedObject() {
return allowJavaSerializedObject;
}
@@ -336,20 +352,4 @@ public class ResteasyComponentConfiguration
public void setSocketTimeout(Integer socketTimeout) {
this.socketTimeout = socketTimeout;
}
-
- public String getCookieStore() {
- return cookieStore;
- }
-
- public void setCookieStore(String cookieStore) {
- this.cookieStore = cookieStore;
- }
-
- public Boolean getLazyStartProducer() {
- return lazyStartProducer;
- }
-
- public void setLazyStartProducer(Boolean lazyStartProducer) {
- this.lazyStartProducer = lazyStartProducer;
- }
}
\ No newline at end of file
diff --git a/components-starter/camel-servlet-starter/src/main/docs/servlet-starter.adoc b/components-starter/camel-servlet-starter/src/main/docs/servlet-starter.adoc
index cb07c6e..c912a68 100644
--- a/components-starter/camel-servlet-starter/src/main/docs/servlet-starter.adoc
+++ b/components-starter/camel-servlet-starter/src/main/docs/servlet-starter.adoc
@@ -33,11 +33,10 @@ The component supports 14 options, which are listed below.
| *camel.component.servlet.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String
| *camel.component.servlet.http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.http.common.HttpBinding type. | | String
| *camel.component.servlet.http-configuration* | To use the shared HttpConfiguration as base configuration. The option is a org.apache.camel.http.common.HttpConfiguration type. | | String
-| *camel.component.servlet.http-registry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. The option is a org.apache.camel.component.servlet.HttpRegistry type. | | String
+| *camel.component.servlet.http-registry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. The option is a org.apache.camel.http.common.HttpRegistry type. | | String
| *camel.component.servlet.mapping.context-path* | Context path used by the servlet component for automatic mapping. | /camel/* | String
| *camel.component.servlet.mapping.enabled* | Enables the automatic mapping of the servlet component into the Spring web context. | true | Boolean
| *camel.component.servlet.mapping.servlet-name* | The name of the Camel servlet. | CamelServlet | String
| *camel.component.servlet.servlet-name* | Default name of servlet to use. The default name is CamelServlet. | CamelServlet | String
|===
-
// spring-boot-auto-configure options: END
diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
index 398f971..e591370 100644
--- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
+++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
@@ -65,7 +65,7 @@ public class ServletComponentConfiguration
private String fileNameExtWhitelist;
/**
* To use a custom org.apache.camel.component.servlet.HttpRegistry. The
- * option is a org.apache.camel.component.servlet.HttpRegistry type.
+ * option is a org.apache.camel.http.common.HttpRegistry type.
*/
private String httpRegistry;
/**
diff --git a/docs/modules/ROOT/pages/atmosphere-websocket-starter.adoc b/docs/modules/ROOT/pages/atmosphere-websocket-starter.adoc
index aa92426..8b33d94 100644
--- a/docs/modules/ROOT/pages/atmosphere-websocket-starter.adoc
+++ b/docs/modules/ROOT/pages/atmosphere-websocket-starter.adoc
@@ -33,9 +33,8 @@ The component supports 12 options, which are listed below.
| *camel.component.atmosphere-websocket.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String
| *camel.component.atmosphere-websocket.http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.http.common.HttpBinding type. | | String
| *camel.component.atmosphere-websocket.http-configuration* | To use the shared HttpConfiguration as base configuration. The option is a org.apache.camel.http.common.HttpConfiguration type. | | String
-| *camel.component.atmosphere-websocket.http-registry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. The option is a org.apache.camel.component.servlet.HttpRegistry type. | | String
+| *camel.component.atmosphere-websocket.http-registry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. The option is a org.apache.camel.http.common.HttpRegistry type. | | String
| *camel.component.atmosphere-websocket.lazy-start-producer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is [...]
| *camel.component.atmosphere-websocket.servlet-name* | Default name of servlet to use. The default name is CamelServlet. | CamelServlet | String
|===
-
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc
index a6c3666..7184f1e 100644
--- a/docs/modules/ROOT/pages/list.adoc
+++ b/docs/modules/ROOT/pages/list.adoc
@@ -792,7 +792,7 @@ Number of Camel components: 330 in 263 JAR artifacts (1 deprecated)
`rest-swagger:specificationUri#operationId` | 2.19 | Configure REST producers based on a Swagger (OpenAPI) specification document delegating to a component implementing the RestProducerFactory interface.
| link:https://camel.apache.org/components/latest/resteasy-component.html[Resteasy] (camel-resteasy-starter) +
-`resteasy:contextPath` | 3.3 | Defines the Resteasy Endpoint.
+`resteasy:contextPath` | 3.4 | Defines the Resteasy Endpoint.
| link:https://camel.apache.org/components/latest/robotframework-component.html[Robot Framework] (camel-robotframework-starter) +
`robotframework:resourceUri` | 3.0 | Pass camel exchanges to acceptence test written in Robot DSL.
diff --git a/docs/modules/ROOT/pages/resteasy-starter.adoc b/docs/modules/ROOT/pages/resteasy-starter.adoc
index 5febf5b..aceb5c4 100644
--- a/docs/modules/ROOT/pages/resteasy-starter.adoc
+++ b/docs/modules/ROOT/pages/resteasy-starter.adoc
@@ -39,7 +39,7 @@ The component supports 23 options, which are listed below.
| *camel.component.resteasy.http-client-configurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. The option is a org.apache.camel.component.http.HttpClientConfigurer type. | | String
| *camel.component.resteasy.http-configuration* | To use the shared HttpConfiguration as base configuration. The option is a org.apache.camel.http.common.HttpConfiguration type. | | String
| *camel.component.resteasy.http-context* | To use a custom org.apache.http.protocol.HttpContext when executing requests. The option is a org.apache.http.protocol.HttpContext type. | | String
-| *camel.component.resteasy.http-registry* | Sets httpRegistry which can be externalized to be used by camel. The option is a org.apache.camel.component.resteasy.HttpRegistry type. | | String
+| *camel.component.resteasy.http-registry* | Sets httpRegistry which can be externalized to be used by camel. The option is a org.apache.camel.http.common.HttpRegistry type. | | String
| *camel.component.resteasy.lazy-start-producer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
| *camel.component.resteasy.max-total-connections* | The maximum number of connections. | 200 | Integer
| *camel.component.resteasy.proxy-consumers-classes* | Sets the proxy class for consumer enpoints | | String
@@ -48,6 +48,4 @@ The component supports 23 options, which are listed below.
| *camel.component.resteasy.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
| *camel.component.resteasy.x509-hostname-verifier* | To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier. The option is a javax.net.ssl.HostnameVerifier type. | | String
|===
-
-
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/servlet-starter.adoc b/docs/modules/ROOT/pages/servlet-starter.adoc
index cb07c6e..c912a68 100644
--- a/docs/modules/ROOT/pages/servlet-starter.adoc
+++ b/docs/modules/ROOT/pages/servlet-starter.adoc
@@ -33,11 +33,10 @@ The component supports 14 options, which are listed below.
| *camel.component.servlet.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String
| *camel.component.servlet.http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.http.common.HttpBinding type. | | String
| *camel.component.servlet.http-configuration* | To use the shared HttpConfiguration as base configuration. The option is a org.apache.camel.http.common.HttpConfiguration type. | | String
-| *camel.component.servlet.http-registry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. The option is a org.apache.camel.component.servlet.HttpRegistry type. | | String
+| *camel.component.servlet.http-registry* | To use a custom org.apache.camel.component.servlet.HttpRegistry. The option is a org.apache.camel.http.common.HttpRegistry type. | | String
| *camel.component.servlet.mapping.context-path* | Context path used by the servlet component for automatic mapping. | /camel/* | String
| *camel.component.servlet.mapping.enabled* | Enables the automatic mapping of the servlet component into the Spring web context. | true | Boolean
| *camel.component.servlet.mapping.servlet-name* | The name of the Camel servlet. | CamelServlet | String
| *camel.component.servlet.servlet-name* | Default name of servlet to use. The default name is CamelServlet. | CamelServlet | String
|===
-
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/spring-boot.adoc b/docs/modules/ROOT/pages/spring-boot.adoc
index 6e77476..4703c47 100644
--- a/docs/modules/ROOT/pages/spring-boot.adoc
+++ b/docs/modules/ROOT/pages/spring-boot.adoc
@@ -234,11 +234,6 @@ The component supports 145 options, which are listed below.
| *camel.supervising.controller.enabled* | Global option to enable/disable this org.apache.camel.spi.RouteController, default is false. | false | Boolean
| *camel.supervising.controller.initial-delay* | Set the amount of time the route controller should wait before to start the routes after the camel context is started or after the route is initialized if the route is created after the camel context is started. | | String
| *camel.supervising.controller.routes* | Routes configuration. | | Map
-| *management.endpoint.camelroutecontroller.cache.time-to-live* | Maximum time that a response can be cached. | 0ms | Duration
-| *management.endpoint.camelroutecontroller.enabled* | To turn on or off information about Camel Route Controller via actuator endpoint. | true | Boolean
-| *management.endpoint.camelroutes.cache.time-to-live* | Maximum time that a response can be cached. | 0ms | Duration
-| *management.endpoint.camelroutes.enabled* | To turn on or off information about Camel Routes via actuator endpoint. | true | Boolean
-| *management.endpoint.camelroutes.read-only* | Whether Camel Routes actuator is in read-only mode. If not in read-only mode then operations to start/stop routes would be enabled. | true | Boolean
| *management.info.camel.enabled* | Whether to enable Camel info. | true | Boolean
| *management.info.camel.verbose* | Global option to enable/disable health bean camel version info, default is true. | true | Boolean
|===
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 55818f9..a8c3c8a 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -3297,7 +3297,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-resteasy</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -4566,7 +4566,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>1.14.1</version>
+ <version>1.14.2</version>
</dependency>
<dependency>
<groupId>rhino</groupId>