Repository: camel Updated Branches: refs/heads/master cf29d65c9 -> 8d5272957
Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d527295 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d527295 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d527295 Branch: refs/heads/master Commit: 8d5272957aeeb6f676408dc48fc6fa31f6fb4ee2 Parents: cf29d65 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri May 8 13:05:47 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri May 8 13:59:04 2015 +0200 ---------------------------------------------------------------------- .../camel/component/aws/cw/CwConfiguration.java | 42 +++++-- .../component/aws/ddb/AbstractDdbCommand.java | 3 +- .../component/aws/ddb/DdbConfiguration.java | 39 ++++++- .../camel/component/aws/s3/S3Configuration.java | 58 +++++++-- .../camel/component/aws/s3/S3Consumer.java | 2 +- .../camel/component/aws/s3/S3Endpoint.java | 46 ++++---- .../camel/component/aws/s3/S3Producer.java | 2 - .../component/aws/sdb/AbstractSdbCommand.java | 6 +- .../component/aws/sdb/SdbConfiguration.java | 30 ++++- .../camel/component/aws/sdb/SdbOperations.java | 2 +- .../component/aws/ses/SesConfiguration.java | 32 ++++- .../component/aws/sns/SnsConfiguration.java | 31 ++++- .../component/aws/sqs/SqsConfiguration.java | 117 +++++++++++++++---- .../camel/component/aws/sqs/SqsEndpoint.java | 12 +- .../component/aws/swf/SWFConfiguration.java | 91 ++++++++++++--- .../aws/sdb/SdbComponentConfigurationTest.java | 6 +- 16 files changed, 422 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java index fe3d817..bcee315 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java @@ -46,6 +46,9 @@ public class CwConfiguration implements Cloneable { @UriParam private Date timestamp; + /** + * The region with which the AWS-CW client wants to work with. + */ public void setAmazonCwEndpoint(String amazonCwEndpoint) { this.amazonCwEndpoint = amazonCwEndpoint; } @@ -58,6 +61,9 @@ public class CwConfiguration implements Cloneable { return accessKey; } + /** + * Amazon AWS Access Key + */ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } @@ -66,6 +72,9 @@ public class CwConfiguration implements Cloneable { return secretKey; } + /** + * Amazon AWS Secret Key + */ public void setSecretKey(String secretKey) { this.secretKey = secretKey; } @@ -74,6 +83,9 @@ public class CwConfiguration implements Cloneable { return name; } + /** + * The metric name + */ public void setName(String name) { this.name = name; } @@ -82,6 +94,9 @@ public class CwConfiguration implements Cloneable { return value; } + /** + * The metric value + */ public void setValue(Double value) { this.value = value; } @@ -90,6 +105,9 @@ public class CwConfiguration implements Cloneable { return unit; } + /** + * The metric unit + */ public void setUnit(String unit) { this.unit = unit; } @@ -98,10 +116,16 @@ public class CwConfiguration implements Cloneable { return namespace; } + /** + * The metric namespace + */ public void setNamespace(String namespace) { this.namespace = namespace; } + /** + * The metric timestamp + */ public void setTimestamp(Date timestamp) { this.timestamp = timestamp; } @@ -110,6 +134,17 @@ public class CwConfiguration implements Cloneable { return timestamp; } + public AmazonCloudWatch getAmazonCwClient() { + return amazonCwClient; + } + + /** + * To use the AmazonCloudWatch as the client + */ + public void setAmazonCwClient(AmazonCloudWatch amazonCwClient) { + this.amazonCwClient = amazonCwClient; + } + @Override public String toString() { return "CwConfiguration[name=" + name @@ -121,11 +156,4 @@ public class CwConfiguration implements Cloneable { + "]"; } - public AmazonCloudWatch getAmazonCwClient() { - return amazonCwClient; - } - - public void setAmazonCwClient(AmazonCloudWatch amazonCwClient) { - this.amazonCwClient = amazonCwClient; - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java index 1230eed..ace1ee5 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/AbstractDdbCommand.java @@ -90,7 +90,6 @@ public abstract class AbstractDdbCommand { } protected Boolean determineConsistentRead() { - Boolean consistentRead = exchange.getIn().getHeader(DdbConstants.CONSISTENT_READ, Boolean.class); - return consistentRead != null ? consistentRead : configuration.getConsistentRead(); + return exchange.getIn().getHeader(DdbConstants.CONSISTENT_READ, configuration.isConsistentRead(), Boolean.class); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java index 25c9c73..0fb0228 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java @@ -37,7 +37,7 @@ public class DdbConfiguration { @UriParam private String amazonDdbEndpoint; @UriParam - private Boolean consistentRead; + private boolean consistentRead; @UriParam(defaultValue = "PutItem") private DdbOperations operation = DdbOperations.PutItem; @UriParam @@ -49,6 +49,9 @@ public class DdbConfiguration { @UriParam private String keyAttributeType; + /** + * The region with which the AWS-DDB client wants to work with. + */ public void setAmazonDdbEndpoint(String amazonDdbEndpoint) { this.amazonDdbEndpoint = amazonDdbEndpoint; } @@ -61,6 +64,9 @@ public class DdbConfiguration { return accessKey; } + /** + * Amazon AWS Access Key + */ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } @@ -69,6 +75,9 @@ public class DdbConfiguration { return secretKey; } + /** + * Amazon AWS Secret Key + */ public void setSecretKey(String secretKey) { this.secretKey = secretKey; } @@ -77,6 +86,9 @@ public class DdbConfiguration { return amazonDDBClient; } + /** + * To use the AmazonDynamoDB as the client + */ public void setAmazonDDBClient(AmazonDynamoDB amazonDDBClient) { this.amazonDDBClient = amazonDDBClient; } @@ -85,6 +97,9 @@ public class DdbConfiguration { return tableName; } + /** + * The name of the table currently worked with. + */ public void setTableName(String tableName) { this.tableName = tableName; } @@ -93,15 +108,21 @@ public class DdbConfiguration { return operation; } + /** + * What operation to perform + */ public void setOperation(DdbOperations operation) { this.operation = operation; } - public Boolean getConsistentRead() { + public boolean isConsistentRead() { return consistentRead; } - public void setConsistentRead(Boolean consistentRead) { + /** + * Determines whether or not strong consistency should be enforced when data is read. + */ + public void setConsistentRead(boolean consistentRead) { this.consistentRead = consistentRead; } @@ -109,6 +130,9 @@ public class DdbConfiguration { return readCapacity; } + /** + * The provisioned throughput to reserve for reading resources from your table + */ public void setReadCapacity(Long readCapacity) { this.readCapacity = readCapacity; } @@ -117,6 +141,9 @@ public class DdbConfiguration { return writeCapacity; } + /** + * The provisioned throughput to reserved for writing resources to your table + */ public void setWriteCapacity(Long writeCapacity) { this.writeCapacity = writeCapacity; } @@ -125,6 +152,9 @@ public class DdbConfiguration { return keyAttributeName; } + /** + * Attribute name when creating table + */ public void setKeyAttributeName(String keyAttributeName) { this.keyAttributeName = keyAttributeName; } @@ -133,6 +163,9 @@ public class DdbConfiguration { return keyAttributeType; } + /** + * Attribute type when creating table + */ public void setKeyAttributeType(String keyAttributeType) { this.keyAttributeType = keyAttributeType; } http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/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 ab19d46..5a6af23 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 @@ -33,31 +33,34 @@ public class S3Configuration implements Cloneable { private String accessKey; @UriParam private String secretKey; - @UriParam + @UriParam(label = "consumer") private String fileName; - @UriParam + @UriParam(label = "consumer") private String prefix; - @UriParam + @UriParam(label = "producer") private String region; - @UriParam(defaultValue = "true") + @UriParam(label = "consumer", defaultValue = "true") private boolean deleteAfterRead = true; - @UriParam + @UriParam(label = "producer") private boolean deleteAfterWrite; - @UriParam + @UriParam(label = "producer") private boolean multiPartUpload; - @UriParam(defaultValue = "" + 25 * 1024 * 1024) + @UriParam(label = "producer", defaultValue = "" + 25 * 1024 * 1024) private long partSize = 25 * 1024 * 1024; @UriParam private String amazonS3Endpoint; @UriParam private String policy; - @UriParam + @UriParam(label = "producer") private String storageClass; public long getPartSize() { return partSize; } + /** + * Setup the partSize which is used in multi part upload, the default size is 25M. + */ public void setPartSize(long partSize) { this.partSize = partSize; } @@ -66,10 +69,16 @@ public class S3Configuration implements Cloneable { return multiPartUpload; } + /** + * If it is true, Camel will upload the file with multi part format, the part size is decided by the option of partSize + */ public void setMultiPartUpload(boolean multiPartUpload) { this.multiPartUpload = multiPartUpload; } + /** + * The region with which the AWS-S3 client wants to work with. + */ public void setAmazonS3Endpoint(String amazonS3Endpoint) { this.amazonS3Endpoint = amazonS3Endpoint; } @@ -82,6 +91,9 @@ public class S3Configuration implements Cloneable { return accessKey; } + /** + * Amazon AWS Access Key + */ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } @@ -90,6 +102,9 @@ public class S3Configuration implements Cloneable { return secretKey; } + /** + * Amazon AWS Secret Key + */ public void setSecretKey(String secretKey) { this.secretKey = secretKey; } @@ -98,6 +113,9 @@ public class S3Configuration implements Cloneable { return amazonS3Client; } + /** + * To use the AmazonS3 as the client + */ public void setAmazonS3Client(AmazonS3 amazonS3Client) { this.amazonS3Client = amazonS3Client; } @@ -106,6 +124,9 @@ public class S3Configuration implements Cloneable { return prefix; } + /** + * The prefix which is used in the com.amazonaws.services.s3.model.ListObjectsRequest to only consume objects we are interested in. + */ public void setPrefix(String prefix) { this.prefix = prefix; } @@ -114,6 +135,9 @@ public class S3Configuration implements Cloneable { return bucketName; } + /** + * Name of the bucket. The bucket will be created if it don't already exists. + */ public void setBucketName(String bucketName) { this.bucketName = bucketName; } @@ -122,6 +146,9 @@ public class S3Configuration implements Cloneable { return fileName; } + /** + * To get the object from the bucket with the given file name + */ public void setFileName(String fileName) { this.fileName = fileName; } @@ -130,6 +157,9 @@ public class S3Configuration implements Cloneable { return region; } + /** + * The region where the bucket is located. + */ public void setRegion(String region) { this.region = region; } @@ -138,6 +168,9 @@ public class S3Configuration implements Cloneable { return deleteAfterRead; } + /** + * Delete objects from S3 after it has been retrieved. + */ public void setDeleteAfterRead(boolean deleteAfterRead) { this.deleteAfterRead = deleteAfterRead; } @@ -146,6 +179,9 @@ public class S3Configuration implements Cloneable { return deleteAfterWrite; } + /** + * Delete file object after the S3 file has been uploaded + */ public void setDeleteAfterWrite(boolean deleteAfterWrite) { this.deleteAfterWrite = deleteAfterWrite; } @@ -154,6 +190,9 @@ public class S3Configuration implements Cloneable { return policy; } + /** + * The policy for this bucket + */ public void setPolicy(String policy) { this.policy = policy; } @@ -162,6 +201,9 @@ public class S3Configuration implements Cloneable { return storageClass; } + /** + * The storage class + */ public void setStorageClass(String storageClass) { this.storageClass = storageClass; } http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java index bac2649..2f355f9 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java @@ -62,7 +62,7 @@ public class S3Consumer extends ScheduledBatchPollingConsumer { String fileName = getConfiguration().getFileName(); String bucketName = getConfiguration().getBucketName(); - Queue<Exchange> exchanges = null; + Queue<Exchange> exchanges; if (fileName != null) { LOG.trace("Getting object in bucket [{}] with file name [{}]...", bucketName, fileName); http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java index 9aebd11..69a7942 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java @@ -42,7 +42,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Defines the <a href="http://camel.apache.org/aws.html";>AWS S3 Endpoint</a>. + * Defines the <a href="http://camel.apache.org/aws.html";>AWS S3 Endpoint</a>. */ @UriEndpoint(scheme = "aws-s3", title = "AWS S3 Storage Service", syntax = "aws-s3:bucketName", consumerClass = S3Consumer.class, label = "cloud,file") public class S3Endpoint extends ScheduledPollEndpoint { @@ -53,7 +53,7 @@ public class S3Endpoint extends ScheduledPollEndpoint { @UriParam private S3Configuration configuration; - @UriParam(defaultValue = "10") + @UriParam(label = "consumer", defaultValue = "10") private int maxMessagesPerPoll = 10; @Deprecated @@ -61,6 +61,7 @@ public class S3Endpoint extends ScheduledPollEndpoint { super(uri, context); this.configuration = configuration; } + public S3Endpoint(String uri, Component comp, S3Configuration configuration) { super(uri, comp); this.configuration = configuration; @@ -86,12 +87,12 @@ public class S3Endpoint extends ScheduledPollEndpoint { super.doStart(); s3Client = configuration.getAmazonS3Client() != null - ? configuration.getAmazonS3Client() : createS3Client(); - + ? configuration.getAmazonS3Client() : createS3Client(); + if (ObjectHelper.isNotEmpty(configuration.getAmazonS3Endpoint())) { s3Client.setEndpoint(configuration.getAmazonS3Endpoint()); } - + String fileName = getConfiguration().getFileName(); if (fileName != null) { @@ -101,7 +102,7 @@ public class S3Endpoint extends ScheduledPollEndpoint { String bucketName = getConfiguration().getBucketName(); LOG.trace("Querying whether bucket [{}] already exists...", bucketName); - + try { s3Client.listObjects(new ListObjectsRequest(bucketName, null, null, null, 0)); LOG.trace("Bucket [{}] already exists", bucketName); @@ -112,26 +113,26 @@ public class S3Endpoint extends ScheduledPollEndpoint { throw ase; } } - + LOG.trace("Bucket [{}] doesn't exist yet", bucketName); - + // creates the new bucket because it doesn't exist yet CreateBucketRequest createBucketRequest = new CreateBucketRequest(getConfiguration().getBucketName()); if (getConfiguration().getRegion() != null) { createBucketRequest.setRegion(getConfiguration().getRegion()); } - + LOG.trace("Creating bucket [{}] in region [{}] with request [{}]...", new Object[]{configuration.getBucketName(), configuration.getRegion(), createBucketRequest}); - + s3Client.createBucket(createBucketRequest); - + LOG.trace("Bucket created"); - + if (configuration.getPolicy() != null) { LOG.trace("Updating bucket [{}] with policy [{}]", bucketName, configuration.getPolicy()); - + s3Client.setBucketPolicy(bucketName, configuration.getPolicy()); - + LOG.trace("Bucket policy updated"); } } @@ -142,11 +143,11 @@ public class S3Endpoint extends ScheduledPollEndpoint { public Exchange createExchange(ExchangePattern pattern, S3Object s3Object) { LOG.trace("Getting object with key [{}] from bucket [{}]...", s3Object.getKey(), s3Object.getBucketName()); - + ObjectMetadata objectMetadata = s3Object.getObjectMetadata(); - + LOG.trace("Got object [{}]", s3Object); - + Exchange exchange = new DefaultExchange(this, pattern); Message message = exchange.getIn(); message.setBody(s3Object.getObjectContent()); @@ -173,19 +174,17 @@ public class S3Endpoint extends ScheduledPollEndpoint { public void setConfiguration(S3Configuration configuration) { this.configuration = configuration; } - + public void setS3Client(AmazonS3 s3Client) { this.s3Client = s3Client; } - + public AmazonS3 getS3Client() { return s3Client; } /** * Provide the possibility to override this method for an mock implementation - * - * @return AmazonS3Client */ AmazonS3 createS3Client() { AWSCredentials credentials = new BasicAWSCredentials(configuration.getAccessKey(), configuration.getSecretKey()); @@ -197,6 +196,11 @@ public class S3Endpoint extends ScheduledPollEndpoint { return maxMessagesPerPoll; } + /** + * Gets the maximum number of messages as a limit to poll at each polling. + * <p/> + * Is default unlimited, but use 0 or negative number to disable it as unlimited. + */ public void setMaxMessagesPerPoll(int maxMessagesPerPoll) { this.maxMessagesPerPoll = maxMessagesPerPoll; } http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/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 b145a6c..20125fd 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 @@ -70,8 +70,6 @@ public class S3Producer extends DefaultProducer { } else { processSingleOp(exchange); } - - } public void processMultiPart(final Exchange exchange) throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java index a6a0da6..88db821 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/AbstractSdbCommand.java @@ -63,11 +63,7 @@ public abstract class AbstractSdbCommand { } protected Boolean determineConsistentRead() { - Boolean consistentRead = exchange.getIn().getHeader(SdbConstants.CONSISTENT_READ, Boolean.class); - if (consistentRead == null) { - consistentRead = this.configuration.getConsistentRead(); - } - return consistentRead; + return exchange.getIn().getHeader(SdbConstants.CONSISTENT_READ, this.configuration.isConsistentRead(), Boolean.class); } protected UpdateCondition determineUpdateCondition() { http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java index e6ce0cd..87669b9 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbConfiguration.java @@ -38,10 +38,13 @@ public class SdbConfiguration { @UriParam private Integer maxNumberOfDomains; @UriParam - private Boolean consistentRead; + private boolean consistentRead; @UriParam(defaultValue = "PutAttributes") private SdbOperations operation = SdbOperations.PutAttributes; + /** + * The region with which the AWS-SDB client wants to work with. + */ public void setAmazonSdbEndpoint(String amazonSdbEndpoint) { this.amazonSdbEndpoint = amazonSdbEndpoint; } @@ -54,6 +57,9 @@ public class SdbConfiguration { return accessKey; } + /** + * Amazon AWS Access Key + */ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } @@ -62,6 +68,9 @@ public class SdbConfiguration { return secretKey; } + /** + * Amazon AWS Secret Key + */ public void setSecretKey(String secretKey) { this.secretKey = secretKey; } @@ -70,6 +79,9 @@ public class SdbConfiguration { return amazonSDBClient; } + /** + * To use the AmazonSimpleDB as the client + */ public void setAmazonSDBClient(AmazonSimpleDB amazonSDBClient) { this.amazonSDBClient = amazonSDBClient; } @@ -78,6 +90,9 @@ public class SdbConfiguration { return domainName; } + /** + * The name of the domain currently worked with. + */ public void setDomainName(String domainName) { this.domainName = domainName; } @@ -86,6 +101,9 @@ public class SdbConfiguration { return operation; } + /** + * Operation to perform + */ public void setOperation(SdbOperations operation) { this.operation = operation; } @@ -94,15 +112,21 @@ public class SdbConfiguration { return maxNumberOfDomains; } + /** + * The maximum number of domain names you want returned. The range is 1 to 100. + */ public void setMaxNumberOfDomains(Integer maxNumberOfDomains) { this.maxNumberOfDomains = maxNumberOfDomains; } - public Boolean getConsistentRead() { + public boolean isConsistentRead() { return consistentRead; } - public void setConsistentRead(Boolean consistentRead) { + /** + * Determines whether or not strong consistency should be enforced when data is read. + */ + public void setConsistentRead(boolean consistentRead) { this.consistentRead = consistentRead; } } http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbOperations.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbOperations.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbOperations.java index a4dbe95..eeb7a09 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbOperations.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbOperations.java @@ -26,5 +26,5 @@ public enum SdbOperations { GetAttributes, ListDomains, PutAttributes, - Select; + Select } http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java index a328c38..5c04836 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesConfiguration.java @@ -51,6 +51,9 @@ public class SesConfiguration { return accessKey; } + /** + * Amazon AWS Access Key + */ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } @@ -59,6 +62,9 @@ public class SesConfiguration { return amazonSESClient; } + /** + * To use the AmazonSimpleEmailService as the client + */ public void setAmazonSESClient(AmazonSimpleEmailService amazonSESClient) { this.amazonSESClient = amazonSESClient; } @@ -67,6 +73,9 @@ public class SesConfiguration { return from; } + /** + * The sender's email address. + */ public void setFrom(String from) { this.from = from; } @@ -75,10 +84,16 @@ public class SesConfiguration { return to; } + /** + * List of destination email address. Can be overriden with 'CamelAwsSesTo' header. + */ public void setTo(List<String> to) { this.to = to; } - + + /** + * List of destination email address. Can be overriden with 'CamelAwsSesTo' header. + */ public void setTo(String to) { this.to = Arrays.asList(to.split(",")); } @@ -87,6 +102,9 @@ public class SesConfiguration { return secretKey; } + /** + * Amazon AWS Secret Key + */ public void setSecretKey(String secretKey) { this.secretKey = secretKey; } @@ -95,6 +113,9 @@ public class SesConfiguration { return subject; } + /** + * The subject which is used if the message header 'CamelAwsSesSubject' is not present. + */ public void setSubject(String subject) { this.subject = subject; } @@ -103,6 +124,9 @@ public class SesConfiguration { return returnPath; } + /** + * The email address to which bounce notifications are to be forwarded, override it using 'CamelAwsSesReturnPath' header. + */ public void setReturnPath(String returnPath) { this.returnPath = returnPath; } @@ -111,6 +135,9 @@ public class SesConfiguration { return replyToAddresses; } + /** + * List of reply-to email address(es) for the message, override it using 'CamelAwsSesReplyToAddresses' header. + */ public void setReplyToAddresses(List<String> replyToAddresses) { this.replyToAddresses = replyToAddresses; } @@ -123,6 +150,9 @@ public class SesConfiguration { return amazonSESEndpoint; } + /** + * The region with which the AWS-SES client wants to work with. + */ public void setAmazonSESEndpoint(String amazonSesEndpoint) { this.amazonSESEndpoint = amazonSesEndpoint; } http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java index ab48722..08a3a81 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsConfiguration.java @@ -25,6 +25,8 @@ import org.apache.camel.spi.UriPath; @UriParams public class SnsConfiguration implements Cloneable { + private String topicArn; + // Common properties @UriPath @Metadata(required = "true") private String topicName; @@ -41,12 +43,13 @@ public class SnsConfiguration implements Cloneable { @UriParam private String subject; @UriParam - private String topicArn; - @UriParam private String policy; @UriParam private String messageStructure; + /** + * The region with which the AWS-SNS client wants to work with. + */ public void setAmazonSNSEndpoint(String awsSNSEndpoint) { this.amazonSNSEndpoint = awsSNSEndpoint; } @@ -59,6 +62,9 @@ public class SnsConfiguration implements Cloneable { return subject; } + /** + * The subject which is used if the message header 'CamelAwsSnsSubject' is not present. + */ public void setSubject(String subject) { this.subject = subject; } @@ -67,6 +73,9 @@ public class SnsConfiguration implements Cloneable { return topicArn; } + /** + * The Amazon Resource Name (ARN) assigned to the created topic. + */ public void setTopicArn(String topicArn) { this.topicArn = topicArn; } @@ -75,6 +84,9 @@ public class SnsConfiguration implements Cloneable { return accessKey; } + /** + * Amazon AWS Access Key + */ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } @@ -83,6 +95,9 @@ public class SnsConfiguration implements Cloneable { return secretKey; } + /** + * Amazon AWS Secret Key + */ public void setSecretKey(String secretKey) { this.secretKey = secretKey; } @@ -91,6 +106,9 @@ public class SnsConfiguration implements Cloneable { return amazonSNSClient; } + /** + * To use the AmazonSNS as the client + */ public void setAmazonSNSClient(AmazonSNS amazonSNSClient) { this.amazonSNSClient = amazonSNSClient; } @@ -99,6 +117,9 @@ public class SnsConfiguration implements Cloneable { return topicName; } + /** + * The name of the topic + */ public void setTopicName(String topicName) { this.topicName = topicName; } @@ -107,6 +128,9 @@ public class SnsConfiguration implements Cloneable { return policy; } + /** + * The policy for this queue + */ public void setPolicy(String policy) { this.policy = policy; } @@ -115,6 +139,9 @@ public class SnsConfiguration implements Cloneable { return messageStructure; } + /** + * The message structure to use such as json + */ public void setMessageStructure(String messageStructure) { this.messageStructure = messageStructure; } http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java ---------------------------------------------------------------------- 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 aabae7f..6450dd6 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 @@ -42,28 +42,29 @@ public class SqsConfiguration { private String queueOwnerAWSAccountId; @UriParam private String region; + // consumer properties - @UriParam(defaultValue = "true") - private Boolean deleteAfterRead = Boolean.TRUE; - @UriParam(defaultValue = "true") - private Boolean deleteIfFiltered = Boolean.TRUE; - @UriParam + @UriParam(label = "consumer", defaultValue = "true") + private boolean deleteAfterRead = true; + @UriParam(label = "consumer", defaultValue = "true") + private boolean deleteIfFiltered = true; + @UriParam(label = "consumer") private Integer visibilityTimeout; - @UriParam + @UriParam(label = "consumer") private Collection<String> attributeNames; - @UriParam + @UriParam(label = "consumer") private Collection<String> messageAttributeNames; - @UriParam + @UriParam(label = "consumer") private Integer waitTimeSeconds; - @UriParam + @UriParam(label = "consumer") private Integer defaultVisibilityTimeout; - @UriParam(defaultValue = "false") - private Boolean extendMessageVisibility = Boolean.FALSE; - @UriParam(defaultValue = "1") - private Integer concurrentConsumers = 1; + @UriParam(label = "consumer") + private boolean extendMessageVisibility; + @UriParam(label = "consumer", defaultValue = "1") + private int concurrentConsumers = 1; // producer properties - @UriParam + @UriParam(label = "producer") private Integer delaySeconds; // queue properties @@ -80,6 +81,11 @@ public class SqsConfiguration { @UriParam private String redrivePolicy; + /** + * The region with which the AWS-SQS client wants to work with. + * Only works if Camel creates the AWS-SQS client, i.e., if you explicitly set amazonSQSClient, + * then this setting will have no effect. You would have to set it on the client you create directly + */ public void setAmazonSQSEndpoint(String amazonSQSEndpoint) { this.amazonSQSEndpoint = amazonSQSEndpoint; } @@ -92,6 +98,9 @@ public class SqsConfiguration { return queueName; } + /** + * Name of queue. The queue will be created if they don't already exists. + */ public void setQueueName(String queueName) { this.queueName = queueName; } @@ -100,6 +109,9 @@ public class SqsConfiguration { return accessKey; } + /** + * Amazon AWS Access Key + */ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } @@ -108,15 +120,21 @@ public class SqsConfiguration { return secretKey; } + /** + * Amazon AWS Secret Key + */ public void setSecretKey(String secretKey) { this.secretKey = secretKey; } - public Boolean isDeleteAfterRead() { + public boolean isDeleteAfterRead() { return deleteAfterRead; } - public void setDeleteAfterRead(Boolean deleteAfterRead) { + /** + * Delete message from SQS after it has been read + */ + public void setDeleteAfterRead(boolean deleteAfterRead) { this.deleteAfterRead = deleteAfterRead; } @@ -124,6 +142,9 @@ public class SqsConfiguration { return amazonSQSClient; } + /** + * To use the AmazonSQS as client + */ public void setAmazonSQSClient(AmazonSQS amazonSQSClient) { this.amazonSQSClient = amazonSQSClient; } @@ -132,6 +153,12 @@ public class SqsConfiguration { return visibilityTimeout; } + /** + * The duration (in seconds) that the received messages are hidden from subsequent retrieve requests after being retrieved + * by a ReceiveMessage request to set in the com.amazonaws.services.sqs.model.SetQueueAttributesRequest. + * This only make sense if its different from defaultVisibilityTimeout. + * It changes the queue visibility timeout attribute permanently. + */ public void setVisibilityTimeout(Integer visibilityTimeout) { this.visibilityTimeout = visibilityTimeout; } @@ -140,6 +167,9 @@ public class SqsConfiguration { return attributeNames; } + /** + * A list of attribute names to receive when consuming + */ public void setAttributeNames(Collection<String> attributeNames) { this.attributeNames = attributeNames; } @@ -148,6 +178,9 @@ public class SqsConfiguration { return messageAttributeNames; } + /** + * A list of message attribute names to receive when consuming + */ public void setMessageAttributeNames(Collection<String> messageAttributeNames) { this.messageAttributeNames = messageAttributeNames; } @@ -156,6 +189,9 @@ public class SqsConfiguration { return defaultVisibilityTimeout; } + /** + * The default visibility timeout (in seconds) + */ public void setDefaultVisibilityTimeout(Integer defaultVisibilityTimeout) { this.defaultVisibilityTimeout = defaultVisibilityTimeout; } @@ -164,6 +200,9 @@ public class SqsConfiguration { return delaySeconds; } + /** + * Delay sending messages for a number of seconds. + */ public void setDelaySeconds(Integer delaySeconds) { this.delaySeconds = delaySeconds; } @@ -172,6 +211,9 @@ public class SqsConfiguration { return maximumMessageSize; } + /** + * The maximumMessageSize (in bytes) an SQS message can contain for this queue. + */ public void setMaximumMessageSize(Integer maximumMessageSize) { this.maximumMessageSize = maximumMessageSize; } @@ -180,6 +222,9 @@ public class SqsConfiguration { return messageRetentionPeriod; } + /** + * The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. + */ public void setMessageRetentionPeriod(Integer messageRetentionPeriod) { this.messageRetentionPeriod = messageRetentionPeriod; } @@ -188,6 +233,9 @@ public class SqsConfiguration { return policy; } + /** + * The policy for this queue + */ public void setPolicy(String policy) { this.policy = policy; } @@ -196,6 +244,9 @@ public class SqsConfiguration { return redrivePolicy; } + /** + * Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. + */ public void setRedrivePolicy(String redrivePolicy) { this.redrivePolicy = redrivePolicy; } @@ -204,7 +255,12 @@ public class SqsConfiguration { return this.extendMessageVisibility; } - public void setExtendMessageVisibility(Boolean extendMessageVisibility) { + /** + * If enabled then a scheduled background task will keep extending the message visibility on SQS. + * This is needed if it takes a long time to process the message. If set to true defaultVisibilityTimeout must be set. + * See details at Amazon docs. + */ + public void setExtendMessageVisibility(boolean extendMessageVisibility) { this.extendMessageVisibility = extendMessageVisibility; } @@ -212,6 +268,9 @@ public class SqsConfiguration { return receiveMessageWaitTimeSeconds; } + /** + * If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. + */ public void setReceiveMessageWaitTimeSeconds(Integer receiveMessageWaitTimeSeconds) { this.receiveMessageWaitTimeSeconds = receiveMessageWaitTimeSeconds; } @@ -220,6 +279,9 @@ public class SqsConfiguration { return waitTimeSeconds; } + /** + * Duration in seconds (0 to 20) that the ReceiveMessage action call will wait until a message is in the queue to include in the response. + */ public void setWaitTimeSeconds(Integer waitTimeSeconds) { this.waitTimeSeconds = waitTimeSeconds; } @@ -228,15 +290,22 @@ public class SqsConfiguration { return queueOwnerAWSAccountId; } + /** + * Specify the queue owner aws account id when you need to connect the queue with different account owner. + */ public void setQueueOwnerAWSAccountId(String queueOwnerAWSAccountId) { this.queueOwnerAWSAccountId = queueOwnerAWSAccountId; } - public Boolean isDeleteIfFiltered() { + public boolean isDeleteIfFiltered() { return deleteIfFiltered; } - public void setDeleteIfFiltered(Boolean deleteIfFiltered) { + /** + * Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. + * If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. + */ + public void setDeleteIfFiltered(boolean deleteIfFiltered) { this.deleteIfFiltered = deleteIfFiltered; } @@ -244,15 +313,21 @@ public class SqsConfiguration { return region; } + /** + * Specify the queue region which could be used with queueOwnerAWSAccountId to build the service URL. + */ public void setRegion(String region) { this.region = region; } - public Integer getConcurrentConsumers() { + /** + * Allows you to use multiple threads to poll the sqs queue to increase throughput + */ + public int getConcurrentConsumers() { return concurrentConsumers; } - public void setConcurrentConsumers(Integer concurrentConsumers) { + public void setConcurrentConsumers(int concurrentConsumers) { this.concurrentConsumers = concurrentConsumers; } http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java index ccb0cc5..bfcfc60 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java @@ -48,10 +48,8 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * Defines the <a href="http://camel.apache.org/aws.html";>AWS SQS Endpoint</a>. - * */ @UriEndpoint(scheme = "aws-sqs", title = "AWS Simple Queue Service", syntax = "aws-sqs:queueName", consumerClass = SqsConsumer.class, label = "cloud,messaging") public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterStrategyAware { @@ -63,7 +61,7 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt @UriParam private SqsConfiguration configuration; - @UriParam + @UriParam(label = "consumer") private int maxMessagesPerPoll; @UriParam private HeaderFilterStrategy headerFilterStrategy; @@ -77,6 +75,9 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt return headerFilterStrategy; } + /** + * To use a custom HeaderFilterStrategy to map headers to/from Camel. + */ public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) { this.headerFilterStrategy = strategy; } @@ -274,6 +275,11 @@ public class SqsEndpoint extends ScheduledPollEndpoint implements HeaderFilterSt return maxMessagesPerPoll; } + /** + * Gets the maximum number of messages as a limit to poll at each polling. + * <p/> + * Is default unlimited, but use 0 or negative number to disable it as unlimited. + */ public void setMaxMessagesPerPoll(int maxMessagesPerPoll) { this.maxMessagesPerPoll = maxMessagesPerPoll; } http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java index 151dc13..c54f985 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/SWFConfiguration.java @@ -44,45 +44,48 @@ public class SWFConfiguration { private String accessKey; @UriParam private String secretKey; - @UriParam - private String operation; + @UriParam(label = "producer,workflow", defaultValue = "START", enums = "SIGNAL,CANCEL,TERMINATE,GET_STATE,START,DESCRIBE,GET_HISTORY") + private String operation = "START"; @UriParam private String domainName; - @UriParam + @UriParam(label = "consumer,activity") private String activityList; - @UriParam + @UriParam(label = "consumer,workflow") private String workflowList; @UriParam private String eventName; @UriParam private String version; - @UriParam + @UriParam(label = "producer,workflow") private String signalName; - @UriParam + @UriParam(label = "producer,workflow") private String childPolicy; - @UriParam + @UriParam(label = "producer,workflow") private String terminationReason; - @UriParam + @UriParam(label = "producer,workflow") private String stateResultType; - @UriParam + @UriParam(label = "producer,workflow") private String terminationDetails; @UriParam private DataConverter dataConverter; - @UriParam + @UriParam(label = "producer,activity") private ActivitySchedulingOptions activitySchedulingOptions; - @UriParam + @UriParam(label = "consumer,activity") private ActivityTypeExecutionOptions activityTypeExecutionOptions; - @UriParam + @UriParam(label = "consumer,activity") private ActivityTypeRegistrationOptions activityTypeRegistrationOptions; - @UriParam + @UriParam(label = "consumer,workflow") private WorkflowTypeRegistrationOptions workflowTypeRegistrationOptions; - @UriParam(defaultValue = "100") + @UriParam(label = "consumer,activity", defaultValue = "100") private int activityThreadPoolSize = 100; // aws-sdk default public String getAccessKey() { return accessKey; } + /** + * Amazon AWS Access Key. + */ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } @@ -91,6 +94,9 @@ public class SWFConfiguration { return secretKey; } + /** + * Amazon AWS Secret Key. + */ public void setSecretKey(String secretKey) { this.secretKey = secretKey; } @@ -99,6 +105,9 @@ public class SWFConfiguration { return domainName; } + /** + * The workflow domain to use. + */ public void setDomainName(String domainName) { this.domainName = domainName; } @@ -107,6 +116,9 @@ public class SWFConfiguration { return activityList; } + /** + * The list name to consume activities from. + */ public void setActivityList(String activityList) { this.activityList = activityList; } @@ -115,6 +127,9 @@ public class SWFConfiguration { return workflowList; } + /** + * The list name to consume workflows from. + */ public void setWorkflowList(String workflowList) { this.workflowList = workflowList; } @@ -123,6 +138,9 @@ public class SWFConfiguration { return eventName; } + /** + * The workflow or activity event name to use. + */ public void setEventName(String eventName) { this.eventName = eventName; } @@ -131,6 +149,9 @@ public class SWFConfiguration { return version; } + /** + * The workflow or activity event version to use. + */ public void setVersion(String version) { this.version = version; } @@ -139,6 +160,9 @@ public class SWFConfiguration { return type; } + /** + * Activity or workflow + */ public void setType(String type) { this.type = type; } @@ -163,6 +187,9 @@ public class SWFConfiguration { return amazonSWClient; } + /** + * To use the given AmazonSimpleWorkflowClient as client + */ public void setAmazonSWClient(AmazonSimpleWorkflowClient amazonSWClient) { this.amazonSWClient = amazonSWClient; } @@ -179,6 +206,9 @@ public class SWFConfiguration { return operation; } + /** + * Workflow operation + */ public void setOperation(String operation) { this.operation = operation; } @@ -187,6 +217,9 @@ public class SWFConfiguration { return signalName; } + /** + * The name of the signal to send to the workflow. + */ public void setSignalName(String signalName) { this.signalName = signalName; } @@ -195,6 +228,9 @@ public class SWFConfiguration { return childPolicy; } + /** + * The policy to use on child workflows when terminating a workflow. + */ public void setChildPolicy(String childPolicy) { this.childPolicy = childPolicy; } @@ -203,6 +239,9 @@ public class SWFConfiguration { return terminationReason; } + /** + * The reason for terminating a workflow. + */ public void setTerminationReason(String terminationReason) { this.terminationReason = terminationReason; } @@ -211,6 +250,9 @@ public class SWFConfiguration { return stateResultType; } + /** + * The type of the result when a workflow state is queried. + */ public void setStateResultType(String stateResultType) { this.stateResultType = stateResultType; } @@ -219,6 +261,9 @@ public class SWFConfiguration { return terminationDetails; } + /** + * Details for terminating a workflow. + */ public void setTerminationDetails(String terminationDetails) { this.terminationDetails = terminationDetails; } @@ -227,6 +272,9 @@ public class SWFConfiguration { return activityTypeExecutionOptions; } + /** + * Activity execution options + */ public void setActivityTypeExecutionOptions(ActivityTypeExecutionOptions activityTypeExecutionOptions) { this.activityTypeExecutionOptions = activityTypeExecutionOptions; } @@ -235,6 +283,9 @@ public class SWFConfiguration { return activityTypeRegistrationOptions; } + /** + * Activity registration options + */ public void setActivityTypeRegistrationOptions(ActivityTypeRegistrationOptions activityTypeRegistrationOptions) { this.activityTypeRegistrationOptions = activityTypeRegistrationOptions; } @@ -243,6 +294,9 @@ public class SWFConfiguration { return dataConverter; } + /** + * An instance of com.amazonaws.services.simpleworkflow.flow.DataConverter to use for serializing/deserializing the data. + */ public void setDataConverter(DataConverter dataConverter) { this.dataConverter = dataConverter; } @@ -251,6 +305,9 @@ public class SWFConfiguration { return workflowTypeRegistrationOptions; } + /** + * Workflow registration options + */ public void setWorkflowTypeRegistrationOptions(WorkflowTypeRegistrationOptions workflowTypeRegistrationOptions) { this.workflowTypeRegistrationOptions = workflowTypeRegistrationOptions; } @@ -259,12 +316,18 @@ public class SWFConfiguration { return activitySchedulingOptions; } + /** + * Activity scheduling options + */ public void setActivitySchedulingOptions(ActivitySchedulingOptions activitySchedulingOptions) { this.activitySchedulingOptions = activitySchedulingOptions; } public int getActivityThreadPoolSize() { return activityThreadPoolSize; } + /** + * Maximum number of threads in work pool for activity. + */ public void setActivityThreadPoolSize(int activityThreadPoolSize) { this.activityThreadPoolSize = activityThreadPoolSize; } http://git-wip-us.apache.org/repos/asf/camel/blob/8d527295/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java index 4593f6f..f7646b2 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java @@ -35,7 +35,7 @@ public class SdbComponentConfigurationTest extends CamelTestSupport { assertNull(endpoint.getConfiguration().getAmazonSDBClient()); assertEquals(SdbOperations.PutAttributes, endpoint.getConfiguration().getOperation()); assertNull(endpoint.getConfiguration().getAmazonSdbEndpoint()); - assertNull(endpoint.getConfiguration().getConsistentRead()); + assertNull(endpoint.getConfiguration().isConsistentRead()); assertNull(endpoint.getConfiguration().getMaxNumberOfDomains()); } @@ -56,7 +56,7 @@ public class SdbComponentConfigurationTest extends CamelTestSupport { assertSame(mock, endpoint.getConfiguration().getAmazonSDBClient()); assertEquals(SdbOperations.PutAttributes, endpoint.getConfiguration().getOperation()); assertNull(endpoint.getConfiguration().getAmazonSdbEndpoint()); - assertNull(endpoint.getConfiguration().getConsistentRead()); + assertNull(endpoint.getConfiguration().isConsistentRead()); assertNull(endpoint.getConfiguration().getMaxNumberOfDomains()); } @@ -73,7 +73,7 @@ public class SdbComponentConfigurationTest extends CamelTestSupport { assertNull(endpoint.getConfiguration().getAmazonSDBClient()); assertEquals(SdbOperations.DeleteAttributes, endpoint.getConfiguration().getOperation()); assertNull(endpoint.getConfiguration().getAmazonSdbEndpoint()); - assertTrue(endpoint.getConfiguration().getConsistentRead()); + assertTrue(endpoint.getConfiguration().isConsistentRead()); assertEquals(new Integer(5), endpoint.getConfiguration().getMaxNumberOfDomains()); }
