CAMEL-8038: Fixed @UriPath
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9833c58e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9833c58e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9833c58e Branch: refs/heads/master Commit: 9833c58ebddf2e17763ad6dd5a9c401d078ac477 Parents: c340bd4 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Nov 24 10:38:42 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Nov 24 11:12:20 2014 +0100 ---------------------------------------------------------------------- .../component/twitter/TwitterComponent.java | 3 ++- .../component/twitter/TwitterConfiguration.java | 26 +++++++++++--------- .../twitter/TwitterEndpointDirect.java | 2 +- .../component/twitter/TwitterEndpointEvent.java | 2 +- .../twitter/TwitterEndpointPolling.java | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9833c58e/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java index 7b85afe..1407813 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java @@ -50,7 +50,8 @@ public class TwitterComponent extends UriEndpointComponent { setProperties(properties, parameters); TwitterEndpoint endpoint; - switch (EndpointType.fromUri(properties.getType())) { + + switch (properties.getType()) { case POLLING: endpoint = new TwitterEndpointPolling(uri, this, properties); break; http://git-wip-us.apache.org/repos/asf/camel/blob/9833c58e/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java index 74cb29b..8de58c8 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java @@ -20,8 +20,10 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import org.apache.camel.component.twitter.data.EndpointType; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; +import org.apache.camel.spi.UriPath; import twitter4j.Twitter; import twitter4j.TwitterFactory; import twitter4j.TwitterStream; @@ -33,6 +35,12 @@ import twitter4j.conf.ConfigurationBuilder; public class TwitterConfiguration { /** + * Defines the Twitter API endpoint. + */ + @UriPath(description = "What kind of type to use") + private EndpointType type = EndpointType.DIRECT; + + /** * OAuth */ @UriParam @@ -45,15 +53,9 @@ public class TwitterConfiguration { private String accessTokenSecret; /** - * Defines the Twitter API endpoint. - */ - @UriParam - private String type; - - /** * Polling delay. */ - @UriParam + @UriParam(defaultValue = "60") private int delay = 60; /** @@ -83,7 +85,7 @@ public class TwitterConfiguration { /** * Filter out old tweets that have been previously polled. */ - @UriParam + @UriParam(defaultValue = "true") private boolean filterOld = true; /** @@ -95,7 +97,7 @@ public class TwitterConfiguration { /** * Used to set the sinceId from pulling */ - @UriParam + @UriParam(defaultValue = "1") private long sinceId = 1; /** @@ -116,7 +118,7 @@ public class TwitterConfiguration { /** * Number of page to iterate before stop (default is 1) */ - @UriParam + @UriParam(defaultValue = "1") private Integer numberOfPages = 1; @UriParam @@ -235,11 +237,11 @@ public class TwitterConfiguration { this.delay = delay; } - public String getType() { + public EndpointType getType() { return type; } - public void setType(String type) { + public void setType(EndpointType type) { this.type = type; } http://git-wip-us.apache.org/repos/asf/camel/blob/9833c58e/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java index 79c3279..59791af 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java @@ -32,7 +32,7 @@ import org.apache.camel.spi.UriParam; /** * Twitter direct endpoint */ -@UriEndpoint(scheme = "twitter", consumerClass = Twitter4JConsumer.class) +@UriEndpoint(scheme = "twitter", consumerClass = Twitter4JConsumer.class, label = "api,social") public class TwitterEndpointDirect extends DirectEndpoint implements TwitterEndpoint { @UriParam http://git-wip-us.apache.org/repos/asf/camel/blob/9833c58e/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointEvent.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointEvent.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointEvent.java index c4f45be..fefbf44 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointEvent.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointEvent.java @@ -26,7 +26,7 @@ import org.apache.camel.component.twitter.data.EndpointType; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; -@UriEndpoint(scheme = "twitter", consumerClass = Twitter4JConsumer.class) +@UriEndpoint(scheme = "twitter", consumerClass = Twitter4JConsumer.class, label = "api,social") public class TwitterEndpointEvent extends DirectEndpoint implements TwitterEndpoint { @UriParam http://git-wip-us.apache.org/repos/asf/camel/blob/9833c58e/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java index 8f7a272..9c70773 100644 --- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java +++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java @@ -33,7 +33,7 @@ import org.apache.camel.spi.UriParam; * Twitter polling endpoint */ @ManagedResource(description = "Managed Twitter Endpoint") -@UriEndpoint(scheme = "twitter", consumerClass = Twitter4JConsumer.class) +@UriEndpoint(scheme = "twitter", consumerClass = Twitter4JConsumer.class, label = "api,social") public class TwitterEndpointPolling extends DefaultPollingEndpoint implements TwitterEndpoint { @UriParam
