From 00a4bc8cc79aa25c94ec2d741a95b6dfffb041e4 Mon Sep 17 00:00:00 2001 From: Gunnar Hillert Date: Fri, 21 Feb 2014 17:45:04 -0500 Subject: [PATCH] INT-3307 Twitter: Upgrade Spring Social Twitter to 1.1.0 Jira: https://jira.springsource.org/browse/INT-3307 --- build.gradle | 2 +- .../inbound/SearchReceivingMessageSource.java | 5 ++-- ...estSendingMessageHandlerParser-context.xml | 24 ++++++++++--------- .../SearchReceivingMessageSourceTests.java | 4 ++-- ...hReceivingMessageSourceWithRedisTests.java | 4 ++-- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index ab7e08e8de..8201aad3c7 100644 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,7 @@ subprojects { subproject -> springDataRedisVersion = '1.1.1.RELEASE' springGemfireVersion = '1.3.1.RELEASE' springSecurityVersion = '3.1.3.RELEASE' - springSocialTwitterVersion = '1.0.5.RELEASE' + springSocialTwitterVersion = '1.1.0.M4' springRetryVersion = '1.0.3.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.0.2.RELEASE' springWsVersion = '2.1.1.RELEASE' diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSource.java index ae8bf4a377..6014c69457 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,12 +22,13 @@ import java.util.List; import org.springframework.social.twitter.api.SearchResults; import org.springframework.social.twitter.api.Tweet; import org.springframework.social.twitter.api.Twitter; -import org.springframework.social.twitter.api.impl.SearchParameters; +import org.springframework.social.twitter.api.SearchParameters; import org.springframework.util.Assert; /** * @author Oleg Zhurakousky * @author Mark Fisher + * @author Gunnar Hillert * @since 2.0 */ public class SearchReceivingMessageSource extends AbstractTwitterMessageSource { diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml index e3c6e36120..5388c02a91 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml @@ -14,35 +14,37 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool.xsd - http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd + http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd"> - - + + + + - + - + twitter-template="twitter" + channel="inputChannel"/> + - + - + - + diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java index fe213d14f7..684f0263d2 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.social.twitter.api.SearchOperations; import org.springframework.social.twitter.api.SearchResults; import org.springframework.social.twitter.api.Tweet; import org.springframework.social.twitter.api.Twitter; -import org.springframework.social.twitter.api.impl.SearchParameters; +import org.springframework.social.twitter.api.SearchParameters; import org.springframework.social.twitter.api.impl.TwitterTemplate; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java index 6e1ad27af0..5092a28bb4 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ import org.springframework.social.twitter.api.SearchOperations; import org.springframework.social.twitter.api.SearchResults; import org.springframework.social.twitter.api.Tweet; import org.springframework.social.twitter.api.UserOperations; -import org.springframework.social.twitter.api.impl.SearchParameters; +import org.springframework.social.twitter.api.SearchParameters; import org.springframework.social.twitter.api.impl.TwitterTemplate; /**