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
The following commit(s) were added to refs/heads/master by this push:
new c88852e Camel-AWS-S3: Tests, when using client from registry, there's
no need to specify region as URI parameter
c88852e is described below
commit c88852ec7907e6f4d22a5c9301f15a9687c0c616
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Mar 7 13:18:47 2019 +0100
Camel-AWS-S3: Tests, when using client from registry, there's no need to
specify region as URI parameter
---
.../camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java | 2 +-
.../java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java | 2 +-
.../camel/component/aws/s3/S3ComponentCopyObjectEncryptionTest.java | 2 +-
.../org/apache/camel/component/aws/s3/S3ComponentCopyObjectTest.java | 2 +-
.../org/apache/camel/component/aws/s3/S3ComponentDeleteObjectTest.java | 2 +-
.../org/apache/camel/component/aws/s3/S3ComponentDownloadLinkTest.java | 2 +-
.../apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java | 2 +-
.../java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java | 2 +-
.../org/apache/camel/component/aws/s3/S3ComponentGetObjectTest.java | 2 +-
.../org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java | 2 +-
.../org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java | 2 +-
.../apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java | 2 +-
.../java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java | 2 +-
.../test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java | 2 +-
.../org/apache/camel/component/aws/s3/S3ConsumerIdleMessageTest.java | 2 +-
.../java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java | 2 +-
.../test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java
index c1b9fe2..73ee2a4 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java
@@ -102,7 +102,7 @@ public class S3BatchConsumerMaxMessagesPerPollTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&delay=5000&maxMessagesPerPoll=0")
+
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&delay=5000&maxMessagesPerPoll=0")
.to("mock:result");
}
};
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java
index 4107f5d..5c97663 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java
@@ -73,7 +73,7 @@ public class S3BatchConsumerTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&delay=5000&maxMessagesPerPoll=5")
+
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&delay=5000&maxMessagesPerPoll=5")
.to("mock:result");
}
};
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectEncryptionTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectEncryptionTest.java
index acec0ab..9076054 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectEncryptionTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectEncryptionTest.java
@@ -82,7 +82,7 @@ public class S3ComponentCopyObjectEncryptionTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&operation=copyObject";
+ String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&operation=copyObject";
from("direct:start").to(awsEndpoint).to("mock:result");
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectTest.java
index 8d6d490..e1fb8ac 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectTest.java
@@ -82,7 +82,7 @@ public class S3ComponentCopyObjectTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&operation=copyObject";
+ String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&operation=copyObject";
from("direct:start")
.to(awsEndpoint)
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectTest.java
index ef622c1..c427539 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectTest.java
@@ -72,7 +72,7 @@ public class S3ComponentDeleteObjectTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&operation=deleteObject";
+ String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&operation=deleteObject";
from("direct:start")
.to(awsEndpoint)
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkTest.java
index 6df6062..0cd6b22 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkTest.java
@@ -71,7 +71,7 @@ public class S3ComponentDownloadLinkTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&operation=downloadLink";
+ String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&operation=downloadLink";
from("direct:downloadLink")
.to(awsEndpoint)
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
index dd25cc9..fa1af7a 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
@@ -174,7 +174,7 @@ public class S3ComponentExistingBucketTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1";
+ String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client";
from("direct:start")
.to(awsEndpoint + "&storageClass=REDUCED_REDUNDANCY");
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
index 3174c8a..42e57e1 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
@@ -142,7 +142,7 @@ public class S3ComponentFileTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint = "aws-s3://" + getCamelBucket() +
"?amazonS3Client=#amazonS3Client®ion=us-west-1";
+ String awsEndpoint = "aws-s3://" + getCamelBucket() +
"?amazonS3Client=#amazonS3Client";
from("direct:startKeep")
.to(awsEndpoint + "&deleteAfterWrite=false");
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectTest.java
index ee239a9..d40a99a 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectTest.java
@@ -67,7 +67,7 @@ public class S3ComponentGetObjectTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&operation=getObject";
+ String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&operation=getObject";
from("direct:getObject").to(awsEndpoint).to("mock:result");
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
index cc7a0f2..2c29026 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
@@ -73,7 +73,7 @@ public class S3ComponentListBucketsTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&operation=listBuckets";
+ String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&operation=listBuckets";
from("direct:listBuckets")
.to(awsEndpoint)
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java
index 3d65baf..d61ea50 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java
@@ -71,7 +71,7 @@ public class S3ComponentListObjectTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&operation=listObjects";
+ String awsEndpoint =
"aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&operation=listObjects";
from("direct:listObjects")
.to(awsEndpoint)
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
index adce3f9..9660740 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
@@ -169,7 +169,7 @@ public class S3ComponentNonExistingBucketTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint =
"aws-s3://nonExistingBucket?amazonS3Client=#amazonS3Client®ion=us-west-1&policy=xxx";
+ String awsEndpoint =
"aws-s3://nonExistingBucket?amazonS3Client=#amazonS3Client&policy=xxx";
from("direct:start")
.to(awsEndpoint + "&storageClass=REDUCED_REDUNDANCY");
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java
index 2aa0b9d..0ce356d 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java
@@ -93,7 +93,7 @@ public class S3ComponentStringTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint = "aws-s3://" + getCamelBucket() +
"?amazonS3Client=#amazonS3Client®ion=us-west-1";
+ String awsEndpoint = "aws-s3://" + getCamelBucket() +
"?amazonS3Client=#amazonS3Client";
from("direct:sendString")
.to(awsEndpoint +
"&deleteAfterWrite=false").to("mock:result");
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java
index 6b22041..a3028c6 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java
@@ -50,7 +50,7 @@ public class S3ConsumerCronTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1"
+ from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client"
+ "&scheduler=spring&scheduler.cron=0/2+*+*+*+*+?"
+ "&sendEmptyMessageWhenIdle=true")
.to("mock:result");
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerIdleMessageTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerIdleMessageTest.java
index b25097f..2403d6d 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerIdleMessageTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerIdleMessageTest.java
@@ -53,7 +53,7 @@ public class S3ConsumerIdleMessageTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&delay=50"
+
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&delay=50"
+
"&maxMessagesPerPoll=5&sendEmptyMessageWhenIdle=true")
.to("mock:result");
}
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java
index 37c4b6d..0b15fad 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java
@@ -64,7 +64,7 @@ public class S3ConsumerPrefixTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&delay=50"
+
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&delay=50"
+ "&maxMessagesPerPoll=5&prefix=confidential")
.to("mock:result");
}
diff --git
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java
index 3a0295d..647ed34 100644
---
a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java
+++
b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java
@@ -62,7 +62,7 @@ public class S3IncludeBodyTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1&delay=50"
+
from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client&delay=50"
+
"&maxMessagesPerPoll=5&prefix=confidential&includeBody=false")
.to("mock:result");
}
