Upgraded to twitter4j to 4.0.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/89bf2538 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/89bf2538 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/89bf2538 Branch: refs/heads/master Commit: 89bf25387d3798620dc6972067e4a563e11f0b5a Parents: ebc82ff Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jul 24 14:13:31 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 24 14:13:31 2014 +0200 ---------------------------------------------------------------------- .../camel/component/twitter/TwitterConfiguration.java | 12 ------------ .../camel/component/twitter/TwitterEndpointDirect.java | 8 -------- .../camel/component/twitter/TwitterEndpointEvent.java | 6 ------ .../camel/component/twitter/TwitterEndpointPolling.java | 6 ------ .../camel/component/twitter/UriConfigurationTest.java | 10 ---------- parent/pom.xml | 4 ++-- 6 files changed, 2 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/89bf2538/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 6edf057..74cb29b 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 @@ -131,9 +131,6 @@ public class TwitterConfiguration { @UriParam private Integer httpProxyPort; - @UriParam - private boolean useSSL = true; - /** * Singleton, on demand instances of Twitter4J's Twitter & TwitterStream. * This should not be created by an endpoint's doStart(), etc., since @@ -166,7 +163,6 @@ public class TwitterConfiguration { confBuilder.setOAuthConsumerSecret(consumerSecret); confBuilder.setOAuthAccessToken(accessToken); confBuilder.setOAuthAccessTokenSecret(accessTokenSecret); - confBuilder.setUseSSL(useSSL); if (getHttpProxyHost() != null) { confBuilder.setHttpProxyHost(getHttpProxyHost()); } @@ -215,14 +211,6 @@ public class TwitterConfiguration { this.accessTokenSecret = accessTokenSecret; } - public boolean getUseSSL() { - return useSSL; - } - - public void setUseSSL(boolean useSSL) { - this.useSSL = useSSL; - } - public String getUser() { return user; } http://git-wip-us.apache.org/repos/asf/camel/blob/89bf2538/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 52c532c..79c3279 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 @@ -185,12 +185,4 @@ public class TwitterEndpointDirect extends DirectEndpoint implements TwitterEndp return ExchangePattern.InOptionalOut; } - @Override - public void shutdown() throws Exception { - super.shutdown(); - properties.getTwitter().shutdown(); - } - - - } http://git-wip-us.apache.org/repos/asf/camel/blob/89bf2538/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 c51e7c6..c4f45be 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 @@ -69,10 +69,4 @@ public class TwitterEndpointEvent extends DirectEndpoint implements TwitterEndpo } } - @Override - public void shutdown() throws Exception { - super.shutdown(); - properties.getTwitter().shutdown(); - } - } http://git-wip-us.apache.org/repos/asf/camel/blob/89bf2538/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 f670951..8f7a272 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 @@ -183,10 +183,4 @@ public class TwitterEndpointPolling extends DefaultPollingEndpoint implements Tw return EndpointType.POLLING; } - @Override - public void shutdown() throws Exception { - super.shutdown(); - properties.getTwitter().shutdown(); - } - } http://git-wip-us.apache.org/repos/asf/camel/blob/89bf2538/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java index d989b39..4ff51a6 100644 --- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java +++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java @@ -39,7 +39,6 @@ public class UriConfigurationTest extends Assert { assertTrue(!twitterEndpoint.getProperties().getConsumerSecret().isEmpty()); assertTrue(!twitterEndpoint.getProperties().getAccessToken().isEmpty()); assertTrue(!twitterEndpoint.getProperties().getAccessTokenSecret().isEmpty()); - assertTrue(twitterEndpoint.getProperties().getUseSSL()); } @Test @@ -65,15 +64,6 @@ public class UriConfigurationTest extends Assert { } @Test - public void testUseSSLSetting() throws Exception { - Endpoint endpoint = context.getEndpoint("twitter:todo/todo?useSSL=false"); - assertTrue("Endpoint not a TwitterEndpoint: " + endpoint, endpoint instanceof TwitterEndpoint); - TwitterEndpoint twitterEndpoint = (TwitterEndpoint) endpoint; - - assertFalse(twitterEndpoint.getProperties().getUseSSL()); - } - - @Test public void testComponentConfiguration() throws Exception { TwitterComponent comp = context.getComponent("twitter", TwitterComponent.class); EndpointConfiguration conf = comp.createConfiguration("twitter:search?keywords=camel"); http://git-wip-us.apache.org/repos/asf/camel/blob/89bf2538/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 047d5fe..8f3aab9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -407,8 +407,8 @@ <tagsoup-bundle-version>1.2_5</tagsoup-bundle-version> <tagsoup-version>1.2.1</tagsoup-version> <testng-version>6.8.8</testng-version> - <twitter4j-bundle-version>3.0.5_1</twitter4j-bundle-version> - <twitter4j-version>3.0.5</twitter4j-version> + <twitter4j-bundle-version>4.0.1_1</twitter4j-bundle-version> + <twitter4j-version>4.0.1</twitter4j-version> <urlrewritefilter-version>4.0.4</urlrewritefilter-version> <urlrewritefilter-bundle-version>4.0.4_1</urlrewritefilter-bundle-version> <validation-api-version>1.1.0.Final</validation-api-version>
