This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 68a51afecbf57c16b9ecaf9920778af767fcbdf2
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Nov 20 08:37:08 2020 +0100
CAMEL-15843 - Camel-AWS2: Rename useIamCredentials to
useDefaultCredentialProvider where it is used
---
.../org/apache/camel/component/aws2/s3/AWS2S3Component.java | 2 +-
.../apache/camel/component/aws2/s3/AWS2S3Configuration.java | 12 ++++++------
.../camel/component/aws2/s3/client/AWS2S3ClientFactory.java | 2 +-
.../camel/component/aws2/s3/AWSS3ClientFactoryTest.java | 4 ++--
.../component/milo/server/internal/CamelServerItem.java | 1 -
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
index 008b37e..a72792b 100644
---
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
+++
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
@@ -58,7 +58,7 @@ public class AWS2S3Component extends DefaultComponent {
configuration.setBucketName(remaining);
AWS2S3Endpoint endpoint = new AWS2S3Endpoint(uri, this, configuration);
setProperties(endpoint, parameters);
- if (!configuration.isUseIAMCredentials() &&
configuration.getAmazonS3Client() == null
+ if (!configuration.isUseDefaultCredentialsProvider() &&
configuration.getAmazonS3Client() == null
&& (configuration.getAccessKey() == null ||
configuration.getSecretKey() == null)) {
throw new IllegalArgumentException(
"useIAMCredentials is set to false, AmazonS3Client or
accessKey and secretKey must be specified");
diff --git
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
index c0c5c84..43fc515 100644
---
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
+++
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
@@ -97,7 +97,7 @@ public class AWS2S3Configuration implements Cloneable {
@UriParam(label = "common,advanced")
private String customerAlgorithm;
@UriParam(defaultValue = "false")
- private boolean useIAMCredentials;
+ private boolean useDefaultCredentialsProvider;
@UriParam(label = "producer")
private String keyName;
@UriParam(defaultValue = "false")
@@ -472,15 +472,15 @@ public class AWS2S3Configuration implements Cloneable {
}
/**
- * Set whether the S3 client should expect to load credentials on an EC2
instance or to expect static credentials to
+ * Set whether the S3 client should expect to load credentials through a
default credentials provider or to expect static credentials to
* be passed in.
*/
- public void setUseIAMCredentials(Boolean useIAMCredentials) {
- this.useIAMCredentials = useIAMCredentials;
+ public void setUseDefaultCredentialsProvider(Boolean
useDefaultCredentialsProvider) {
+ this.useDefaultCredentialsProvider = useDefaultCredentialsProvider;
}
- public Boolean isUseIAMCredentials() {
- return useIAMCredentials;
+ public Boolean isUseDefaultCredentialsProvider() {
+ return useDefaultCredentialsProvider;
}
public boolean isAutoCreateBucket() {
diff --git
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java
index 7af9443..173a123 100644
---
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java
+++
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/client/AWS2S3ClientFactory.java
@@ -35,7 +35,7 @@ public final class AWS2S3ClientFactory {
* @return AWSS3Client
*/
public static AWS2CamelS3InternalClient getAWSS3Client(AWS2S3Configuration
configuration) {
- return configuration.isUseIAMCredentials()
+ return configuration.isUseDefaultCredentialsProvider()
? new AWS2S3ClientIAMOptimizedImpl(configuration) : new
AWS2S3ClientStandardImpl(configuration);
}
}
diff --git
a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWSS3ClientFactoryTest.java
b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWSS3ClientFactoryTest.java
index aafcdc9..f54aeb6 100644
---
a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWSS3ClientFactoryTest.java
+++
b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWSS3ClientFactoryTest.java
@@ -36,7 +36,7 @@ public class AWSS3ClientFactoryTest {
@Test
public void getStandardS3Client() {
AWS2S3Configuration s3Configuration = new AWS2S3Configuration();
- s3Configuration.setUseIAMCredentials(false);
+ s3Configuration.setUseDefaultCredentialsProvider(false);
AWS2CamelS3InternalClient awss3Client =
AWS2S3ClientFactory.getAWSS3Client(s3Configuration);
assertTrue(awss3Client instanceof AWS2S3ClientStandardImpl);
}
@@ -44,7 +44,7 @@ public class AWSS3ClientFactoryTest {
@Test
public void getIAMOptimizedS3Client() {
AWS2S3Configuration s3Configuration = new AWS2S3Configuration();
- s3Configuration.setUseIAMCredentials(true);
+ s3Configuration.setUseDefaultCredentialsProvider(true);
AWS2CamelS3InternalClient awss3Client =
AWS2S3ClientFactory.getAWSS3Client(s3Configuration);
assertTrue(awss3Client instanceof AWS2S3ClientIAMOptimizedImpl);
}
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
index 9fbe625..8c9c5c0 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
@@ -75,7 +75,6 @@ public class CamelServerItem {
};
-
this.item.setAccessLevel(ubyte(AccessLevel.getMask(AccessLevel.READ_WRITE)));
this.item.setUserAccessLevel(ubyte(AccessLevel.getMask(AccessLevel.READ_WRITE)));
