You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/09/25 05:45:23 UTC
(camel) branch main updated: camel-netty-http: Fix catalog to include proxy as protocol
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 9d88f5eaf69 camel-netty-http: Fix catalog to include proxy as protocol
9d88f5eaf69 is described below
commit 9d88f5eaf693a39fd129bd00ef9d2546aaf0a460
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Sep 25 07:45:08 2024 +0200
camel-netty-http: Fix catalog to include proxy as protocol
---
.../org/apache/camel/catalog/components/netty-http.json | 2 +-
.../org/apache/camel/component/netty/http/netty-http.json | 2 +-
.../camel/component/netty/http/NettyHttpConfiguration.java | 4 ++--
.../camel/builder/endpoint/StaticEndpointBuilders.java | 10 ++++------
.../endpoint/dsl/NettyHttpEndpointBuilderFactory.java | 12 ++++++------
5 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty-http.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty-http.json
index 798083342db..53007cab798 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty-http.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty-http.json
@@ -132,7 +132,7 @@
"CamelNettyRequestTimeout": { "index": 22, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The read timeout.", "constantName": "org.apache.camel.component.netty.NettyConstants#NETTY_REQUEST_TIMEOUT" }
},
"properties": {
- "protocol": { "index": 0, "kind": "path", "displayName": "Protocol", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "The protocol to use which is either http, https or proxy - a consume [...]
+ "protocol": { "index": 0, "kind": "path", "displayName": "Protocol", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https", "proxy" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "The protocol to use which is either http, https or proxy (c [...]
"host": { "index": 1, "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.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "The local hostname such as localhost, or 0.0.0.0 when being a consumer. The remote HTTP server hostname w [...]
"port": { "index": 2, "kind": "path", "displayName": "Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "The host port number" },
"path": { "index": 3, "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.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Resource path" },
diff --git a/components/camel-netty-http/src/generated/resources/META-INF/org/apache/camel/component/netty/http/netty-http.json b/components/camel-netty-http/src/generated/resources/META-INF/org/apache/camel/component/netty/http/netty-http.json
index 798083342db..53007cab798 100644
--- a/components/camel-netty-http/src/generated/resources/META-INF/org/apache/camel/component/netty/http/netty-http.json
+++ b/components/camel-netty-http/src/generated/resources/META-INF/org/apache/camel/component/netty/http/netty-http.json
@@ -132,7 +132,7 @@
"CamelNettyRequestTimeout": { "index": 22, "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "Long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The read timeout.", "constantName": "org.apache.camel.component.netty.NettyConstants#NETTY_REQUEST_TIMEOUT" }
},
"properties": {
- "protocol": { "index": 0, "kind": "path", "displayName": "Protocol", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "The protocol to use which is either http, https or proxy - a consume [...]
+ "protocol": { "index": 0, "kind": "path", "displayName": "Protocol", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "http", "https", "proxy" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "The protocol to use which is either http, https or proxy (c [...]
"host": { "index": 1, "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.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "The local hostname such as localhost, or 0.0.0.0 when being a consumer. The remote HTTP server hostname w [...]
"port": { "index": 2, "kind": "path", "displayName": "Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "The host port number" },
"path": { "index": 3, "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.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Resource path" },
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
index 0c052ce9f76..9dc4b31e59a 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
@@ -33,7 +33,7 @@ import org.apache.camel.spi.UriPath;
@Configurer
public class NettyHttpConfiguration extends NettyConfiguration {
- @UriPath(enums = "http,https")
+ @UriPath(enums = "http,https,proxy")
@Metadata(required = true)
private String protocol;
@UriPath
@@ -109,7 +109,7 @@ public class NettyHttpConfiguration extends NettyConfiguration {
}
/**
- * The protocol to use which is either http, https or proxy - a consumer only option.
+ * The protocol to use which is either http, https or proxy (consumer only).
*/
@Override
public void setProtocol(String protocol) {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 558aa36a19b..550d48e993b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -10619,9 +10619,8 @@ public class StaticEndpointBuilders {
* Syntax: <code>netty-http:protocol://host:port/path</code>
*
* Path parameter: protocol (required)
- * The protocol to use which is either http, https or proxy - a consumer
- * only option.
- * There are 2 enums and the value can be one of: http, https
+ * The protocol to use which is either http, https or proxy (consumer only).
+ * There are 3 enums and the value can be one of: http, https, proxy
*
* Path parameter: host (required)
* The local hostname such as localhost, or 0.0.0.0 when being a consumer.
@@ -10650,9 +10649,8 @@ public class StaticEndpointBuilders {
* Syntax: <code>netty-http:protocol://host:port/path</code>
*
* Path parameter: protocol (required)
- * The protocol to use which is either http, https or proxy - a consumer
- * only option.
- * There are 2 enums and the value can be one of: http, https
+ * The protocol to use which is either http, https or proxy (consumer only).
+ * There are 3 enums and the value can be one of: http, https, proxy
*
* Path parameter: host (required)
* The local hostname such as localhost, or 0.0.0.0 when being a consumer.
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
index e50fd1b2ff6..712b531a7fa 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
@@ -5231,9 +5231,9 @@ public interface NettyHttpEndpointBuilderFactory {
* Syntax: <code>netty-http:protocol://host:port/path</code>
*
* Path parameter: protocol (required)
- * The protocol to use which is either http, https or proxy - a consumer
- * only option.
- * There are 2 enums and the value can be one of: http, https
+ * The protocol to use which is either http, https or proxy (consumer
+ * only).
+ * There are 3 enums and the value can be one of: http, https, proxy
*
* Path parameter: host (required)
* The local hostname such as localhost, or 0.0.0.0 when being a
@@ -5262,9 +5262,9 @@ public interface NettyHttpEndpointBuilderFactory {
* Syntax: <code>netty-http:protocol://host:port/path</code>
*
* Path parameter: protocol (required)
- * The protocol to use which is either http, https or proxy - a consumer
- * only option.
- * There are 2 enums and the value can be one of: http, https
+ * The protocol to use which is either http, https or proxy (consumer
+ * only).
+ * There are 3 enums and the value can be one of: http, https, proxy
*
* Path parameter: host (required)
* The local hostname such as localhost, or 0.0.0.0 when being a