Repository: camel Updated Branches: refs/heads/camel-2.16.x 46de24479 -> 2264701f7 refs/heads/master d4f386a7e -> 758c575ae
CAMEL-9686: camel-aws - Using cron scheduler on aws-s3 do not work Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/758c575a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/758c575a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/758c575a Branch: refs/heads/master Commit: 758c575ae287b8a5751b739daac18ff935044349 Parents: d4f386a Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Mar 9 15:21:20 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Mar 9 15:21:20 2016 +0100 ---------------------------------------------------------------------- .../camel/component/aws/s3/S3Component.java | 1 + .../component/aws/s3/S3ConsumerCronTest.java | 61 ++++++++++++++++++++ 2 files changed, 62 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/758c575a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java index aa99b09..33c92d5 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java @@ -46,6 +46,7 @@ public class S3Component extends UriEndpointComponent { } S3Endpoint endpoint = new S3Endpoint(uri, this, configuration); + setProperties(endpoint, parameters); return endpoint; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/758c575a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java new file mode 100644 index 0000000..6b22041 --- /dev/null +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java @@ -0,0 +1,61 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.aws.s3; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +public class S3ConsumerCronTest extends CamelTestSupport { + + @Test + public void testConsumerCron() throws Exception { + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedMinimumMessageCount(2); + + assertMockEndpointsSatisfied(); + + assertTrue(mock.getExchanges().get(0).getIn().getBody() == null); + assertTrue(mock.getExchanges().get(1).getIn().getBody() == null); + } + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry registry = super.createRegistry(); + + AmazonS3ClientMock clientMock = new AmazonS3ClientMock(); + registry.bind("amazonS3Client", clientMock); + + return registry; + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("aws-s3://mycamelbucket?amazonS3Client=#amazonS3Client®ion=us-west-1" + + "&scheduler=spring&scheduler.cron=0/2+*+*+*+*+?" + + "&sendEmptyMessageWhenIdle=true") + .to("mock:result"); + } + }; + } + +} \ No newline at end of file
