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 3b4063b336c CAMEL-18234: Exception building aws2-sqs route when
certificate valid… (#10837)
3b4063b336c is described below
commit 3b4063b336c469ba0f26de579313ede64a7bb7a1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jul 27 06:16:43 2023 +0200
CAMEL-18234: Exception building aws2-sqs route when certificate valid…
(#10837)
CAMEL-18234: Exception building aws2-sqs route when certificate validation
is disabled and a proxy is configured
---
.../camel/component/aws/cloudtrail/CloudtrailConsumer.java | 3 ++-
.../camel/component/aws/cloudtrail/CloudtrailEndpoint.java | 1 -
.../client/impl/CloudtrailClientIAMOptimizedImpl.java | 7 ++++++-
.../client/impl/CloudtrailClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../cloudtrail/client/impl/CloudtrailClientStandardImpl.java | 7 ++++++-
.../client/impl/SecretsManagerClientIAMOptimized.java | 7 ++++++-
.../client/impl/SecretsManagerClientIAMProfileOptimized.java | 7 ++++++-
.../client/impl/SecretsManagerClientStandardImpl.java | 7 ++++++-
.../aws2/cw/client/impl/Cw2ClientIAMOptimizedImpl.java | 7 ++++++-
.../aws2/cw/client/impl/Cw2ClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../component/aws2/cw/client/impl/Cw2ClientStandardImpl.java | 7 ++++++-
.../aws2/ddb/client/impl/Ddb2ClientIAMOptimizedImpl.java | 7 ++++++-
.../ddb/client/impl/Ddb2ClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../aws2/ddb/client/impl/Ddb2ClientStandardImpl.java | 7 ++++++-
.../camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java | 7 ++++++-
.../client/impl/Ddb2StreamClientIAMOptimizedImpl.java | 7 ++++++-
.../client/impl/Ddb2StreamClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../ddbstream/client/impl/Ddb2StreamClientStandardImpl.java | 7 ++++++-
.../aws2/ec2/client/impl/AWS2EC2ClientIAMOptimizedImpl.java | 7 ++++++-
.../ec2/client/impl/AWS2EC2ClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../aws2/ec2/client/impl/AWS2EC2ClientStandardImpl.java | 7 ++++++-
.../aws2/ecs/client/impl/ECS2ClientIAMOptimizedImpl.java | 7 ++++++-
.../ecs/client/impl/ECS2ClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../aws2/ecs/client/impl/ECS2ClientStandardImpl.java | 7 ++++++-
.../aws2/eks/client/impl/EKS2ClientIAMOptimizedImpl.java | 7 ++++++-
.../eks/client/impl/EKS2ClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../aws2/eks/client/impl/EKS2ClientStandardImpl.java | 7 ++++++-
.../client/impl/EventbridgeClientIAMOptimizedImpl.java | 7 ++++++-
.../client/impl/EventbridgeClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../client/impl/EventbridgeClientStandardImpl.java | 7 ++++++-
.../aws2/iam/client/impl/IAM2ClientOptimizedImpl.java | 7 ++++++-
.../aws2/iam/client/impl/IAM2ClientProfileOptimizedImpl.java | 7 ++++++-
.../aws2/iam/client/impl/IAM2ClientStandardImpl.java | 7 ++++++-
.../client/impl/KinesisFirehoseClientIAMOptimizedImpl.java | 7 ++++++-
.../impl/KinesisFirehoseClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../client/impl/KinesisFirehoseClientStandardImpl.java | 7 ++++++-
.../apache/camel/component/aws2/kinesis/Kinesis2Consumer.java | 3 ++-
.../apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java | 1 -
.../client/impl/KinesisAsyncClientIAMOptimizedImpl.java | 8 ++++++--
.../impl/KinesisAsyncClientIAMProfileOptimizedImpl.java | 8 ++++++--
.../kinesis/client/impl/KinesisAsyncClientStandardImpl.java | 8 ++++++--
.../kinesis/client/impl/KinesisClientIAMOptimizedImpl.java | 7 ++++++-
.../client/impl/KinesisClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../aws2/kinesis/client/impl/KinesisClientStandardImpl.java | 7 ++++++-
.../aws2/kms/client/impl/KMS2ClientOptimizedImpl.java | 7 ++++++-
.../aws2/kms/client/impl/KMS2ClientProfileOptimizedImpl.java | 7 ++++++-
.../aws2/kms/client/impl/KMS2ClientStandardImpl.java | 7 ++++++-
.../client/impl/Lambda2ClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../aws2/lambda/client/impl/Lambda2ClientOptimizedImpl.java | 7 ++++++-
.../aws2/lambda/client/impl/Lambda2ClientStandardImpl.java | 7 ++++++-
.../component/aws2/mq/client/impl/MQ2ClientOptimizedImpl.java | 7 ++++++-
.../aws2/mq/client/impl/MQ2ClientProfileOptimizedImpl.java | 7 ++++++-
.../component/aws2/mq/client/impl/MQ2ClientStandardImpl.java | 7 ++++++-
.../aws2/msk/client/impl/MSK2ClientOptimizedImpl.java | 7 ++++++-
.../aws2/msk/client/impl/MSK2ClientProfileOptimizedImpl.java | 7 ++++++-
.../aws2/msk/client/impl/MSK2ClientStandardImpl.java | 7 ++++++-
.../org/apache/camel/component/aws2/s3/AWS2S3Consumer.java | 3 ++-
.../aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java | 7 ++++++-
.../s3/client/impl/AWS2S3ClientIAMProfileOptimizedImpl.java | 7 ++++++-
.../aws2/s3/client/impl/AWS2S3ClientStandardImpl.java | 7 ++++++-
.../aws2/ses/client/impl/Ses2ClientOptimizedImpl.java | 7 ++++++-
.../aws2/ses/client/impl/Ses2ClientProfileOptimizedImpl.java | 7 ++++++-
.../aws2/ses/client/impl/Ses2ClientStandardImpl.java | 7 ++++++-
.../aws2/sns/client/impl/Sns2ClientIAMOptimized.java | 7 ++++++-
.../aws2/sns/client/impl/Sns2ClientIAMProfileOptimized.java | 7 ++++++-
.../aws2/sns/client/impl/Sns2ClientStandardImpl.java | 7 ++++++-
.../org/apache/camel/component/aws2/sqs/Sqs2Consumer.java | 11 +++++++----
.../org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java | 1 -
.../aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java | 7 ++++++-
.../sqs/client/impl/Sqs2ClientIAMProfileOptimizedImpl.java | 10 +++++++++-
.../aws2/sqs/client/impl/Sqs2ClientStandardImpl.java | 7 ++++++-
.../aws2/sts/client/impl/STS2ClientIAMOptimized.java | 7 ++++++-
.../aws2/sts/client/impl/STS2ClientIAMProfileOptimized.java | 7 ++++++-
.../aws2/sts/client/impl/STS2ClientStandardImpl.java | 7 ++++++-
.../translate/client/impl/Translate2ClientIAMOptimized.java | 7 ++++++-
.../client/impl/Translate2ClientIAMProfileOptimized.java | 7 ++++++-
.../translate/client/impl/Translate2ClientStandardImpl.java | 7 ++++++-
77 files changed, 436 insertions(+), 83 deletions(-)
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
index 9f4095dcc5c..0fdc6e18758 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
@@ -59,7 +59,8 @@ public class CloudtrailConsumer extends
ScheduledBatchPollingConsumer {
if (healthCheckRepository != null) {
consumerHealthCheck = new CloudtrailConsumerHealthCheck(this,
getRouteId());
-
consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
&& getEndpoint().getComponent().isHealthCheckConsumerEnabled());
+
consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
+ &&
getEndpoint().getComponent().isHealthCheckConsumerEnabled());
healthCheckRepository.addHealthCheck(consumerHealthCheck);
}
}
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java
index 08e64515fc4..c544a7b14ee 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.aws.cloudtrail;
import org.apache.camel.Category;
-import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientIAMOptimizedImpl.java
index e04ec39abbc..dd89ed48e3a 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientIAMOptimizedImpl.java
@@ -75,13 +75,18 @@ public class CloudtrailClientIAMOptimizedImpl implements
CloudtrailInternalClien
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientIAMProfileOptimizedImpl.java
index d9453f95691..23598d742c2 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientIAMProfileOptimizedImpl.java
@@ -80,13 +80,18 @@ public class CloudtrailClientIAMProfileOptimizedImpl
implements CloudtrailIntern
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientStandardImpl.java
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientStandardImpl.java
index dce34e8281c..eb09e30a23d 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientStandardImpl.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientStandardImpl.java
@@ -90,13 +90,18 @@ public class CloudtrailClientStandardImpl implements
CloudtrailInternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientIAMOptimized.java
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientIAMOptimized.java
index bfb7d95410f..0905d67cf6d 100644
---
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientIAMOptimized.java
+++
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientIAMOptimized.java
@@ -75,13 +75,18 @@ public class SecretsManagerClientIAMOptimized implements
SecretsManagerInternalC
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientIAMProfileOptimized.java
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientIAMProfileOptimized.java
index 75414ffe442..9b061961f53 100644
---
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientIAMProfileOptimized.java
+++
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientIAMProfileOptimized.java
@@ -80,13 +80,18 @@ public class SecretsManagerClientIAMProfileOptimized
implements SecretsManagerIn
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientStandardImpl.java
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientStandardImpl.java
index 3fe26ae2046..4d9c4708a87 100644
---
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientStandardImpl.java
+++
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/client/impl/SecretsManagerClientStandardImpl.java
@@ -90,13 +90,18 @@ public class SecretsManagerClientStandardImpl implements
SecretsManagerInternalC
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientIAMOptimizedImpl.java
index b5faf4c4ade..f53b78e8ed9 100644
---
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientIAMOptimizedImpl.java
@@ -74,13 +74,18 @@ public class Cw2ClientIAMOptimizedImpl implements
Cw2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientIAMProfileOptimizedImpl.java
index 36142ff1c26..7462e35829a 100644
---
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientIAMProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class Cw2ClientIAMProfileOptimizedImpl implements
Cw2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientStandardImpl.java
index facf484e828..3b844f66eca 100644
---
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class Cw2ClientStandardImpl implements
Cw2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientIAMOptimizedImpl.java
index bdfcae5f24b..bf3db027d99 100644
---
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientIAMOptimizedImpl.java
@@ -74,13 +74,18 @@ public class Ddb2ClientIAMOptimizedImpl implements
Ddb2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientIAMProfileOptimizedImpl.java
index dd72187acd9..c1a75666f95 100644
---
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientIAMProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class Ddb2ClientIAMProfileOptimizedImpl implements
Ddb2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientStandardImpl.java
index 355cb351f48..a4579fa41ff 100644
---
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/client/impl/Ddb2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class Ddb2ClientStandardImpl implements
Ddb2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java
index 715234651ed..3a36f8e1adb 100644
---
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java
+++
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpoint.java
@@ -134,13 +134,18 @@ public class Ddb2StreamEndpoint extends
ScheduledPollEndpoint {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientIAMOptimizedImpl.java
index e163d52497c..66365ad5cf6 100644
---
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientIAMOptimizedImpl.java
@@ -75,13 +75,18 @@ public class Ddb2StreamClientIAMOptimizedImpl implements
Ddb2StreamInternalClien
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientIAMProfileOptimizedImpl.java
index 47598a9f8da..c3bcab74da5 100644
---
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientIAMProfileOptimizedImpl.java
@@ -80,13 +80,18 @@ public class Ddb2StreamClientIAMProfileOptimizedImpl
implements Ddb2StreamIntern
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientStandardImpl.java
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientStandardImpl.java
index 90448d62902..07c179dae70 100644
---
a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/client/impl/Ddb2StreamClientStandardImpl.java
@@ -90,13 +90,18 @@ public class Ddb2StreamClientStandardImpl implements
Ddb2StreamInternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMOptimizedImpl.java
index 8ef6a9c5fc4..389acc93bb1 100644
---
a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMOptimizedImpl.java
@@ -74,13 +74,18 @@ public class AWS2EC2ClientIAMOptimizedImpl implements
AWS2EC2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMProfileOptimizedImpl.java
index 3ee7b8ee837..0a8986a6a2e 100644
---
a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class AWS2EC2ClientIAMProfileOptimizedImpl
implements AWS2EC2InternalClie
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientStandardImpl.java
index 567e58d92ac..2848af0136f 100644
---
a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class AWS2EC2ClientStandardImpl implements
AWS2EC2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientIAMOptimizedImpl.java
index be063fc9532..315f2f8d863 100644
---
a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientIAMOptimizedImpl.java
@@ -74,13 +74,18 @@ public class ECS2ClientIAMOptimizedImpl implements
ECS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientIAMProfileOptimizedImpl.java
index 8b129a0460e..ea44b4409cf 100644
---
a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientIAMProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class ECS2ClientIAMProfileOptimizedImpl implements
ECS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientStandardImpl.java
index a426c812df0..546f3f9b286 100644
---
a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/client/impl/ECS2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class ECS2ClientStandardImpl implements
ECS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMOptimizedImpl.java
index c2f0f31b6f6..83e1cce1097 100644
---
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMOptimizedImpl.java
@@ -74,13 +74,18 @@ public class EKS2ClientIAMOptimizedImpl implements
EKS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMProfileOptimizedImpl.java
index 372df70e269..1b441e95697 100644
---
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class EKS2ClientIAMProfileOptimizedImpl implements
EKS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientStandardImpl.java
index 2526806c7fe..22d4011d129 100644
---
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class EKS2ClientStandardImpl implements
EKS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientIAMOptimizedImpl.java
index 0990217378a..da119ba3595 100644
---
a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientIAMOptimizedImpl.java
@@ -74,13 +74,18 @@ public class EventbridgeClientIAMOptimizedImpl implements
EventbridgeInternalCli
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientIAMProfileOptimizedImpl.java
index bfd6a81f654..cbe02b2d10a 100644
---
a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientIAMProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class EventbridgeClientIAMProfileOptimizedImpl
implements EventbridgeInte
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientStandardImpl.java
b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientStandardImpl.java
index d9fefaae95e..d281e985786 100644
---
a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/client/impl/EventbridgeClientStandardImpl.java
@@ -90,13 +90,18 @@ public class EventbridgeClientStandardImpl implements
EventbridgeInternalClient
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientOptimizedImpl.java
b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientOptimizedImpl.java
index 52b57cdaaaf..e0f5db754c9 100644
---
a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientOptimizedImpl.java
@@ -74,13 +74,18 @@ public class IAM2ClientOptimizedImpl implements
IAM2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientProfileOptimizedImpl.java
index e9fa9551284..de0c4498ec0 100644
---
a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class IAM2ClientProfileOptimizedImpl implements
IAM2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientStandardImpl.java
index 37c5b2d5837..fbb6d9b94f5 100644
---
a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/client/impl/IAM2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class IAM2ClientStandardImpl implements
IAM2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java
index 9e8d4b9a4f9..9d7dba54eea 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java
@@ -76,13 +76,18 @@ public class KinesisFirehoseClientIAMOptimizedImpl
implements KinesisFirehoseInt
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMProfileOptimizedImpl.java
index b0fbdc52e70..a721694db65 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMProfileOptimizedImpl.java
@@ -81,13 +81,18 @@ public class KinesisFirehoseClientIAMProfileOptimizedImpl
implements KinesisFire
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientStandardImpl.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientStandardImpl.java
index 421bb4de8af..1761b1e4c9f 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientStandardImpl.java
@@ -90,13 +90,18 @@ public class KinesisFirehoseClientStandardImpl implements
KinesisFirehoseInterna
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
index 249c4564d90..6a80c3dceb0 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
@@ -301,7 +301,8 @@ public class Kinesis2Consumer extends
ScheduledBatchPollingConsumer implements R
if (healthCheckRepository != null) {
consumerHealthCheck = new Kinesis2ConsumerHealthCheck(this,
getRouteId());
-
consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
&& getEndpoint().getComponent().isHealthCheckConsumerEnabled());
+
consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
+ &&
getEndpoint().getComponent().isHealthCheckConsumerEnabled());
healthCheckRepository.addHealthCheck(consumerHealthCheck);
}
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
index 092f09bd264..e4d4d122c96 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Endpoint.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.aws2.kinesis;
import java.util.Objects;
import org.apache.camel.Category;
-import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientIAMOptimizedImpl.java
index 164d5b9c898..0f68516d31d 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientIAMOptimizedImpl.java
@@ -76,15 +76,19 @@ public class KinesisAsyncClientIAMOptimizedImpl implements
KinesisAsyncInternalC
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkAsyncHttpClient ahc = NettyNioAsyncHttpClient
- .builder()
+ if (httpClientBuilder == null) {
+ httpClientBuilder = NettyNioAsyncHttpClient.builder();
+ }
+ SdkAsyncHttpClient ahc = httpClientBuilder
.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
return clientBuilder.build();
}
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientIAMProfileOptimizedImpl.java
index 3528e5caec0..3153f068472 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientIAMProfileOptimizedImpl.java
@@ -81,15 +81,19 @@ public class KinesisAsyncClientIAMProfileOptimizedImpl
implements KinesisAsyncIn
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkAsyncHttpClient ahc = NettyNioAsyncHttpClient
- .builder()
+ if (httpClientBuilder == null) {
+ httpClientBuilder = NettyNioAsyncHttpClient.builder();
+ }
+ SdkAsyncHttpClient ahc = httpClientBuilder
.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
return clientBuilder.build();
}
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientStandardImpl.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientStandardImpl.java
index 57e14de3f53..b743e66ea6c 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisAsyncClientStandardImpl.java
@@ -94,15 +94,19 @@ public class KinesisAsyncClientStandardImpl implements
KinesisAsyncInternalClien
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkAsyncHttpClient ahc = NettyNioAsyncHttpClient
- .builder()
+ if (httpClientBuilder == null) {
+ httpClientBuilder = NettyNioAsyncHttpClient.builder();
+ }
+ SdkAsyncHttpClient ahc = httpClientBuilder
.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
return clientBuilder.build();
}
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java
index c2072cfc750..f4ce342dd2d 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java
@@ -75,13 +75,18 @@ public class KinesisClientIAMOptimizedImpl implements
KinesisInternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMProfileOptimizedImpl.java
index 08b0fac4654..a5c9cd6689b 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMProfileOptimizedImpl.java
@@ -80,13 +80,18 @@ public class KinesisClientIAMProfileOptimizedImpl
implements KinesisInternalClie
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientStandardImpl.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientStandardImpl.java
index 2d428518b0a..5858f852233 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientStandardImpl.java
@@ -90,13 +90,18 @@ public class KinesisClientStandardImpl implements
KinesisInternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientOptimizedImpl.java
b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientOptimizedImpl.java
index 37d30a1b319..c5248688f19 100644
---
a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientOptimizedImpl.java
@@ -74,13 +74,18 @@ public class KMS2ClientOptimizedImpl implements
KMS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientProfileOptimizedImpl.java
index 9d15eecc0e3..7f434cb762b 100644
---
a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class KMS2ClientProfileOptimizedImpl implements
KMS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientStandardImpl.java
index 937c78a5f1f..69959d3601a 100644
---
a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class KMS2ClientStandardImpl implements
KMS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientIAMProfileOptimizedImpl.java
index 3c04a03d46f..8ab02725b2b 100644
---
a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientIAMProfileOptimizedImpl.java
@@ -74,13 +74,18 @@ public class Lambda2ClientIAMProfileOptimizedImpl
implements Lambda2InternalClie
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientOptimizedImpl.java
b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientOptimizedImpl.java
index 5654d2a5238..1e626f6bb4a 100644
---
a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientOptimizedImpl.java
@@ -74,13 +74,18 @@ public class Lambda2ClientOptimizedImpl implements
Lambda2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientStandardImpl.java
index 1e30343e3a0..f16f06f4925 100644
---
a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class Lambda2ClientStandardImpl implements
Lambda2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientOptimizedImpl.java
b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientOptimizedImpl.java
index 7dd73ac6fc5..19abefef76b 100644
---
a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientOptimizedImpl.java
@@ -74,13 +74,18 @@ public class MQ2ClientOptimizedImpl implements
MQ2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientProfileOptimizedImpl.java
index 93addb5434c..a9e75f5f266 100644
---
a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class MQ2ClientProfileOptimizedImpl implements
MQ2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientStandardImpl.java
index 3ea1633b0bb..f9f9060bae6 100644
---
a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/client/impl/MQ2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class MQ2ClientStandardImpl implements
MQ2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientOptimizedImpl.java
b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientOptimizedImpl.java
index cacfbd1ceb6..e6c048006c6 100644
---
a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientOptimizedImpl.java
@@ -74,13 +74,18 @@ public class MSK2ClientOptimizedImpl implements
MSK2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientProfileOptimizedImpl.java
index 1120aecadec..13c84a8a245 100644
---
a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class MSK2ClientProfileOptimizedImpl implements
MSK2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientStandardImpl.java
index 2a91e0d9a66..a64a61f2fa1 100644
---
a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class MSK2ClientStandardImpl implements
MSK2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
index 4bb95fcc299..7b4a991bf62 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java
@@ -88,7 +88,8 @@ public class AWS2S3Consumer extends
ScheduledBatchPollingConsumer {
if (healthCheckRepository != null) {
consumerHealthCheck = new AWS2S3ConsumerHealthCheck(this,
getRouteId());
-
consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
&& getEndpoint().getComponent().isHealthCheckConsumerEnabled());
+
consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
+ &&
getEndpoint().getComponent().isHealthCheckConsumerEnabled());
healthCheckRepository.addHealthCheck(consumerHealthCheck);
}
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java
index 72ea19fed75..fa3b4b68fb7 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMOptimizedImpl.java
@@ -77,13 +77,18 @@ public class AWS2S3ClientIAMOptimizedImpl implements
AWS2CamelS3InternalClient {
clientBuilder.forcePathStyle(true);
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMProfileOptimizedImpl.java
index 77419f8650c..5047471c8b7 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientIAMProfileOptimizedImpl.java
@@ -92,13 +92,18 @@ public class AWS2S3ClientIAMProfileOptimizedImpl implements
AWS2CamelS3InternalC
clientBuilder.forcePathStyle(true);
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java
index 5d0fffc6cd7..0b84db11c99 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/impl/AWS2S3ClientStandardImpl.java
@@ -93,13 +93,18 @@ public class AWS2S3ClientStandardImpl implements
AWS2CamelS3InternalClient {
clientBuilder.forcePathStyle(true);
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientOptimizedImpl.java
b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientOptimizedImpl.java
index 1c6673b8988..b487e49bbce 100644
---
a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientOptimizedImpl.java
@@ -74,13 +74,18 @@ public class Ses2ClientOptimizedImpl implements
Ses2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientProfileOptimizedImpl.java
index f178eec8108..7e5d3e45037 100644
---
a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientProfileOptimizedImpl.java
@@ -79,13 +79,18 @@ public class Ses2ClientProfileOptimizedImpl implements
Ses2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientStandardImpl.java
index d357dc1f68a..cd20dd15b9a 100644
---
a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/client/impl/Ses2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class Ses2ClientStandardImpl implements
Ses2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientIAMOptimized.java
b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientIAMOptimized.java
index 6e0687170a2..b00335e2efa 100644
---
a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientIAMOptimized.java
+++
b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientIAMOptimized.java
@@ -75,13 +75,18 @@ public class Sns2ClientIAMOptimized implements
Sns2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientIAMProfileOptimized.java
b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientIAMProfileOptimized.java
index f26c50018a0..4ee52ba887a 100644
---
a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientIAMProfileOptimized.java
+++
b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientIAMProfileOptimized.java
@@ -80,13 +80,18 @@ public class Sns2ClientIAMProfileOptimized implements
Sns2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientStandardImpl.java
index b16507feb58..b70259618f3 100644
---
a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/client/impl/Sns2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class Sns2ClientStandardImpl implements
Sns2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
index 233384c061a..375fccd65e1 100644
---
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
+++
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Consumer.java
@@ -186,7 +186,8 @@ public class Sqs2Consumer extends
ScheduledBatchPollingConsumer {
repeatSeconds, exchange.getExchangeId());
}
final TimeoutExtender extender = new TimeoutExtender(exchange,
repeatSeconds);
- final ScheduledFuture<?> scheduledFuture =
this.scheduledExecutor.scheduleAtFixedRate(extender, delay, period,
TimeUnit.SECONDS);
+ final ScheduledFuture<?> scheduledFuture
+ = this.scheduledExecutor.scheduleAtFixedRate(extender,
delay, period, TimeUnit.SECONDS);
exchange.getExchangeExtension().addOnCompletion(new
Synchronization() {
@Override
public void onComplete(Exchange exchange) {
@@ -205,7 +206,8 @@ public class Sqs2Consumer extends
ScheduledBatchPollingConsumer {
extender.cancel();
boolean cancelled = scheduledFuture.cancel(true);
if (!cancelled) {
- LOG.warn("TimeoutExtender task for exchangeId: {}
could not be cancelled", exchange.getExchangeId());
+ LOG.warn("TimeoutExtender task for exchangeId: {}
could not be cancelled",
+ exchange.getExchangeId());
}
}
});
@@ -382,7 +384,8 @@ public class Sqs2Consumer extends
ScheduledBatchPollingConsumer {
if (healthCheckRepository != null) {
consumerHealthCheck = new Sqs2ConsumerHealthCheck(this,
getRouteId());
-
consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
&& getEndpoint().getComponent().isHealthCheckConsumerEnabled());
+
consumerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckEnabled()
+ &&
getEndpoint().getComponent().isHealthCheckConsumerEnabled());
healthCheckRepository.addHealthCheck(consumerHealthCheck);
}
}
@@ -418,7 +421,7 @@ public class Sqs2Consumer extends
ScheduledBatchPollingConsumer {
if (run.get()) {
ChangeMessageVisibilityRequest.Builder request
=
ChangeMessageVisibilityRequest.builder().queueUrl(getQueueUrl()).visibilityTimeout(repeatSeconds)
-
.receiptHandle(exchange.getIn().getHeader(Sqs2Constants.RECEIPT_HANDLE,
String.class));
+
.receiptHandle(exchange.getIn().getHeader(Sqs2Constants.RECEIPT_HANDLE,
String.class));
try {
LOG.trace("Extending visibility window by {} seconds for
exchange {}", this.repeatSeconds, this.exchange);
diff --git
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
index 1134ddad262..365647a3f1a 100644
---
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
+++
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
@@ -23,7 +23,6 @@ import java.util.EnumMap;
import java.util.Map;
import org.apache.camel.Category;
-import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
diff --git
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java
index 114db92c8b2..fc2ec15cef9 100644
---
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java
+++
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java
@@ -75,13 +75,18 @@ public class Sqs2ClientIAMOptimized implements
Sqs2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMProfileOptimizedImpl.java
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMProfileOptimizedImpl.java
index 4556e77a791..810e653e734 100644
---
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMProfileOptimizedImpl.java
+++
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMProfileOptimizedImpl.java
@@ -96,13 +96,21 @@ public class Sqs2ClientIAMProfileOptimizedImpl implements
Sqs2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientStandardImpl.java
index e91c10ce9f1..cf9259c948e 100644
---
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientStandardImpl.java
@@ -97,13 +97,18 @@ public class Sqs2ClientStandardImpl implements
Sqs2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientIAMOptimized.java
b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientIAMOptimized.java
index 685b7653756..a4d5616040f 100644
---
a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientIAMOptimized.java
+++
b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientIAMOptimized.java
@@ -75,13 +75,18 @@ public class STS2ClientIAMOptimized implements
STS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientIAMProfileOptimized.java
b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientIAMProfileOptimized.java
index 9ffc1b26e90..497728e212b 100644
---
a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientIAMProfileOptimized.java
+++
b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientIAMProfileOptimized.java
@@ -80,13 +80,18 @@ public class STS2ClientIAMProfileOptimized implements
STS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientStandardImpl.java
index b3d02ddb9fc..9821ea4a439 100644
---
a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/client/impl/STS2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class STS2ClientStandardImpl implements
STS2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientIAMOptimized.java
b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientIAMOptimized.java
index 09904574615..a397b9878f8 100644
---
a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientIAMOptimized.java
+++
b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientIAMOptimized.java
@@ -75,13 +75,18 @@ public class Translate2ClientIAMOptimized implements
Translate2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientIAMProfileOptimized.java
b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientIAMProfileOptimized.java
index 21f14c6f06b..f4de9a1ff79 100644
---
a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientIAMProfileOptimized.java
+++
b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientIAMProfileOptimized.java
@@ -80,13 +80,18 @@ public class Translate2ClientIAMProfileOptimized implements
Translate2InternalCl
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
diff --git
a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientStandardImpl.java
index 9180bbffd19..6372612de91 100644
---
a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientStandardImpl.java
+++
b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/client/impl/Translate2ClientStandardImpl.java
@@ -90,13 +90,18 @@ public class Translate2ClientStandardImpl implements
Translate2InternalClient {
clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride()));
}
if (configuration.isTrustAllCertificates()) {
- SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ if (httpClientBuilder == null) {
+ httpClientBuilder = ApacheHttpClient.builder();
+ }
+ SdkHttpClient ahc =
httpClientBuilder.buildWithDefaults(AttributeMap
.builder()
.put(
SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
Boolean.TRUE)
.build());
+ // set created http client to use instead of builder
clientBuilder.httpClient(ahc);
+ clientBuilder.httpClientBuilder(null);
}
client = clientBuilder.build();
return client;
