You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/06 08:25:28 UTC
svn commit: r1227999 - in /camel/trunk/components/camel-twitter: ./
src/main/java/org/apache/camel/component/twitter/
src/main/java/org/apache/camel/component/twitter/consumer/
src/main/java/org/apache/camel/component/twitter/consumer/directmessage/
sr...
Author: davsclaus
Date: Fri Jan 6 07:25:27 2012
New Revision: 1227999
URL: http://svn.apache.org/viewvc?rev=1227999&view=rev
Log:
CAMEL-4017: Polished
Added:
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java (contents, props changed)
- copied, changed from r1227952, camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterProperties.java
Removed:
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterProperties.java
camel/trunk/components/camel-twitter/src/main/resources/log4j.properties
Modified:
camel/trunk/components/camel-twitter/pom.xml
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/Twitter4JFactory.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpoint.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerPolling.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/directmessage/DirectMessageConsumer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/search/SearchConsumer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/SampleConsumer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/StreamingConsumer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/PublicConsumer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/ConsumerType.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/EndpointType.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/GeoLocation.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/Status.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/StreamingType.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/TimelineType.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/TrendsType.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/User.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/DirectMessageProducer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/UserProducer.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java
camel/trunk/components/camel-twitter/src/test/resources/log4j.properties
camel/trunk/components/camel-twitter/src/test/resources/test-options.properties
Modified: camel/trunk/components/camel-twitter/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/pom.xml?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/pom.xml (original)
+++ camel/trunk/components/camel-twitter/pom.xml Fri Jan 6 07:25:27 2012
@@ -41,10 +41,6 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- </dependency>
- <dependency>
<groupId>org.twitter4j</groupId>
<artifactId>twitter4j-core</artifactId>
<version>${twitter4j-version}</version>
@@ -56,6 +52,11 @@
</dependency>
<!-- testing -->
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -64,7 +65,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/Twitter4JFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/Twitter4JFactory.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/Twitter4JFactory.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/Twitter4JFactory.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter;
import java.util.regex.Pattern;
@@ -177,7 +176,7 @@ public final class Twitter4JFactory {
}
- LOG.warn("A producer type was not provided (or an incorrect pairing was used). Defaulting to a MOCK!");
+ LOG.warn("A producer type was not provided (or an incorrect pairing was used). Defaulting to a MOCK!");
throw new IllegalArgumentException("Cannot create any producer with uri " + uri
+ "A producer type was not provided (or an incorrect pairing was used).");
}
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterComponent.java Fri Jan 6 07:25:27 2012
@@ -20,21 +20,19 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.component.twitter.data.EndpointType;
-import org.apache.camel.component.twitter.util.TwitterProperties;
import org.apache.camel.impl.DefaultComponent;
/**
- * Main component class
- *
+ * Twitter component
*/
public class TwitterComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters)
throws Exception {
- TwitterProperties properties = new TwitterProperties();
+ TwitterConfiguration properties = new TwitterConfiguration();
setProperties(properties, parameters);
- TwitterEndpoint endpoint = null;
+ TwitterEndpoint endpoint;
switch (EndpointType.fromUri(properties.getType())) {
case POLLING:
endpoint = new TwitterEndpointPolling(uri, this, properties);
Copied: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java (from r1227952, camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterProperties.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java?p2=camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java&p1=camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterProperties.java&r1=1227952&r2=1227999&rev=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterProperties.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java Fri Jan 6 07:25:27 2012
@@ -14,41 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.camel.component.twitter.util;
+package org.apache.camel.component.twitter;
import twitter4j.conf.Configuration;
import twitter4j.conf.ConfigurationBuilder;
-/**
- * Encapsolates all options provided on the endpoint URI.
- *
- */
-public class TwitterProperties {
+public class TwitterConfiguration {
private String consumerKey;
-
private String consumerSecret;
-
private String accessToken;
-
private String accessTokenSecret;
-
private String user;
-
private String keywords;
-
private int delay = 60;
-
private String type;
-
private String locations;
public void checkComplete() {
if (consumerKey.isEmpty() || consumerSecret.isEmpty() || accessToken.isEmpty()
|| accessTokenSecret.isEmpty()) {
- throw new IllegalArgumentException(
- "consumerKey, consumerSecret, accessToken, and accessTokenSecret must be set!");
+ throw new IllegalArgumentException("consumerKey, consumerSecret, accessToken, and accessTokenSecret must be set!");
}
}
Propchange: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpoint.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpoint.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpoint.java Fri Jan 6 07:25:27 2012
@@ -17,7 +17,6 @@
package org.apache.camel.component.twitter;
import org.apache.camel.Endpoint;
-import org.apache.camel.component.twitter.util.TwitterProperties;
import twitter4j.Twitter;
@@ -27,5 +26,5 @@ public interface TwitterEndpoint extends
Twitter getTwitter();
- TwitterProperties getProperties();
+ TwitterConfiguration getProperties();
}
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointDirect.java Fri Jan 6 07:25:27 2012
@@ -22,23 +22,18 @@ import org.apache.camel.Producer;
import org.apache.camel.component.direct.DirectEndpoint;
import org.apache.camel.component.twitter.consumer.Twitter4JConsumer;
import org.apache.camel.component.twitter.consumer.TwitterConsumerDirect;
-import org.apache.camel.component.twitter.util.TwitterProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import twitter4j.Twitter;
import twitter4j.TwitterFactory;
-
+/**
+ * Twitter direct endpoint
+ */
public class TwitterEndpointDirect extends DirectEndpoint implements TwitterEndpoint {
- private static final Logger LOG = LoggerFactory.getLogger(TwitterEndpointDirect.class);
-
private Twitter twitter;
+ private TwitterConfiguration properties;
- private TwitterProperties properties;
-
- public TwitterEndpointDirect(String uri, TwitterComponent component, TwitterProperties properties) {
+ public TwitterEndpointDirect(String uri, TwitterComponent component, TwitterConfiguration properties) {
super(uri, component);
this.properties = properties;
}
@@ -54,19 +49,14 @@ public class TwitterEndpointDirect exten
public void initiate() {
properties.checkComplete();
-
- try {
- twitter = new TwitterFactory(properties.getConfiguration()).getInstance();
- } catch (Exception e) {
- LOG.error("Could not instantiate Twitter! Exception: " + e.getMessage());
- }
+ twitter = new TwitterFactory(properties.getConfiguration()).getInstance();
}
public Twitter getTwitter() {
return twitter;
}
- public TwitterProperties getProperties() {
+ public TwitterConfiguration getProperties() {
return properties;
}
}
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterEndpointPolling.java Fri Jan 6 07:25:27 2012
@@ -22,27 +22,19 @@ import org.apache.camel.Producer;
import org.apache.camel.component.twitter.consumer.Twitter4JConsumer;
import org.apache.camel.component.twitter.consumer.TwitterConsumer;
import org.apache.camel.component.twitter.consumer.TwitterConsumerPolling;
-import org.apache.camel.component.twitter.util.TwitterProperties;
import org.apache.camel.impl.DefaultPollingEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import twitter4j.Twitter;
import twitter4j.TwitterFactory;
/**
- * Scheduled polling endpoint
- *
+ * Twitter polling endpoint
*/
public class TwitterEndpointPolling extends DefaultPollingEndpoint implements TwitterEndpoint {
- private static final Logger LOG = LoggerFactory.getLogger(TwitterEndpointPolling.class);
-
private Twitter twitter;
+ private TwitterConfiguration properties;
- private TwitterProperties properties;
-
- public TwitterEndpointPolling(String uri, TwitterComponent component, TwitterProperties properties) {
+ public TwitterEndpointPolling(String uri, TwitterComponent component, TwitterConfiguration properties) {
super(uri, component);
this.properties = properties;
}
@@ -60,12 +52,7 @@ public class TwitterEndpointPolling exte
public void initiate() {
properties.checkComplete();
-
- try {
- twitter = new TwitterFactory(properties.getConfiguration()).getInstance();
- } catch (Exception e) {
- LOG.error("Could not instantiate Twitter! Exception: " + e.getMessage());
- }
+ twitter = new TwitterFactory(properties.getConfiguration()).getInstance();
}
public Twitter getTwitter() {
@@ -76,7 +63,7 @@ public class TwitterEndpointPolling exte
return true;
}
- public TwitterProperties getProperties() {
+ public TwitterConfiguration getProperties() {
return properties;
}
}
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerPolling.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerPolling.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerPolling.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/TwitterConsumerPolling.java Fri Jan 6 07:25:27 2012
@@ -32,19 +32,15 @@ import org.apache.camel.impl.ScheduledPo
public class TwitterConsumerPolling extends ScheduledPollConsumer implements TwitterConsumer {
private Twitter4JConsumer twitter4jConsumer;
-
private long lastStatusUpdateID = 1;
- private int delay;
-
public TwitterConsumerPolling(TwitterEndpoint endpoint, Processor processor,
Twitter4JConsumer twitter4jConsumer) {
super(endpoint, processor);
this.twitter4jConsumer = twitter4jConsumer;
- delay = endpoint.getProperties().getDelay();
-
+ int delay = endpoint.getProperties().getDelay();
setInitialDelay(0);
setDelay(delay);
setTimeUnit(TimeUnit.SECONDS);
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/directmessage/DirectMessageConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/directmessage/DirectMessageConsumer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/directmessage/DirectMessageConsumer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/directmessage/DirectMessageConsumer.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.consumer.directmessage;
import java.util.ArrayList;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/search/SearchConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/search/SearchConsumer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/search/SearchConsumer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/search/SearchConsumer.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.consumer.search;
import java.util.ArrayList;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.consumer.streaming;
import org.apache.camel.component.twitter.TwitterEndpoint;
@@ -32,8 +31,7 @@ public class FilterConsumer extends Stre
public FilterConsumer(TwitterEndpoint te) {
super(te);
- TwitterStream twitterStream = new TwitterStreamFactory(te.getProperties().getConfiguration())
- .getInstance();
+ TwitterStream twitterStream = new TwitterStreamFactory(te.getProperties().getConfiguration()).getInstance();
twitterStream.addListener(this);
String allLocationsString = te.getProperties().getLocations();
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/SampleConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/SampleConsumer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/SampleConsumer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/SampleConsumer.java Fri Jan 6 07:25:27 2012
@@ -30,8 +30,7 @@ public class SampleConsumer extends Stre
public SampleConsumer(TwitterEndpoint te) {
super(te);
- TwitterStream twitterStream = new TwitterStreamFactory(te.getProperties().getConfiguration())
- .getInstance();
+ TwitterStream twitterStream = new TwitterStreamFactory(te.getProperties().getConfiguration()).getInstance();
twitterStream.addListener(this);
twitterStream.sample();
}
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/StreamingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/StreamingConsumer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/StreamingConsumer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/StreamingConsumer.java Fri Jan 6 07:25:27 2012
@@ -37,9 +37,7 @@ import twitter4j.TwitterException;
public class StreamingConsumer implements Twitter4JConsumer, StatusListener {
TwitterEndpoint te;
-
private List<Status> receivedStatuses = new ArrayList<Status>();
-
private boolean clear;
public StreamingConsumer(TwitterEndpoint te) {
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/HomeConsumer.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.consumer.timeline;
import java.util.Iterator;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.consumer.timeline;
import java.util.Iterator;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/PublicConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/PublicConsumer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/PublicConsumer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/PublicConsumer.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.consumer.timeline;
import java.util.Iterator;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/RetweetsConsumer.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.consumer.timeline;
import java.util.Iterator;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/UserConsumer.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.consumer.timeline;
import java.util.Iterator;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/ConsumerType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/ConsumerType.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/ConsumerType.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/ConsumerType.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.data;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/EndpointType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/EndpointType.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/EndpointType.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/EndpointType.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.data;
public enum EndpointType {
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/GeoLocation.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/GeoLocation.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/GeoLocation.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/GeoLocation.java Fri Jan 6 07:25:27 2012
@@ -14,13 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.data;
public class GeoLocation {
private double latitude;
-
private double longitude;
public GeoLocation(twitter4j.GeoLocation geoLocation) {
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/Status.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/Status.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/Status.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/Status.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.data;
import java.util.Date;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/StreamingType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/StreamingType.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/StreamingType.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/StreamingType.java Fri Jan 6 07:25:27 2012
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.twitter.data;
-
-
public enum StreamingType {
SAMPLE, FILTER, UNKNOWN;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/TimelineType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/TimelineType.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/TimelineType.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/TimelineType.java Fri Jan 6 07:25:27 2012
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.data;
-
public enum TimelineType {
PUBLIC, HOME, USER, MENTIONS, RETWEETSOFME, UNKNOWN;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/TrendsType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/TrendsType.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/TrendsType.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/TrendsType.java Fri Jan 6 07:25:27 2012
@@ -14,13 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.data;
-
-/**
- * @author Brett E. Meyer (3RiverDev.com)
- */
public enum TrendsType {
DAILY, WEEKLY, UNKNOWN;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/User.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/User.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/User.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/User.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.data;
import java.net.URL;
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/DirectMessageProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/DirectMessageProducer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/DirectMessageProducer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/DirectMessageProducer.java Fri Jan 6 07:25:27 2012
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.twitter.producer;
+import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.twitter.TwitterEndpoint;
@@ -30,7 +31,6 @@ import org.slf4j.LoggerFactory;
public class DirectMessageProducer extends DefaultProducer implements Processor {
private static final transient Logger LOG = LoggerFactory.getLogger(DirectMessageProducer.class);
-
private TwitterEndpoint te;
public DirectMessageProducer(TwitterEndpoint te) {
@@ -44,9 +44,11 @@ public class DirectMessageProducer exten
String text = exchange.getIn().getBody(String.class);
if (toUsername.isEmpty()) {
- LOG.error("Can't send direct message -- no 'user' provided!");
+ throw new CamelExchangeException("Username not configured on TwitterEndpoint", exchange);
} else {
+ LOG.debug("Sending to: {} message: {}", toUsername, text);
te.getTwitter().sendDirectMessage(toUsername, text);
}
}
+
}
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/UserProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/UserProducer.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/UserProducer.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/UserProducer.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.producer;
import org.apache.camel.Exchange;
@@ -31,7 +30,6 @@ import org.slf4j.LoggerFactory;
public class UserProducer extends DefaultProducer implements Processor {
private static final transient Logger LOG = LoggerFactory.getLogger(UserProducer.class);
-
private TwitterEndpoint te;
public UserProducer(TwitterEndpoint te) {
@@ -44,11 +42,11 @@ public class UserProducer extends Defaul
String status = exchange.getIn().getBody(String.class);
if (status.length() > 160) {
- LOG.warn("Message is longer than 160 characteres and it will be truncated!");
- status.substring(0, 160);
+ LOG.warn("Message is longer than 160 characters. Message will be truncated!");
+ status = status.substring(0, 160);
}
te.getTwitter().updateStatus(status);
- LOG.debug("Successfully updated status with '{0}'", status);
+ LOG.debug("Updated status: {}", status);
}
}
Modified: camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java (original)
+++ camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java Fri Jan 6 07:25:27 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.twitter.util;
import java.text.ParseException;
Modified: camel/trunk/components/camel-twitter/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/test/resources/log4j.properties?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-twitter/src/test/resources/log4j.properties Fri Jan 6 07:25:27 2012
@@ -18,10 +18,10 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=INFO, file, out
+log4j.rootLogger=INFO, file
-log4j.logger.org.apache.camel.component.twitter=INFO
-log4j.logger.twitter4j=INFO
+#log4j.logger.twitter4j=DEBUG
+#log4j.logger.org.apache.camel.component.twitter=DEBUG
#log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
Modified: camel/trunk/components/camel-twitter/src/test/resources/test-options.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/test/resources/test-options.properties?rev=1227999&r1=1227998&r2=1227999&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/test/resources/test-options.properties (original)
+++ camel/trunk/components/camel-twitter/src/test/resources/test-options.properties Fri Jan 6 07:25:27 2012
@@ -1,3 +1,20 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
consumer.key=xHW7Fhx2wzu33LMs68C6g
consumer.secret=bvPpSVCK3dJCGAmmo90qqFFRdlvcyQ4w7oBu5pp4WY
access.token=107890695-tH3LCcWuGO8XnUIItJXBW9V2uY3avCcjgxHg1BSc