This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d4c7912 Removes unreachable branch on camel-aws-s3 client
implementations
d4c7912 is described below
commit d4c79120a839402bcd1f730c50d8a920519f527a
Author: Otavio Rodolfo Piske <opi...@redhat.com>
AuthorDate: Thu Aug 13 19:12:22 2020 +0200
Removes unreachable branch on camel-aws-s3 client implementations
---
.../component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java | 9 +++++----
.../camel/component/aws/s3/client/impl/S3ClientStandardImpl.java | 4 +---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java
index d14abbc..185aeb8 100644
---
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java
+++
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientIAMOptimizedImpl.java
@@ -73,15 +73,16 @@ public class S3ClientIAMOptimizedImpl implements S3Client {
if (!configuration.isUseEncryption()) {
clientBuilder =
AmazonS3ClientBuilder.standard().withCredentials(new
InstanceProfileCredentialsProvider(false));
- } else if (configuration.isUseEncryption()) {
+
+ if (configuration.hasProxyConfiguration()) {
+ clientBuilder =
clientBuilder.withClientConfiguration(clientConfiguration);
+ }
+ } else {
StaticEncryptionMaterialsProvider encryptionMaterialsProvider
= new
StaticEncryptionMaterialsProvider(configuration.getEncryptionMaterials());
encClientBuilder =
AmazonS3EncryptionClientBuilder.standard().withClientConfiguration(clientConfiguration)
.withEncryptionMaterials(encryptionMaterialsProvider)
.withCredentials(new
InstanceProfileCredentialsProvider(false));
- } else {
- clientBuilder =
AmazonS3ClientBuilder.standard().withClientConfiguration(clientConfiguration)
- .withCredentials(new
InstanceProfileCredentialsProvider(false));
}
if (!configuration.isUseEncryption()) {
diff --git
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java
index 886137c..d7bf52f 100644
---
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java
+++
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/client/impl/S3ClientStandardImpl.java
@@ -76,14 +76,12 @@ public class S3ClientStandardImpl implements S3Client {
if (!configuration.isUseEncryption()) {
clientBuilder =
AmazonS3ClientBuilder.standard().withClientConfiguration(clientConfiguration)
.withCredentials(credentialsProvider);
- } else if (configuration.isUseEncryption()) {
+ } else {
StaticEncryptionMaterialsProvider encryptionMaterialsProvider
= new
StaticEncryptionMaterialsProvider(configuration.getEncryptionMaterials());
encClientBuilder =
AmazonS3EncryptionClientBuilder.standard().withClientConfiguration(clientConfiguration)
.withCredentials(credentialsProvider)
.withEncryptionMaterials(encryptionMaterialsProvider);
- } else {
- clientBuilder =
AmazonS3ClientBuilder.standard().withCredentials(credentialsProvider);
}
if (!configuration.isUseEncryption()) {
