This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 52f5e7f1113411b0c6b3b7ab6280867a4745406b Author: Claus Ibsen <[email protected]> AuthorDate: Fri Oct 27 09:39:14 2017 +0200 CAMEL-11224: Polished. This closes #2018 --- .../camel-aws/src/main/docs/aws-sqs-component.adoc | 4 +++- .../camel/component/aws/sqs/SqsConfiguration.java | 8 ++++---- .../component/aws/sqs/SqsConfigurationTest.java | 21 +++++++++++++++++++-- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/components/camel-aws/src/main/docs/aws-sqs-component.adoc b/components/camel-aws/src/main/docs/aws-sqs-component.adoc index f619ce4..03dc78c 100644 --- a/components/camel-aws/src/main/docs/aws-sqs-component.adoc +++ b/components/camel-aws/src/main/docs/aws-sqs-component.adoc @@ -53,7 +53,7 @@ with the following path and query parameters: | *queueNameOrArn* | *Required* Queue name or ARN | | String |=== -==== Query Parameters (45 parameters): +==== Query Parameters (47 parameters): [width="100%",cols="2,5,^1,2",options="header"] |=== @@ -80,6 +80,8 @@ with the following path and query parameters: | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy | *delaySeconds* (producer) | Delay sending messages for a number of seconds. | | Integer +| *messageDeduplicationId Strategy* (producer) | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId useContentBasedDeduplication. For the useContentBasedDeduplication option no messageDeduplicationId will be set on the message. | useExchangeId | MessageDeduplicationId Strategy +| *messageGroupIdStrategy* (producer) | Only for FIFO queues. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant useExchangeId usePropertyValue. For the usePropertyValue option the value of property CamelAwsMessageGroupId will be used. | | MessageGroupIdStrategy | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java index 24816e3..ec0297d 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java @@ -67,9 +67,9 @@ public class SqsConfiguration { // producer properties @UriParam(label = "producer") private Integer delaySeconds; - @UriParam(label = "producer") + @UriParam(label = "producer", enums = "useConstant,useExchangeId,usePropertyValue") private MessageGroupIdStrategy messageGroupIdStrategy; - @UriParam(label = "producer", defaultValue = "useExchangeId") + @UriParam(label = "producer", defaultValue = "useExchangeId", enums = "useExchangeId,useContentBasedDeduplication") private MessageDeduplicationIdStrategy messageDeduplicationIdStrategy = new ExchangeIdMessageDeduplicationIdStrategy(); // queue properties @@ -382,7 +382,7 @@ public class SqsConfiguration { } /** - * Since *Camel 2.20*. Only for FIFO queues. Strategy for setting the messageGroupId on the message. + * Only for FIFO queues. Strategy for setting the messageGroupId on the message. * Can be one of the following options: *useConstant*, *useExchangeId*, *usePropertyValue*. * For the *usePropertyValue* option, the value of property "CamelAwsMessageGroupId" will be used. */ @@ -407,7 +407,7 @@ public class SqsConfiguration { } /** - * Since *Camel 2.20*. Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. + * Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. * Can be one of the following options: *useExchangeId*, *useContentBasedDeduplication*. * For the *useContentBasedDeduplication* option, no messageDeduplicationId will be set on the message. */ diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsConfigurationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsConfigurationTest.java index ace5173..3c7874a 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsConfigurationTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsConfigurationTest.java @@ -1,9 +1,26 @@ +/** + * 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.sqs; -import static org.junit.Assert.*; - import org.junit.Test; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class SqsConfigurationTest { @Test -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
