You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/08/25 07:34:26 UTC
[8/8] camel git commit: CAMEL-11703 - Camel-AWS: Use builders instead
of different constructors - AWS SimpleEmail
CAMEL-11703 - Camel-AWS: Use builders instead of different constructors - AWS SimpleEmail
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6b2262a7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6b2262a7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6b2262a7
Branch: refs/heads/master
Commit: 6b2262a7315b907f737f674308f6c5ad4d48d44f
Parents: 5d8d6ee
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Aug 25 09:22:13 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Aug 25 09:33:29 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/aws/ses/SesEndpoint.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6b2262a7/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
index 5dcf2be..94a4d96 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
@@ -18,9 +18,12 @@ package org.apache.camel.component.aws.ses;
import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;
+import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClientBuilder;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
@@ -97,16 +100,17 @@ public class SesEndpoint extends DefaultEndpoint {
}
if (configuration.getAccessKey() != null && configuration.getSecretKey() != null) {
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
+ AWSCredentialsProvider credentialsProvider = new AWSStaticCredentialsProvider(credentials);
if (isClientConfigFound) {
- client = new AmazonSimpleEmailServiceClient(credentials, clientConfiguration);
+ client = AmazonSimpleEmailServiceClientBuilder.standard().withClientConfiguration(clientConfiguration).withCredentials(credentialsProvider).build();
} else {
- client = new AmazonSimpleEmailServiceClient(credentials);
+ client = AmazonSimpleEmailServiceClientBuilder.standard().withCredentials(credentialsProvider).build();
}
} else {
if (isClientConfigFound) {
- client = new AmazonSimpleEmailServiceClient();
+ client = AmazonSimpleEmailServiceClientBuilder.standard().build();
} else {
- client = new AmazonSimpleEmailServiceClient(clientConfiguration);
+ client = AmazonSimpleEmailServiceClientBuilder.standard().withClientConfiguration(clientConfiguration).build();
}
}
return client;