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 2018/10/03 09:16:17 UTC
[camel] branch master updated (6445ba2 -> dd5963c)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 6445ba2 Check message received in queue in no particular order
new 60e3cf6 Camel-AWS: Lets use AbstractAmazonS3 in the AWS S3 Client Mock for tests
new b60b56d Camel-AWS: Lets use AbstractAmazonDynamoDB in the AWS DDB Client Mock for tests
new c385c75 Camel-AWS: Lets use AbstractAWSKMS in the AWS KMS Client Mock for tests
new 58c33da Camel-AWS: Lets use AbstractAWSLambda in the AWS Lambda Client Mock for tests
new fe3ec54 Camel-AWS: Fix a missing import
new bda0d0c Camel-AWS: Lets use AbstractAmazonSimpleDB in the AWS SDB Client Mock for tests
new d426c9f Camel-AWS: Lets use AbstractAmazonSimpleEmailService in the AWS SES Client Mock for tests
new 4b55eea Camel-AWS: Lets use AbstractAmazonSNS in the AWS SNS Client Mock for tests
new dd5963c Camel-AWS: Fix SNS test
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java | 7 +++----
.../org/apache/camel/component/aws/kms/AmazonKMSClientMock.java | 4 ++--
.../camel/component/aws/lambda/AmazonLambdaClientMock.java | 4 ++--
.../org/apache/camel/component/aws/s3/AmazonS3ClientMock.java | 7 +++----
.../camel/component/aws/s3/AmazonS3EncryptionClientMock.java | 9 +++------
.../org/apache/camel/component/aws/sdb/AmazonSDBClientMock.java | 7 +++----
.../org/apache/camel/component/aws/ses/AmazonSESClientMock.java | 7 +++----
.../org/apache/camel/component/aws/sns/AmazonSNSClientMock.java | 7 +++----
.../camel/component/aws/sns/SnsComponentConfigurationTest.java | 2 --
.../org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java | 7 +++----
10 files changed, 25 insertions(+), 36 deletions(-)
[camel] 07/09: Camel-AWS: Lets use AbstractAmazonSimpleEmailService
in the AWS SES Client Mock for tests
Posted by ac...@apache.org.
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 d426c9f463040508fea42fe1d07c5b01f719b16a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 3 10:34:46 2018 +0200
Camel-AWS: Lets use AbstractAmazonSimpleEmailService in the AWS SES Client Mock for tests
---
.../org/apache/camel/component/aws/ses/AmazonSESClientMock.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/AmazonSESClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/AmazonSESClientMock.java
index 21669ee..8984a33 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/AmazonSESClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ses/AmazonSESClientMock.java
@@ -18,19 +18,18 @@ package org.apache.camel.component.aws.ses;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;
+import com.amazonaws.services.simpleemail.AbstractAmazonSimpleEmailService;
import com.amazonaws.services.simpleemail.model.SendEmailRequest;
import com.amazonaws.services.simpleemail.model.SendEmailResult;
import com.amazonaws.services.simpleemail.model.SendRawEmailRequest;
import com.amazonaws.services.simpleemail.model.SendRawEmailResult;
-public class AmazonSESClientMock extends AmazonSimpleEmailServiceClient {
+public class AmazonSESClientMock extends AbstractAmazonSimpleEmailService {
private SendEmailRequest sendEmailRequest;
private SendRawEmailRequest sendRawEmailRequest;
public AmazonSESClientMock() {
- super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
+ super();
}
@Override
[camel] 09/09: Camel-AWS: Fix SNS test
Posted by ac...@apache.org.
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 dd5963c36f090a91d8cb79fbf1a347b4c98c68fd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 3 10:39:31 2018 +0200
Camel-AWS: Fix SNS test
---
.../org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java | 7 ++++---
.../org/apache/camel/component/aws/iam/AmazonIAMClientMock.java | 4 ++--
.../camel/component/aws/sns/SnsComponentConfigurationTest.java | 2 --
.../org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java | 7 +++----
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
index 956329f..ff9502f 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
@@ -21,7 +21,8 @@ import java.util.Collection;
import java.util.Iterator;
import com.amazonaws.AmazonServiceException;
-import com.amazonaws.services.ec2.AbstractAmazonEC2;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.ec2.AmazonEC2Client;
import com.amazonaws.services.ec2.model.CreateTagsRequest;
import com.amazonaws.services.ec2.model.CreateTagsResult;
import com.amazonaws.services.ec2.model.DeleteTagsRequest;
@@ -58,10 +59,10 @@ import com.amazonaws.services.ec2.model.UnmonitorInstancesResult;
import org.apache.camel.util.ObjectHelper;
-public class AmazonEC2ClientMock extends AbstractAmazonEC2 {
+public class AmazonEC2ClientMock extends AmazonEC2Client {
public AmazonEC2ClientMock() {
- super();
+ super(new BasicAWSCredentials("user", "secret"));
}
@Override
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
index 560ea70..d501188 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
@@ -24,7 +24,7 @@ import java.util.List;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.ResponseMetadata;
import com.amazonaws.regions.Region;
-import com.amazonaws.services.identitymanagement.AbstractAmazonIdentityManagement;
+import com.amazonaws.services.identitymanagement.AmazonIdentityManagementClient;
import com.amazonaws.services.identitymanagement.model.AccessKey;
import com.amazonaws.services.identitymanagement.model.AccessKeyMetadata;
import com.amazonaws.services.identitymanagement.model.AddClientIDToOpenIDConnectProviderRequest;
@@ -275,7 +275,7 @@ import com.amazonaws.services.identitymanagement.model.UploadSigningCertificateR
import com.amazonaws.services.identitymanagement.model.User;
import com.amazonaws.services.identitymanagement.waiters.AmazonIdentityManagementWaiters;
-public class AmazonIAMClientMock extends AbstractAmazonIdentityManagement {
+public class AmazonIAMClientMock extends AmazonIdentityManagementClient {
@Override
public void setEndpoint(String endpoint) {
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
index 0e56469..41a9abd 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
@@ -85,8 +85,6 @@ public class SnsComponentConfigurationTest extends CamelTestSupport {
endpoint.start();
assertEquals("arn:aws:sns:us-east-1:541925086079:MyTopic", endpoint.getConfiguration().getTopicArn());
- // check the setting of AmazonSNSEndpoint
- assertEquals("https://sns.us-east-1.amazonaws.com", mock.getEndpoint());
endpoint.stop();
}
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
index 691900c..a1b3de6 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
@@ -30,8 +30,7 @@ import java.util.concurrent.TimeUnit;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.sqs.AmazonSQSClient;
+import com.amazonaws.services.sqs.AbstractAmazonSQS;
import com.amazonaws.services.sqs.model.ChangeMessageVisibilityRequest;
import com.amazonaws.services.sqs.model.ChangeMessageVisibilityResult;
import com.amazonaws.services.sqs.model.CreateQueueRequest;
@@ -47,7 +46,7 @@ import com.amazonaws.services.sqs.model.SendMessageResult;
import com.amazonaws.services.sqs.model.SetQueueAttributesRequest;
import com.amazonaws.services.sqs.model.SetQueueAttributesResult;
-public class AmazonSQSClientMock extends AmazonSQSClient {
+public class AmazonSQSClientMock extends AbstractAmazonSQS {
List<Message> messages = new ArrayList<>();
Map<String, Map<String, String>> queueAttributes = new HashMap<>();
@@ -57,7 +56,7 @@ public class AmazonSQSClientMock extends AmazonSQSClient {
private ScheduledExecutorService scheduler;
public AmazonSQSClientMock() {
- super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
+ super();
}
@Override
[camel] 03/09: Camel-AWS: Lets use AbstractAWSKMS in the AWS KMS
Client Mock for tests
Posted by ac...@apache.org.
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 c385c75c7315899ad8f6c6df5146f3db7a30006f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 3 10:02:45 2018 +0200
Camel-AWS: Lets use AbstractAWSKMS in the AWS KMS Client Mock for tests
---
.../java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java
index 6b5aa61..93aedf9 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kms/AmazonKMSClientMock.java
@@ -22,7 +22,7 @@ import java.util.List;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.ResponseMetadata;
import com.amazonaws.regions.Region;
-import com.amazonaws.services.kms.AWSKMS;
+import com.amazonaws.services.kms.AbstractAWSKMS;
import com.amazonaws.services.kms.model.CancelKeyDeletionRequest;
import com.amazonaws.services.kms.model.CancelKeyDeletionResult;
import com.amazonaws.services.kms.model.CreateAliasRequest;
@@ -97,7 +97,7 @@ import com.amazonaws.services.kms.model.UpdateKeyDescriptionRequest;
import com.amazonaws.services.kms.model.UpdateKeyDescriptionResult;
-public class AmazonKMSClientMock implements AWSKMS {
+public class AmazonKMSClientMock extends AbstractAWSKMS {
public AmazonKMSClientMock() {
super();
[camel] 01/09: Camel-AWS: Lets use AbstractAmazonS3 in the AWS S3
Client Mock for tests
Posted by ac...@apache.org.
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 60e3cf6b691ecdf7866c243f338a1998ef1eafe5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 3 09:49:33 2018 +0200
Camel-AWS: Lets use AbstractAmazonS3 in the AWS S3 Client Mock for tests
---
.../org/apache/camel/component/aws/s3/AmazonS3ClientMock.java | 7 +++----
.../camel/component/aws/s3/AmazonS3EncryptionClientMock.java | 9 +++------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
index 27a2b49..d85fd82 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
@@ -31,8 +31,7 @@ import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.HttpMethod;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AbstractAmazonS3;
import com.amazonaws.services.s3.S3ResponseMetadata;
import com.amazonaws.services.s3.model.AbortMultipartUploadRequest;
import com.amazonaws.services.s3.model.AccessControlList;
@@ -80,7 +79,7 @@ import com.amazonaws.services.s3.model.VersionListing;
import org.apache.camel.util.ObjectHelper;
import org.junit.Assert;
-public class AmazonS3ClientMock extends AmazonS3Client {
+public class AmazonS3ClientMock extends AbstractAmazonS3 {
List<S3Object> objects = new CopyOnWriteArrayList<>();
List<PutObjectRequest> putObjectRequests = new CopyOnWriteArrayList<>();
@@ -90,7 +89,7 @@ public class AmazonS3ClientMock extends AmazonS3Client {
private int maxCapacity = 100;
public AmazonS3ClientMock() {
- super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
+ super();
}
@Override
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
index deac036..40bc317 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
@@ -21,7 +21,6 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.net.URL;
-import java.security.KeyPair;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -31,7 +30,7 @@ import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.HttpMethod;
-import com.amazonaws.services.s3.AmazonS3EncryptionClient;
+import com.amazonaws.services.s3.AbstractAmazonS3;
import com.amazonaws.services.s3.S3ResponseMetadata;
import com.amazonaws.services.s3.model.AbortMultipartUploadRequest;
import com.amazonaws.services.s3.model.AccessControlList;
@@ -49,7 +48,6 @@ import com.amazonaws.services.s3.model.CreateBucketRequest;
import com.amazonaws.services.s3.model.DeleteBucketRequest;
import com.amazonaws.services.s3.model.DeleteObjectRequest;
import com.amazonaws.services.s3.model.DeleteVersionRequest;
-import com.amazonaws.services.s3.model.EncryptionMaterials;
import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
import com.amazonaws.services.s3.model.GetObjectMetadataRequest;
import com.amazonaws.services.s3.model.GetObjectRequest;
@@ -72,7 +70,6 @@ import com.amazonaws.services.s3.model.S3Object;
import com.amazonaws.services.s3.model.S3ObjectSummary;
import com.amazonaws.services.s3.model.SetBucketLoggingConfigurationRequest;
import com.amazonaws.services.s3.model.SetBucketVersioningConfigurationRequest;
-import com.amazonaws.services.s3.model.StaticEncryptionMaterialsProvider;
import com.amazonaws.services.s3.model.StorageClass;
import com.amazonaws.services.s3.model.UploadPartRequest;
import com.amazonaws.services.s3.model.UploadPartResult;
@@ -81,7 +78,7 @@ import com.amazonaws.services.s3.model.VersionListing;
import org.apache.camel.util.ObjectHelper;
import org.junit.Assert;
-public class AmazonS3EncryptionClientMock extends AmazonS3EncryptionClient {
+public class AmazonS3EncryptionClientMock extends AbstractAmazonS3 {
List<S3Object> objects = new CopyOnWriteArrayList<>();
List<PutObjectRequest> putObjectRequests = new CopyOnWriteArrayList<>();
@@ -91,7 +88,7 @@ public class AmazonS3EncryptionClientMock extends AmazonS3EncryptionClient {
private int maxCapacity = 100;
public AmazonS3EncryptionClientMock() {
- super(new StaticEncryptionMaterialsProvider(new EncryptionMaterials(new KeyPair(null, null))));
+ super();
}
@Override
[camel] 05/09: Camel-AWS: Fix a missing import
Posted by ac...@apache.org.
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 fe3ec542fa67f8e2550bf9aae6427d4ca012802e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 3 10:31:07 2018 +0200
Camel-AWS: Fix a missing import
---
.../org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
index 1008c9f..8c4ab2b 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
@@ -54,6 +54,7 @@ import com.amazonaws.services.lambda.model.GetFunctionResult;
import com.amazonaws.services.lambda.model.GetPolicyRequest;
import com.amazonaws.services.lambda.model.GetPolicyResult;
import com.amazonaws.services.lambda.model.InvokeAsyncRequest;
+import com.amazonaws.services.lambda.model.InvokeAsyncResult;
import com.amazonaws.services.lambda.model.InvokeRequest;
import com.amazonaws.services.lambda.model.InvokeResult;
import com.amazonaws.services.lambda.model.ListAliasesRequest;
[camel] 02/09: Camel-AWS: Lets use AbstractAmazonDynamoDB in the
AWS DDB Client Mock for tests
Posted by ac...@apache.org.
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 b60b56d3032afc14ceb6736f0bc09ea7a6f8bb65
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 3 09:52:44 2018 +0200
Camel-AWS: Lets use AbstractAmazonDynamoDB in the AWS DDB Client Mock for tests
---
.../org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java | 7 +++----
.../org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java | 7 +++----
.../org/apache/camel/component/aws/iam/AmazonIAMClientMock.java | 4 ++--
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
index d5d549a..01640d1 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddb/AmazonDDBClientMock.java
@@ -22,8 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
+import com.amazonaws.services.dynamodbv2.AbstractAmazonDynamoDB;
import com.amazonaws.services.dynamodbv2.model.AttributeValue;
import com.amazonaws.services.dynamodbv2.model.BatchGetItemRequest;
import com.amazonaws.services.dynamodbv2.model.BatchGetItemResult;
@@ -56,7 +55,7 @@ import com.amazonaws.services.dynamodbv2.model.UpdateTableRequest;
import com.amazonaws.services.dynamodbv2.model.UpdateTableResult;
-public class AmazonDDBClientMock extends AmazonDynamoDBClient {
+public class AmazonDDBClientMock extends AbstractAmazonDynamoDB {
public static final long NOW = 1327709390233L;
DescribeTableRequest describeTableRequest;
CreateTableRequest createTableRequest;
@@ -71,7 +70,7 @@ public class AmazonDDBClientMock extends AmazonDynamoDBClient {
QueryRequest queryRequest;
public AmazonDDBClientMock() {
- super(new BasicAWSCredentials("user", "secret"));
+ super();
}
@Override
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
index ff9502f..956329f 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
@@ -21,8 +21,7 @@ import java.util.Collection;
import java.util.Iterator;
import com.amazonaws.AmazonServiceException;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.ec2.AmazonEC2Client;
+import com.amazonaws.services.ec2.AbstractAmazonEC2;
import com.amazonaws.services.ec2.model.CreateTagsRequest;
import com.amazonaws.services.ec2.model.CreateTagsResult;
import com.amazonaws.services.ec2.model.DeleteTagsRequest;
@@ -59,10 +58,10 @@ import com.amazonaws.services.ec2.model.UnmonitorInstancesResult;
import org.apache.camel.util.ObjectHelper;
-public class AmazonEC2ClientMock extends AmazonEC2Client {
+public class AmazonEC2ClientMock extends AbstractAmazonEC2 {
public AmazonEC2ClientMock() {
- super(new BasicAWSCredentials("user", "secret"));
+ super();
}
@Override
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
index d501188..560ea70 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/iam/AmazonIAMClientMock.java
@@ -24,7 +24,7 @@ import java.util.List;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.ResponseMetadata;
import com.amazonaws.regions.Region;
-import com.amazonaws.services.identitymanagement.AmazonIdentityManagementClient;
+import com.amazonaws.services.identitymanagement.AbstractAmazonIdentityManagement;
import com.amazonaws.services.identitymanagement.model.AccessKey;
import com.amazonaws.services.identitymanagement.model.AccessKeyMetadata;
import com.amazonaws.services.identitymanagement.model.AddClientIDToOpenIDConnectProviderRequest;
@@ -275,7 +275,7 @@ import com.amazonaws.services.identitymanagement.model.UploadSigningCertificateR
import com.amazonaws.services.identitymanagement.model.User;
import com.amazonaws.services.identitymanagement.waiters.AmazonIdentityManagementWaiters;
-public class AmazonIAMClientMock extends AmazonIdentityManagementClient {
+public class AmazonIAMClientMock extends AbstractAmazonIdentityManagement {
@Override
public void setEndpoint(String endpoint) {
[camel] 08/09: Camel-AWS: Lets use AbstractAmazonSNS in the AWS SNS
Client Mock for tests
Posted by ac...@apache.org.
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 4b55eea33c1143abcb8ad029b7b09a30d0161356
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 3 10:37:31 2018 +0200
Camel-AWS: Lets use AbstractAmazonSNS in the AWS SNS Client Mock for tests
---
.../org/apache/camel/component/aws/sns/AmazonSNSClientMock.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
index 4de4323..368ca98 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
@@ -23,8 +23,7 @@ import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.ResponseMetadata;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.sns.AmazonSNSClient;
+import com.amazonaws.services.sns.AbstractAmazonSNS;
import com.amazonaws.services.sns.model.AddPermissionRequest;
import com.amazonaws.services.sns.model.AddPermissionResult;
import com.amazonaws.services.sns.model.ConfirmSubscriptionRequest;
@@ -55,13 +54,13 @@ import com.amazonaws.services.sns.model.UnsubscribeResult;
import org.junit.Assert;
-public class AmazonSNSClientMock extends AmazonSNSClient {
+public class AmazonSNSClientMock extends AbstractAmazonSNS {
private static final String DEFAULT_TOPIC_ARN = "arn:aws:sns:us-east-1:541925086079:MyTopic";
private String endpoint;
public AmazonSNSClientMock() {
- super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));
+ super();
}
@Override
[camel] 04/09: Camel-AWS: Lets use AbstractAWSLambda in the AWS
Lambda Client Mock for tests
Posted by ac...@apache.org.
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 58c33dab695f56b130391a0b5bd31f8c0cb9fddc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 3 10:27:46 2018 +0200
Camel-AWS: Lets use AbstractAWSLambda in the AWS Lambda Client Mock for tests
---
.../apache/camel/component/aws/lambda/AmazonLambdaClientMock.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
index b367195..1008c9f 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/lambda/AmazonLambdaClientMock.java
@@ -23,7 +23,7 @@ import com.amazonaws.AmazonServiceException;
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.ResponseMetadata;
import com.amazonaws.regions.Region;
-import com.amazonaws.services.lambda.AWSLambda;
+import com.amazonaws.services.lambda.AbstractAWSLambda;
import com.amazonaws.services.lambda.model.AddPermissionRequest;
import com.amazonaws.services.lambda.model.AddPermissionResult;
import com.amazonaws.services.lambda.model.CreateAliasRequest;
@@ -54,7 +54,6 @@ import com.amazonaws.services.lambda.model.GetFunctionResult;
import com.amazonaws.services.lambda.model.GetPolicyRequest;
import com.amazonaws.services.lambda.model.GetPolicyResult;
import com.amazonaws.services.lambda.model.InvokeAsyncRequest;
-import com.amazonaws.services.lambda.model.InvokeAsyncResult;
import com.amazonaws.services.lambda.model.InvokeRequest;
import com.amazonaws.services.lambda.model.InvokeResult;
import com.amazonaws.services.lambda.model.ListAliasesRequest;
@@ -92,7 +91,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.joda.time.DateTime;
-public class AmazonLambdaClientMock implements AWSLambda {
+public class AmazonLambdaClientMock extends AbstractAWSLambda {
public AmazonLambdaClientMock() {
super();
[camel] 06/09: Camel-AWS: Lets use AbstractAmazonSimpleDB in the
AWS SDB Client Mock for tests
Posted by ac...@apache.org.
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 bda0d0c508cc4540cbaf1157977e3c7b25e31cce
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 3 10:33:16 2018 +0200
Camel-AWS: Lets use AbstractAmazonSimpleDB in the AWS SDB Client Mock for tests
---
.../org/apache/camel/component/aws/sdb/AmazonSDBClientMock.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/AmazonSDBClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/AmazonSDBClientMock.java
index 2d51d58..2cd9e4f 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/AmazonSDBClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/AmazonSDBClientMock.java
@@ -18,8 +18,7 @@ package org.apache.camel.component.aws.sdb;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.simpledb.AmazonSimpleDBClient;
+import com.amazonaws.services.simpledb.AbstractAmazonSimpleDB;
import com.amazonaws.services.simpledb.model.Attribute;
import com.amazonaws.services.simpledb.model.BatchDeleteAttributesRequest;
import com.amazonaws.services.simpledb.model.BatchDeleteAttributesResult;
@@ -44,7 +43,7 @@ import com.amazonaws.services.simpledb.model.PutAttributesResult;
import com.amazonaws.services.simpledb.model.SelectRequest;
import com.amazonaws.services.simpledb.model.SelectResult;
-public class AmazonSDBClientMock extends AmazonSimpleDBClient {
+public class AmazonSDBClientMock extends AbstractAmazonSimpleDB {
protected BatchDeleteAttributesRequest batchDeleteAttributesRequest;
protected BatchPutAttributesRequest batchPutAttributesRequest;
@@ -58,7 +57,7 @@ public class AmazonSDBClientMock extends AmazonSimpleDBClient {
protected SelectRequest selectRequest;
public AmazonSDBClientMock() {
- super(new BasicAWSCredentials("user", "secret"));
+ super();
}
@Override