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 f439ecf3f8c camel-http: Renamed class that is not only basic auth
f439ecf3f8c is described below
commit f439ecf3f8c79a201d2d451746c101b88981be4c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat May 24 08:41:01 2025 +0200
camel-http: Renamed class that is not only basic auth
---
...er.java => DefaultAuthenticationHttpClientConfigurer.java} | 7 ++++---
.../java/org/apache/camel/component/http/HttpComponent.java | 4 ++--
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_13.adoc | 11 +++++++++++
.../modules/ROOT/pages/camel-4x-upgrade-guide.adoc | 1 +
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git
a/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultAuthenticationHttpClientConfigurer.java
similarity index 92%
rename from
components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
rename to
components/camel-http/src/main/java/org/apache/camel/component/http/DefaultAuthenticationHttpClientConfigurer.java
index 6a719327ea8..8bcad925eb6 100644
---
a/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
+++
b/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultAuthenticationHttpClientConfigurer.java
@@ -32,7 +32,8 @@ import org.apache.hc.client5.http.impl.auth.NTLMSchemeFactory;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.apache.hc.core5.http.config.RegistryBuilder;
-public class BasicAuthenticationHttpClientConfigurer implements
HttpClientConfigurer {
+public class DefaultAuthenticationHttpClientConfigurer implements
HttpClientConfigurer {
+
private final String username;
private final char[] password;
private final String domain;
@@ -40,8 +41,8 @@ public class BasicAuthenticationHttpClientConfigurer
implements HttpClientConfig
private final String bearerToken;
private final HttpCredentialsHelper credentialsHelper;
- public BasicAuthenticationHttpClientConfigurer(String user, String pwd,
String domain, String host, String bearerToken,
- HttpCredentialsHelper
credentialsHelper) {
+ public DefaultAuthenticationHttpClientConfigurer(String user, String pwd,
String domain, String host, String bearerToken,
+ HttpCredentialsHelper
credentialsHelper) {
this.username = user;
this.password = pwd == null ? new char[0] : pwd.toCharArray();
this.domain = domain;
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 abd4f7d6ac9..10770aa5dda 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
@@ -287,13 +287,13 @@ public class HttpComponent extends HttpCommonComponent
implements RestProducerFa
String authHost = getParameter(parameters, "authHost",
String.class);
return CompositeHttpConfigurer.combineConfigurers(configurer,
- new BasicAuthenticationHttpClientConfigurer(
+ new DefaultAuthenticationHttpClientConfigurer(
authUsername, authPassword, authDomain, authHost,
null, credentialsProvider));
} else if (this.httpConfiguration != null) {
if
("basic".equalsIgnoreCase(this.httpConfiguration.getAuthMethod())
||
"bearer".equalsIgnoreCase(this.httpConfiguration.getAuthMethod())) {
return CompositeHttpConfigurer.combineConfigurers(configurer,
- new BasicAuthenticationHttpClientConfigurer(
+ new DefaultAuthenticationHttpClientConfigurer(
this.httpConfiguration.getAuthUsername(),
this.httpConfiguration.getAuthPassword(),
this.httpConfiguration.getAuthDomain(),
this.httpConfiguration.getAuthHost(),
this.httpConfiguration.getAuthBearerToken(),
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_13.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_13.adoc
new file mode 100644
index 00000000000..04865c0397c
--- /dev/null
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_13.adoc
@@ -0,0 +1,11 @@
+= Apache Camel 4.x Upgrade Guide
+
+This document is for helping you upgrade your Apache Camel application
+from Camel 4.x to 4.y. For example, if you are upgrading Camel 4.0 to 4.2,
then you should follow the guides
+from both 4.0 to 4.1 and 4.1 to 4.2.
+
+== Upgrading Camel 4.12 to 4.13
+
+=== camel-http
+
+Renamed class
`org.apache.camel.component.http.BasicAuthenticationHttpClientConfigurer` to
`org.apache.camel.component.http.DefaultAuthenticationHttpClientConfigurer`.
diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc
index 26735f5ed91..38db82e5ba2 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc
@@ -21,3 +21,4 @@ You can find the upgrade guide for each release in the
following pages:
- xref:camel-4x-upgrade-guide-4_10.adoc[Upgrade guide 4.9 -> 4.10]
- xref:camel-4x-upgrade-guide-4_11.adoc[Upgrade guide 4.10 -> 4.11]
- xref:camel-4x-upgrade-guide-4_12.adoc[Upgrade guide 4.11 -> 4.12]
+- xref:camel-4x-upgrade-guide-4_13.adoc[Upgrade guide 4.12 -> 4.13]
