You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/03/18 23:33:26 UTC
svn commit: r1458048 - in
/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws:
s3/ sdb/ sns/ sqs/
Author: cmueller
Date: Mon Mar 18 22:33:25 2013
New Revision: 1458048
URL: http://svn.apache.org/r1458048
Log:
CAMEL-6177: Camel-AWS should support any implementation of AmazonXXX (not only AmazonXXXClient)
Modified:
camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
Modified: camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java?rev=1458048&r1=1458047&r2=1458048&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java (original)
+++ camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java Mon Mar 18 22:33:25 2013
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws.s3;
-import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3;
/**
* The AWS S3 component configuration properties
@@ -26,7 +26,7 @@ public class S3Configuration implements
private String accessKey;
private String secretKey;
- private AmazonS3Client amazonS3Client;
+ private AmazonS3 amazonS3Client;
private String bucketName;
private String region;
@@ -59,11 +59,11 @@ public class S3Configuration implements
this.secretKey = secretKey;
}
- public AmazonS3Client getAmazonS3Client() {
+ public AmazonS3 getAmazonS3Client() {
return amazonS3Client;
}
- public void setAmazonS3Client(AmazonS3Client amazonS3Client) {
+ public void setAmazonS3Client(AmazonS3 amazonS3Client) {
this.amazonS3Client = amazonS3Client;
}
Modified: camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java?rev=1458048&r1=1458047&r2=1458048&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java Mon Mar 18 22:33:25 2013
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Queue;
import com.amazonaws.AmazonClientException;
-import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.ListObjectsRequest;
import com.amazonaws.services.s3.model.ObjectListing;
import com.amazonaws.services.s3.model.S3Object;
@@ -218,7 +218,7 @@ public class S3Consumer extends Schedule
return getEndpoint().getConfiguration();
}
- protected AmazonS3Client getAmazonS3Client() {
+ protected AmazonS3 getAmazonS3Client() {
return getEndpoint().getS3Client();
}
Modified: camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java?rev=1458048&r1=1458047&r2=1458048&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java (original)
+++ camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java Mon Mar 18 22:33:25 2013
@@ -19,6 +19,7 @@ package org.apache.camel.component.aws.s
import com.amazonaws.AmazonServiceException;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.model.CreateBucketRequest;
import com.amazonaws.services.s3.model.ListObjectsRequest;
@@ -46,7 +47,7 @@ public class S3Endpoint extends Schedule
private static final Logger LOG = LoggerFactory.getLogger(S3Endpoint.class);
- private AmazonS3Client s3Client;
+ private AmazonS3 s3Client;
private S3Configuration configuration;
private int maxMessagesPerPoll = 10;
@@ -152,11 +153,11 @@ public class S3Endpoint extends Schedule
this.configuration = configuration;
}
- public void setS3Client(AmazonS3Client s3Client) {
+ public void setS3Client(AmazonS3 s3Client) {
this.s3Client = s3Client;
}
- public AmazonS3Client getS3Client() {
+ public AmazonS3 getS3Client() {
if (s3Client == null) {
s3Client = configuration.getAmazonS3Client() != null
? configuration.getAmazonS3Client() : createS3Client();
@@ -170,9 +171,9 @@ public class S3Endpoint extends Schedule
*
* @return AmazonS3Client
*/
- AmazonS3Client createS3Client() {
+ AmazonS3 createS3Client() {
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
- AmazonS3Client client = new AmazonS3Client(credentials);
+ AmazonS3 client = new AmazonS3Client(credentials);
if (configuration.getAmazonS3Endpoint() != null) {
client.setEndpoint(configuration.getAmazonS3Endpoint());
}
Modified: camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java?rev=1458048&r1=1458047&r2=1458048&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java (original)
+++ camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java Mon Mar 18 22:33:25 2013
@@ -92,9 +92,9 @@ public class SdbEndpoint extends Schedul
return configuration.getAmazonSDBClient() != null ? configuration.getAmazonSDBClient() : createSdbClient();
}
- AmazonSimpleDBClient createSdbClient() {
+ AmazonSimpleDB createSdbClient() {
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
- AmazonSimpleDBClient client = new AmazonSimpleDBClient(credentials);
+ AmazonSimpleDB client = new AmazonSimpleDBClient(credentials);
if (configuration.getAmazonSdbEndpoint() != null) {
client.setEndpoint(configuration.getAmazonSdbEndpoint());
}
Modified: camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java?rev=1458048&r1=1458047&r2=1458048&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java (original)
+++ camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java Mon Mar 18 22:33:25 2013
@@ -20,13 +20,13 @@ package org.apache.camel.component.aws.s
* The AWS SNS component configuration properties
*
*/
-import com.amazonaws.services.sns.AmazonSNSClient;
+import com.amazonaws.services.sns.AmazonSNS;
public class SnsConfiguration implements Cloneable {
// Common properties
private String topicName;
- private AmazonSNSClient amazonSNSClient;
+ private AmazonSNS amazonSNSClient;
private String accessKey;
private String secretKey;
private String amazonSNSEndpoint;
@@ -76,11 +76,11 @@ public class SnsConfiguration implements
this.secretKey = secretKey;
}
- public AmazonSNSClient getAmazonSNSClient() {
+ public AmazonSNS getAmazonSNSClient() {
return amazonSNSClient;
}
- public void setAmazonSNSClient(AmazonSNSClient amazonSNSClient) {
+ public void setAmazonSNSClient(AmazonSNS amazonSNSClient) {
this.amazonSNSClient = amazonSNSClient;
}
Modified: camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java?rev=1458048&r1=1458047&r2=1458048&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java (original)
+++ camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java Mon Mar 18 22:33:25 2013
@@ -18,6 +18,7 @@ package org.apache.camel.component.aws.s
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.sns.AmazonSNS;
import com.amazonaws.services.sns.AmazonSNSClient;
import com.amazonaws.services.sns.model.CreateTopicRequest;
import com.amazonaws.services.sns.model.CreateTopicResult;
@@ -41,7 +42,7 @@ public class SnsEndpoint extends Default
private static final Logger LOG = LoggerFactory.getLogger(SnsEndpoint.class);
private SnsConfiguration configuration;
- private AmazonSNSClient snsClient;
+ private AmazonSNS snsClient;
@Deprecated
public SnsEndpoint(String uri, CamelContext context, SnsConfiguration configuration) {
@@ -96,11 +97,11 @@ public class SnsEndpoint extends Default
this.configuration = configuration;
}
- public void setSNSClient(AmazonSNSClient snsClient) {
+ public void setSNSClient(AmazonSNS snsClient) {
this.snsClient = snsClient;
}
- public AmazonSNSClient getSNSClient() {
+ public AmazonSNS getSNSClient() {
if (snsClient == null) {
snsClient = configuration.getAmazonSNSClient() != null
? configuration.getAmazonSNSClient() : createSNSClient();
@@ -114,9 +115,9 @@ public class SnsEndpoint extends Default
*
* @return AmazonSNSClient
*/
- AmazonSNSClient createSNSClient() {
+ AmazonSNS createSNSClient() {
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
- AmazonSNSClient client = new AmazonSNSClient(credentials);
+ AmazonSNS client = new AmazonSNSClient(credentials);
if (configuration.getAmazonSNSEndpoint() != null) {
client.setEndpoint(configuration.getAmazonSNSEndpoint());
}
Modified: camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java?rev=1458048&r1=1458047&r2=1458048&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java (original)
+++ camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java Mon Mar 18 22:33:25 2013
@@ -18,7 +18,7 @@ package org.apache.camel.component.aws.s
import java.util.Collection;
-import com.amazonaws.services.sqs.AmazonSQSClient;
+import com.amazonaws.services.sqs.AmazonSQS;
/**
* The AWS SQS component configuration properties
@@ -28,7 +28,7 @@ public class SqsConfiguration {
// common properties
private String queueName;
- private AmazonSQSClient amazonSQSClient;
+ private AmazonSQS amazonSQSClient;
private String accessKey;
private String secretKey;
private String amazonSQSEndpoint;
@@ -87,11 +87,11 @@ public class SqsConfiguration {
this.deleteAfterRead = deleteAfterRead;
}
- public AmazonSQSClient getAmazonSQSClient() {
+ public AmazonSQS getAmazonSQSClient() {
return amazonSQSClient;
}
- public void setAmazonSQSClient(AmazonSQSClient amazonSQSClient) {
+ public void setAmazonSQSClient(AmazonSQS amazonSQSClient) {
this.amazonSQSClient = amazonSQSClient;
}
@@ -167,4 +167,4 @@ public class SqsConfiguration {
+ ", policy=" + policy
+ "]";
}
-}
\ No newline at end of file
+}
Modified: camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java?rev=1458048&r1=1458047&r2=1458048&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java Mon Mar 18 22:33:25 2013
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Queue;
import com.amazonaws.AmazonClientException;
-import com.amazonaws.services.sqs.AmazonSQSClient;
+import com.amazonaws.services.sqs.AmazonSQS;
import com.amazonaws.services.sqs.model.DeleteMessageRequest;
import com.amazonaws.services.sqs.model.Message;
import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
@@ -218,7 +218,7 @@ public class SqsConsumer extends Schedul
return getEndpoint().getConfiguration();
}
- protected AmazonSQSClient getClient() {
+ protected AmazonSQS getClient() {
return getEndpoint().getClient();
}
Modified: camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java?rev=1458048&r1=1458047&r2=1458048&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java (original)
+++ camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java Mon Mar 18 22:33:25 2013
@@ -20,6 +20,7 @@ import java.util.HashMap;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.sqs.AmazonSQS;
import com.amazonaws.services.sqs.AmazonSQSClient;
import com.amazonaws.services.sqs.model.CreateQueueRequest;
import com.amazonaws.services.sqs.model.CreateQueueResult;
@@ -47,7 +48,7 @@ public class SqsEndpoint extends Schedul
private static final transient Logger LOG = LoggerFactory.getLogger(SqsEndpoint.class);
- private AmazonSQSClient client;
+ private AmazonSQS client;
private String queueUrl;
private SqsConfiguration configuration;
private int maxMessagesPerPoll;
@@ -93,7 +94,7 @@ public class SqsEndpoint extends Schedul
}
}
- private void createQueue(AmazonSQSClient client) {
+ private void createQueue(AmazonSQS client) {
LOG.trace("Queue '{}' doesn't exist. Will create it...", configuration.getQueueName());
// creates a new queue, or returns the URL of an existing one
@@ -118,7 +119,7 @@ public class SqsEndpoint extends Schedul
LOG.trace("Queue created and available at: {}", queueUrl);
}
- private void updateQueueAttributes(AmazonSQSClient client) {
+ private void updateQueueAttributes(AmazonSQS client) {
SetQueueAttributesRequest request = new SetQueueAttributesRequest();
request.setQueueUrl(queueUrl);
if (getConfiguration().getDefaultVisibilityTimeout() != null) {
@@ -171,14 +172,14 @@ public class SqsEndpoint extends Schedul
this.configuration = configuration;
}
- public AmazonSQSClient getClient() {
+ public AmazonSQS getClient() {
if (client == null) {
client = createClient();
}
return client;
}
- public void setClient(AmazonSQSClient client) {
+ public void setClient(AmazonSQS client) {
this.client = client;
}
@@ -186,9 +187,9 @@ public class SqsEndpoint extends Schedul
* Provide the possibility to override this method for an mock implementation
* @return AmazonSQSClient
*/
- AmazonSQSClient createClient() {
+ AmazonSQS createClient() {
AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey());
- AmazonSQSClient client = new AmazonSQSClient(credentials);
+ AmazonSQS client = new AmazonSQSClient(credentials);
if (configuration.getAmazonSQSEndpoint() != null) {
client.setEndpoint(configuration.getAmazonSQSEndpoint());
}
Modified: camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java?rev=1458048&r1=1458047&r2=1458048&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java Mon Mar 18 22:33:25 2013
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.aws.sqs;
-import com.amazonaws.services.sqs.AmazonSQSClient;
+import com.amazonaws.services.sqs.AmazonSQS;
import com.amazonaws.services.sqs.model.SendMessageRequest;
import com.amazonaws.services.sqs.model.SendMessageResult;
@@ -67,7 +67,7 @@ public class SqsProducer extends Default
return exchange.getIn();
}
- protected AmazonSQSClient getClient() {
+ protected AmazonSQS getClient() {
return getEndpoint().getClient();
}