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 2016/06/07 12:48:54 UTC
camel git commit: Upgrade AWS SDK and related bundle to version 1.11.5
Repository: camel
Updated Branches:
refs/heads/master 668cba682 -> cacec0a08
Upgrade AWS SDK and related bundle to version 1.11.5
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cacec0a0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cacec0a0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cacec0a0
Branch: refs/heads/master
Commit: cacec0a085fe6fd5e4195a7a5f12ed833872aa91
Parents: 668cba6
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 7 14:46:52 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 7 14:46:52 2016 +0200
----------------------------------------------------------------------
.../component/aws/ec2/AmazonEC2ClientMock.java | 5 ++--
.../component/aws/sdb/AmazonSDBClientMock.java | 24 +++++++++++++++-----
.../component/aws/sns/AmazonSNSClientMock.java | 16 +++++++++----
.../component/aws/sqs/AmazonSQSClientMock.java | 12 +++++++---
.../sqs/SqsEndpointUseExistingQueueTest.java | 5 ++--
parent/pom.xml | 4 ++--
6 files changed, 46 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cacec0a0/components/camel-aws/src/test/java/org/apache/camel/component/aws/ec2/AmazonEC2ClientMock.java
----------------------------------------------------------------------
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 80572c1..ef79de3 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
@@ -40,6 +40,7 @@ import com.amazonaws.services.ec2.model.MonitorInstancesResult;
import com.amazonaws.services.ec2.model.Monitoring;
import com.amazonaws.services.ec2.model.MonitoringState;
import com.amazonaws.services.ec2.model.RebootInstancesRequest;
+import com.amazonaws.services.ec2.model.RebootInstancesResult;
import com.amazonaws.services.ec2.model.Reservation;
import com.amazonaws.services.ec2.model.RunInstancesRequest;
import com.amazonaws.services.ec2.model.RunInstancesResult;
@@ -254,8 +255,8 @@ public class AmazonEC2ClientMock extends AmazonEC2Client {
}
@Override
- public void rebootInstances(RebootInstancesRequest rebootInstancesRequest) {
- return;
+ public RebootInstancesResult rebootInstances(RebootInstancesRequest rebootInstancesRequest) {
+ return new RebootInstancesResult();
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/cacec0a0/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/AmazonSDBClientMock.java
----------------------------------------------------------------------
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 d56c3e1..2d51d58 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
@@ -22,10 +22,15 @@ import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.simpledb.AmazonSimpleDBClient;
import com.amazonaws.services.simpledb.model.Attribute;
import com.amazonaws.services.simpledb.model.BatchDeleteAttributesRequest;
+import com.amazonaws.services.simpledb.model.BatchDeleteAttributesResult;
import com.amazonaws.services.simpledb.model.BatchPutAttributesRequest;
+import com.amazonaws.services.simpledb.model.BatchPutAttributesResult;
import com.amazonaws.services.simpledb.model.CreateDomainRequest;
+import com.amazonaws.services.simpledb.model.CreateDomainResult;
import com.amazonaws.services.simpledb.model.DeleteAttributesRequest;
+import com.amazonaws.services.simpledb.model.DeleteAttributesResult;
import com.amazonaws.services.simpledb.model.DeleteDomainRequest;
+import com.amazonaws.services.simpledb.model.DeleteDomainResult;
import com.amazonaws.services.simpledb.model.DomainMetadataRequest;
import com.amazonaws.services.simpledb.model.DomainMetadataResult;
import com.amazonaws.services.simpledb.model.GetAttributesRequest;
@@ -35,6 +40,7 @@ import com.amazonaws.services.simpledb.model.ListDomainsRequest;
import com.amazonaws.services.simpledb.model.ListDomainsResult;
import com.amazonaws.services.simpledb.model.NoSuchDomainException;
import com.amazonaws.services.simpledb.model.PutAttributesRequest;
+import com.amazonaws.services.simpledb.model.PutAttributesResult;
import com.amazonaws.services.simpledb.model.SelectRequest;
import com.amazonaws.services.simpledb.model.SelectResult;
@@ -56,33 +62,38 @@ public class AmazonSDBClientMock extends AmazonSimpleDBClient {
}
@Override
- public void batchDeleteAttributes(BatchDeleteAttributesRequest batchDeleteAttributesRequest) throws AmazonServiceException, AmazonClientException {
+ public BatchDeleteAttributesResult batchDeleteAttributes(BatchDeleteAttributesRequest batchDeleteAttributesRequest) throws AmazonServiceException, AmazonClientException {
this.batchDeleteAttributesRequest = batchDeleteAttributesRequest;
+ return new BatchDeleteAttributesResult();
}
@Override
- public void batchPutAttributes(BatchPutAttributesRequest batchPutAttributesRequest) throws AmazonServiceException, AmazonClientException {
+ public BatchPutAttributesResult batchPutAttributes(BatchPutAttributesRequest batchPutAttributesRequest) throws AmazonServiceException, AmazonClientException {
this.batchPutAttributesRequest = batchPutAttributesRequest;
+ return new BatchPutAttributesResult();
}
@Override
- public void createDomain(CreateDomainRequest createDomainRequest) throws AmazonServiceException, AmazonClientException {
+ public CreateDomainResult createDomain(CreateDomainRequest createDomainRequest) throws AmazonServiceException, AmazonClientException {
this.createDomainRequest = createDomainRequest;
+ return new CreateDomainResult();
}
@Override
- public void deleteAttributes(DeleteAttributesRequest deleteAttributesRequest) throws AmazonServiceException, AmazonClientException {
+ public DeleteAttributesResult deleteAttributes(DeleteAttributesRequest deleteAttributesRequest) throws AmazonServiceException, AmazonClientException {
this.deleteAttributesRequest = deleteAttributesRequest;
String domainName = deleteAttributesRequest.getDomainName();
if ("MissingDomain".equals(domainName)) {
throw new NoSuchDomainException(domainName);
}
+ return new DeleteAttributesResult();
}
@Override
- public void deleteDomain(DeleteDomainRequest deleteDomainRequest) throws AmazonServiceException, AmazonClientException {
+ public DeleteDomainResult deleteDomain(DeleteDomainRequest deleteDomainRequest) throws AmazonServiceException, AmazonClientException {
this.deleteDomainRequest = deleteDomainRequest;
+ return new DeleteDomainResult();
}
@Override
@@ -125,8 +136,9 @@ public class AmazonSDBClientMock extends AmazonSimpleDBClient {
}
@Override
- public void putAttributes(PutAttributesRequest putAttributesRequest) throws AmazonServiceException, AmazonClientException {
+ public PutAttributesResult putAttributes(PutAttributesRequest putAttributesRequest) throws AmazonServiceException, AmazonClientException {
this.putAttributesRequest = putAttributesRequest;
+ return new PutAttributesResult();
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/cacec0a0/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
----------------------------------------------------------------------
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 3096017..3908060 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,11 +23,13 @@ import com.amazonaws.ResponseMetadata;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.sns.AmazonSNSClient;
import com.amazonaws.services.sns.model.AddPermissionRequest;
+import com.amazonaws.services.sns.model.AddPermissionResult;
import com.amazonaws.services.sns.model.ConfirmSubscriptionRequest;
import com.amazonaws.services.sns.model.ConfirmSubscriptionResult;
import com.amazonaws.services.sns.model.CreateTopicRequest;
import com.amazonaws.services.sns.model.CreateTopicResult;
import com.amazonaws.services.sns.model.DeleteTopicRequest;
+import com.amazonaws.services.sns.model.DeleteTopicResult;
import com.amazonaws.services.sns.model.GetTopicAttributesRequest;
import com.amazonaws.services.sns.model.GetTopicAttributesResult;
import com.amazonaws.services.sns.model.ListSubscriptionsByTopicRequest;
@@ -39,10 +41,13 @@ import com.amazonaws.services.sns.model.ListTopicsResult;
import com.amazonaws.services.sns.model.PublishRequest;
import com.amazonaws.services.sns.model.PublishResult;
import com.amazonaws.services.sns.model.RemovePermissionRequest;
+import com.amazonaws.services.sns.model.RemovePermissionResult;
import com.amazonaws.services.sns.model.SetTopicAttributesRequest;
+import com.amazonaws.services.sns.model.SetTopicAttributesResult;
import com.amazonaws.services.sns.model.SubscribeRequest;
import com.amazonaws.services.sns.model.SubscribeResult;
import com.amazonaws.services.sns.model.UnsubscribeRequest;
+import com.amazonaws.services.sns.model.UnsubscribeResult;
import org.junit.Assert;
@@ -80,19 +85,20 @@ public class AmazonSNSClientMock extends AmazonSNSClient {
}
@Override
- public void setTopicAttributes(SetTopicAttributesRequest setTopicAttributesRequest) throws AmazonServiceException, AmazonClientException {
+ public SetTopicAttributesResult setTopicAttributes(SetTopicAttributesRequest setTopicAttributesRequest) throws AmazonServiceException, AmazonClientException {
Assert.assertEquals(DEFAULT_TOPIC_ARN, setTopicAttributesRequest.getTopicArn());
Assert.assertEquals("Policy", setTopicAttributesRequest.getAttributeName());
Assert.assertEquals("XXX", setTopicAttributesRequest.getAttributeValue());
+ return new SetTopicAttributesResult();
}
@Override
- public void deleteTopic(DeleteTopicRequest deleteTopicRequest) throws AmazonServiceException, AmazonClientException {
+ public DeleteTopicResult deleteTopic(DeleteTopicRequest deleteTopicRequest) throws AmazonServiceException, AmazonClientException {
throw new UnsupportedOperationException();
}
@Override
- public void removePermission(RemovePermissionRequest removePermissionRequest) throws AmazonServiceException, AmazonClientException {
+ public RemovePermissionResult removePermission(RemovePermissionRequest removePermissionRequest) throws AmazonServiceException, AmazonClientException {
throw new UnsupportedOperationException();
}
@@ -102,7 +108,7 @@ public class AmazonSNSClientMock extends AmazonSNSClient {
}
@Override
- public void addPermission(AddPermissionRequest addPermissionRequest) throws AmazonServiceException, AmazonClientException {
+ public AddPermissionResult addPermission(AddPermissionRequest addPermissionRequest) throws AmazonServiceException, AmazonClientException {
throw new UnsupportedOperationException();
}
@@ -119,7 +125,7 @@ public class AmazonSNSClientMock extends AmazonSNSClient {
}
@Override
- public void unsubscribe(UnsubscribeRequest unsubscribeRequest) throws AmazonServiceException, AmazonClientException {
+ public UnsubscribeResult unsubscribe(UnsubscribeRequest unsubscribeRequest) throws AmazonServiceException, AmazonClientException {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cacec0a0/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java
----------------------------------------------------------------------
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 69e75cd..451267b 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
@@ -33,9 +33,11 @@ import com.amazonaws.AmazonServiceException;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.sqs.AmazonSQSClient;
import com.amazonaws.services.sqs.model.ChangeMessageVisibilityRequest;
+import com.amazonaws.services.sqs.model.ChangeMessageVisibilityResult;
import com.amazonaws.services.sqs.model.CreateQueueRequest;
import com.amazonaws.services.sqs.model.CreateQueueResult;
import com.amazonaws.services.sqs.model.DeleteMessageRequest;
+import com.amazonaws.services.sqs.model.DeleteMessageResult;
import com.amazonaws.services.sqs.model.ListQueuesResult;
import com.amazonaws.services.sqs.model.Message;
import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
@@ -43,6 +45,7 @@ import com.amazonaws.services.sqs.model.ReceiveMessageResult;
import com.amazonaws.services.sqs.model.SendMessageRequest;
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 {
@@ -151,16 +154,17 @@ public class AmazonSQSClientMock extends AmazonSQSClient {
}
@Override
- public void deleteMessage(DeleteMessageRequest deleteMessageRequest) throws AmazonClientException {
+ public DeleteMessageResult deleteMessage(DeleteMessageRequest deleteMessageRequest) throws AmazonClientException {
String receiptHandle = deleteMessageRequest.getReceiptHandle();
if (inFlight.containsKey(receiptHandle)) {
ScheduledFuture inFlightTask = inFlight.get(receiptHandle);
inFlightTask.cancel(true);
}
+ return new DeleteMessageResult();
}
@Override
- public void setQueueAttributes(SetQueueAttributesRequest setQueueAttributesRequest) throws AmazonServiceException, AmazonClientException {
+ public SetQueueAttributesResult setQueueAttributes(SetQueueAttributesRequest setQueueAttributesRequest) throws AmazonServiceException, AmazonClientException {
synchronized (queueAttributes) {
if (!queueAttributes.containsKey(setQueueAttributesRequest.getQueueUrl())) {
queueAttributes.put(setQueueAttributesRequest.getQueueUrl(), new HashMap<String, String>());
@@ -169,10 +173,12 @@ public class AmazonSQSClientMock extends AmazonSQSClient {
queueAttributes.get(setQueueAttributesRequest.getQueueUrl()).put(entry.getKey(), entry.getValue());
}
}
+ return new SetQueueAttributesResult();
}
@Override
- public void changeMessageVisibility(ChangeMessageVisibilityRequest changeMessageVisibilityRequest) throws AmazonServiceException, AmazonClientException {
+ public ChangeMessageVisibilityResult changeMessageVisibility(ChangeMessageVisibilityRequest changeMessageVisibilityRequest) throws AmazonServiceException, AmazonClientException {
this.changeMessageVisibilityRequests.add(changeMessageVisibilityRequest);
+ return new ChangeMessageVisibilityResult();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/cacec0a0/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java
index 2a48d91..6d6c4d3 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java
@@ -29,6 +29,7 @@ import com.amazonaws.services.sqs.model.Message;
import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
import com.amazonaws.services.sqs.model.ReceiveMessageResult;
import com.amazonaws.services.sqs.model.SetQueueAttributesRequest;
+import com.amazonaws.services.sqs.model.SetQueueAttributesResult;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
@@ -91,8 +92,8 @@ public class SqsEndpointUseExistingQueueTest extends CamelTestSupport {
}
@Override
- public void setQueueAttributes(SetQueueAttributesRequest setQueueAttributesRequest) throws AmazonServiceException, AmazonClientException {
- // noop
+ public SetQueueAttributesResult setQueueAttributes(SetQueueAttributesRequest setQueueAttributesRequest) throws AmazonServiceException, AmazonClientException {
+ return new SetQueueAttributesResult();
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/cacec0a0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 73760bb..b2b1b74 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -65,8 +65,8 @@
<avro-bundle-version>1.8.1_1</avro-bundle-version>
<avro-ipc-bundle-version>1.8.1_1</avro-ipc-bundle-version>
<awaitility.version>1.7.0</awaitility.version>
- <aws-java-sdk-bundle-version>1.10.73_1</aws-java-sdk-bundle-version>
- <aws-java-sdk-version>1.10.73</aws-java-sdk-version>
+ <aws-java-sdk-bundle-version>1.11.5_1</aws-java-sdk-bundle-version>
+ <aws-java-sdk-version>1.11.5</aws-java-sdk-version>
<axiom-version>1.2.14</axiom-version>
<backport-util-concurrent-version>3.1</backport-util-concurrent-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>