CAMEL-7999: More components include documentation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf1219d0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf1219d0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf1219d0 Branch: refs/heads/master Commit: bf1219d0b9b0a7feb72e66dafa3b7bf645184fc1 Parents: 19d8971 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Jan 6 15:13:31 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jan 6 15:13:31 2015 +0100 ---------------------------------------------------------------------- .../camel/component/aws/sdb/SdbComponent.java | 7 ++++--- .../component/aws/sdb/SdbConfiguration.java | 22 +++++++++++++------- .../camel/component/aws/sdb/SdbEndpoint.java | 9 ++++++-- .../camel/component/aws/ses/SesComponent.java | 7 ++++--- .../component/aws/ses/SesConfiguration.java | 21 +++++++++++++------ .../camel/component/aws/ses/SesEndpoint.java | 10 ++++++--- 6 files changed, 52 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bf1219d0/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java index becb8074..fd6ce02 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java @@ -20,18 +20,19 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; /** * Defines the <a href="http://aws.amazon.com/simpledb/">AWS SDB component</a> */ -public class SdbComponent extends DefaultComponent { +public class SdbComponent extends UriEndpointComponent { public SdbComponent() { + super(SdbEndpoint.class); } public SdbComponent(CamelContext context) { - super(context); + super(context, SdbEndpoint.class); } protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/bf1219d0/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 7d58159..62396b7 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 @@ -17,20 +17,28 @@ package org.apache.camel.component.aws.sdb; import com.amazonaws.services.simpledb.AmazonSimpleDB; +import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriParams; +import org.apache.camel.spi.UriPath; -/** - * The AWS SDB component configuration properties - * - */ +@UriParams public class SdbConfiguration { - + + @UriPath + private String domainName; + @UriParam + private AmazonSimpleDB amazonSDBClient; + @UriParam private String accessKey; + @UriParam private String secretKey; - private AmazonSimpleDB amazonSDBClient; + @UriParam private String amazonSdbEndpoint; - private String domainName; + @UriParam private Integer maxNumberOfDomains; + @UriParam(defaultValue = "false") private Boolean consistentRead; + @UriParam(defaultValue = "PutAttributes") private SdbOperations operation = SdbOperations.PutAttributes; public void setAmazonSdbEndpoint(String amazonSdbEndpoint) { http://git-wip-us.apache.org/repos/asf/camel/blob/bf1219d0/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java index 0a781a6..253fde6 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java @@ -30,20 +30,25 @@ import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.component.aws.s3.S3Endpoint; import org.apache.camel.impl.ScheduledPollEndpoint; +import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; 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 SDB Endpoint</a>. - * */ +@UriEndpoint(scheme = "aws-sdb", label = "cloud,database,nosql") public class SdbEndpoint extends ScheduledPollEndpoint { private static final Logger LOG = LoggerFactory.getLogger(S3Endpoint.class); - private SdbConfiguration configuration; + private AmazonSimpleDB sdbClient; + @UriParam + private SdbConfiguration configuration; + @Deprecated public SdbEndpoint(String uri, CamelContext context, SdbConfiguration configuration) { super(uri, context); http://git-wip-us.apache.org/repos/asf/camel/blob/bf1219d0/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java index 9e96181..11becd1 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java @@ -20,18 +20,19 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; /** * Defines the <a href="http://aws.amazon.com/ses/">AWS SES component</a> */ -public class SesComponent extends DefaultComponent { +public class SesComponent extends UriEndpointComponent { public SesComponent() { + super(SesEndpoint.class); } public SesComponent(CamelContext context) { - super(context); + super(context, SesEndpoint.class); } protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/bf1219d0/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 9b8d6ef..b06c528 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 @@ -20,21 +20,30 @@ import java.util.Arrays; import java.util.List; import com.amazonaws.services.simpleemail.AmazonSimpleEmailService; +import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriParams; +import org.apache.camel.spi.UriPath; -/** - * The AWS SES component configuration properties - * - */ +@UriParams public class SesConfiguration { - + + @UriPath + private String from; + @UriParam private AmazonSimpleEmailService amazonSESClient; + @UriParam private String accessKey; + @UriParam private String secretKey; + @UriParam private String amazonSESEndpoint; + @UriParam private String subject; - private String from; + @UriParam private List<String> to; + @UriParam private String returnPath; + @UriParam private List<String> replyToAddresses; public String getAccessKey() { http://git-wip-us.apache.org/repos/asf/camel/blob/bf1219d0/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java index 0cd952b..f0bb105 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java @@ -26,18 +26,22 @@ import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; import org.apache.camel.util.ObjectHelper; /** * Defines the <a href="http://camel.apache.org/aws.html">AWS SES Endpoint</a>. * */ +@UriEndpoint(scheme = "aws-ses", label = "cloud,mail") public class SesEndpoint extends DefaultEndpoint { - - private SesConfiguration configuration; - + private AmazonSimpleEmailService sesClient; + @UriParam + private SesConfiguration configuration; + @Deprecated public SesEndpoint(String uri, CamelContext context, SesConfiguration configuration) { super(uri, context);