This is an automated email from the ASF dual-hosted git repository.
jeremyross 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 4bf4074d9e0 camel-http: Make proxyAuthScheme configurable at global
level. (#8685)
4bf4074d9e0 is described below
commit 4bf4074d9e0a091f9abd6ee08785258a8fef26d1
Author: Jeremy Ross <[email protected]>
AuthorDate: Mon Nov 7 16:56:03 2022 -0600
camel-http: Make proxyAuthScheme configurable at global level. (#8685)
---
.../org/apache/camel/component/http/HttpComponentConfigurer.java | 6 ++++++
.../generated/resources/org/apache/camel/component/http/http.json | 1 +
.../generated/resources/org/apache/camel/component/http/https.json | 1 +
.../main/java/org/apache/camel/component/http/HttpComponent.java | 1 +
4 files changed, 9 insertions(+)
diff --git
a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpComponentConfigurer.java
b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpComponentConfigurer.java
index 57df16e623f..3caf3f0eed8 100644
---
a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpComponentConfigurer.java
+++
b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpComponentConfigurer.java
@@ -79,6 +79,8 @@ public class HttpComponentConfigurer extends
PropertyConfigurerSupport implement
case "proxyAuthPassword":
target.setProxyAuthPassword(property(camelContext, java.lang.String.class,
value)); return true;
case "proxyauthport":
case "proxyAuthPort": target.setProxyAuthPort(property(camelContext,
java.lang.Integer.class, value)); return true;
+ case "proxyauthscheme":
+ case "proxyAuthScheme":
target.setProxyAuthScheme(property(camelContext, java.lang.String.class,
value)); return true;
case "proxyauthusername":
case "proxyAuthUsername":
target.setProxyAuthUsername(property(camelContext, java.lang.String.class,
value)); return true;
case "redirecthandlingdisabled":
@@ -162,6 +164,8 @@ public class HttpComponentConfigurer extends
PropertyConfigurerSupport implement
case "proxyAuthPassword": return java.lang.String.class;
case "proxyauthport":
case "proxyAuthPort": return java.lang.Integer.class;
+ case "proxyauthscheme":
+ case "proxyAuthScheme": return java.lang.String.class;
case "proxyauthusername":
case "proxyAuthUsername": return java.lang.String.class;
case "redirecthandlingdisabled":
@@ -246,6 +250,8 @@ public class HttpComponentConfigurer extends
PropertyConfigurerSupport implement
case "proxyAuthPassword": return target.getProxyAuthPassword();
case "proxyauthport":
case "proxyAuthPort": return target.getProxyAuthPort();
+ case "proxyauthscheme":
+ case "proxyAuthScheme": return target.getProxyAuthScheme();
case "proxyauthusername":
case "proxyAuthUsername": return target.getProxyAuthUsername();
case "redirecthandlingdisabled":
diff --git
a/components/camel-http/src/generated/resources/org/apache/camel/component/http/http.json
b/components/camel-http/src/generated/resources/org/apache/camel/component/http/http.json
index d87bcaa6f42..89519a465c0 100644
---
a/components/camel-http/src/generated/resources/org/apache/camel/component/http/http.json
+++
b/components/camel-http/src/generated/resources/org/apache/camel/component/http/http.json
@@ -56,6 +56,7 @@
"proxyAuthNtHost": { "kind": "property", "displayName": "Proxy Auth Nt
Host", "group": "proxy", "label": "producer,proxy", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Proxy authentication domain
(workstation name) to use with NTML" },
"proxyAuthPassword": { "kind": "property", "displayName": "Proxy Auth
Password", "group": "proxy", "label": "producer,proxy", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "Proxy authentication
password" },
"proxyAuthPort": { "kind": "property", "displayName": "Proxy Auth Port",
"group": "proxy", "label": "producer,proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "description": "Proxy authentication port" },
+ "proxyAuthScheme": { "kind": "property", "displayName": "Proxy Auth
Scheme", "group": "proxy", "label": "producer,proxy", "required": false,
"type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Proxy
authentication protocol scheme" },
"proxyAuthUsername": { "kind": "property", "displayName": "Proxy Auth
Username", "group": "proxy", "label": "producer,proxy", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "Proxy authentication
username" },
"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. Important: Only one instance of
org.apache.camel.support.jsse.SSLContextParameters is supported per
HttpComponent. If you need to us [...]
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use
Global Ssl Context Parameters", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Enable usage of global SSL context parameters." },
diff --git
a/components/camel-http/src/generated/resources/org/apache/camel/component/http/https.json
b/components/camel-http/src/generated/resources/org/apache/camel/component/http/https.json
index bd710c2eec5..b20f3f06cc7 100644
---
a/components/camel-http/src/generated/resources/org/apache/camel/component/http/https.json
+++
b/components/camel-http/src/generated/resources/org/apache/camel/component/http/https.json
@@ -56,6 +56,7 @@
"proxyAuthNtHost": { "kind": "property", "displayName": "Proxy Auth Nt
Host", "group": "proxy", "label": "producer,proxy", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "Proxy authentication domain
(workstation name) to use with NTML" },
"proxyAuthPassword": { "kind": "property", "displayName": "Proxy Auth
Password", "group": "proxy", "label": "producer,proxy", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "Proxy authentication
password" },
"proxyAuthPort": { "kind": "property", "displayName": "Proxy Auth Port",
"group": "proxy", "label": "producer,proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "description": "Proxy authentication port" },
+ "proxyAuthScheme": { "kind": "property", "displayName": "Proxy Auth
Scheme", "group": "proxy", "label": "producer,proxy", "required": false,
"type": "string", "javaType": "java.lang.String", "enum": [ "http", "https" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Proxy
authentication protocol scheme" },
"proxyAuthUsername": { "kind": "property", "displayName": "Proxy Auth
Username", "group": "proxy", "label": "producer,proxy", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "description": "Proxy authentication
username" },
"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. Important: Only one instance of
org.apache.camel.support.jsse.SSLContextParameters is supported per
HttpComponent. If you need to us [...]
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use
Global Ssl Context Parameters", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Enable usage of global SSL context parameters." },
diff --git
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index 548eb7265c2..10b43c79bdb 100644
---
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
+++
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -123,6 +123,7 @@ public class HttpComponent extends HttpCommonComponent
implements RestProducerFa
protected int socketTimeout = -1;
// proxy
+ @Metadata(label = "producer,proxy", enums = "http,https", description =
"Proxy authentication protocol scheme")
protected String proxyAuthScheme;
@Metadata(label = "producer,proxy", enums = "Basic,Digest,NTLM",
description = "Proxy authentication method to use")
protected String proxyAuthMethod;
