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/07/26 10:06:48 UTC
[3/3] camel git commit: CAMEL-10183: Camel-Aws: add list and delete
buckets operations on the S3 Producer Endpoint - Fixed Spring Tests
CAMEL-10183: Camel-Aws: add list and delete buckets operations on the S3 Producer Endpoint - Fixed Spring Tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59c3420d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59c3420d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59c3420d
Branch: refs/heads/master
Commit: 59c3420d88aa4962141752ba8464b19f643a8454
Parents: cd0887c
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jul 26 11:55:36 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jul 26 12:01:51 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/aws/s3/S3Configuration.java | 2 +-
.../main/java/org/apache/camel/component/aws/s3/S3Producer.java | 2 +-
.../camel/component/aws/s3/S3ComponentListBucketsSpringTest.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/59c3420d/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
index d363025..d25d0da 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
@@ -62,7 +62,7 @@ public class S3Configuration implements Cloneable {
private boolean includeBody = true;
@UriParam
private boolean pathStyleAccess;
- @UriParam(label = "producer", enums = "copyObject")
+ @UriParam(label = "producer", enums = "copyObject,deleteBucket,listBuckets")
private S3Operations operation;
public long getPartSize() {
http://git-wip-us.apache.org/repos/asf/camel/blob/59c3420d/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
index 7b13ced..b0ab407 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
@@ -93,7 +93,7 @@ public class S3Producer extends DefaultProducer {
listBuckets(getEndpoint().getS3Client(), exchange);
break;
case deleteBucket:
- deleteBucket(getEndpoint().getS3Client(), exchange);
+ deleteBucket(getEndpoint().getS3Client(), exchange);
break;
default:
throw new IllegalArgumentException("Unsupported operation");
http://git-wip-us.apache.org/repos/asf/camel/blob/59c3420d/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
index 1cee1a7..4a21958 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
@@ -32,7 +32,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class S3ComponentListBucketsSpringTest extends CamelSpringTestSupport {
- @EndpointInject(uri = "direct:start")
+ @EndpointInject(uri = "direct:listBuckets")
private ProducerTemplate template;
@EndpointInject(uri = "mock:result")
@@ -44,7 +44,7 @@ public class S3ComponentListBucketsSpringTest extends CamelSpringTestSupport {
public void sendIn() throws Exception {
result.expectedMessageCount(1);
- template.sendBody("direct:start", ExchangePattern.InOnly, "");
+ template.sendBody("direct:listBuckets", ExchangePattern.InOnly, "");
assertMockEndpointsSatisfied();
assertResultExchange(result.getExchanges().get(0));