Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3307 Twitter: Upgrade Spring Social Twitter to 1.1.0

Browse Source 
Jira: https://jira.springsource.org/browse/INT-3307
This commit is contained in:
Gunnar Hillert
2014-02-21 17:45:04 -05:00
committed by Artem Bilan
parent 6a840783e7
commit 00a4bc8cc7
5 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -101,7 +101,7 @@ subprojects { subproject ->
springDataRedisVersion = '1.1.1.RELEASE' springDataRedisVersion = '1.1.1.RELEASE'
springGemfireVersion = '1.3.1.RELEASE' springGemfireVersion = '1.3.1.RELEASE'
springSecurityVersion = '3.1.3.RELEASE' springSecurityVersion = '3.1.3.RELEASE'
springSocialTwitterVersion = '1.0.5.RELEASE' springSocialTwitterVersion = '1.1.0.M4'
springRetryVersion = '1.0.3.RELEASE' springRetryVersion = '1.0.3.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.0.2.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.0.2.RELEASE'
springWsVersion = '2.1.1.RELEASE' springWsVersion = '2.1.1.RELEASE'

5
spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSource.java
View File

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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.SearchResults;
import org.springframework.social.twitter.api.Tweet; import org.springframework.social.twitter.api.Tweet;
import org.springframework.social.twitter.api.Twitter; 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; import org.springframework.util.Assert;
/** /**
* @author Oleg Zhurakousky * @author Oleg Zhurakousky
* @author Mark Fisher * @author Mark Fisher
* @author Gunnar Hillert
* @since 2.0 * @since 2.0
*/ */
public class SearchReceivingMessageSource extends AbstractTwitterMessageSource<Tweet> { public class SearchReceivingMessageSource extends AbstractTwitterMessageSource<Tweet> {

24
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParser-context.xml
View File

@@ -14,35 +14,37 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd 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/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/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"> http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd">
<beans:bean id="twitter" class="org.springframework.social.twitter.api.impl.TwitterTemplate"/> <beans:bean id="twitter" class="org.springframework.social.twitter.api.impl.TwitterTemplate">
<beans:constructor-arg name="clientToken" value="myDummyClientToken"/>
</beans:bean>
<channel id="inbound_mentions"/> <channel id="inbound_mentions"/>
<channel id="inputChannel"/> <channel id="inputChannel"/>
<twitter:dm-outbound-channel-adapter id="dmAdapter" order="23" <twitter:dm-outbound-channel-adapter id="dmAdapter" order="23"
twitter-template="twitter" twitter-template="twitter"
channel="inputChannel"/> channel="inputChannel"/>
<twitter:outbound-channel-adapter twitter-template="twitter" channel="inputChannel" /> <twitter:outbound-channel-adapter twitter-template="twitter" channel="inputChannel" />
<twitter:dm-outbound-channel-adapter id="dmAdvised" order="23" <twitter:dm-outbound-channel-adapter id="dmAdvised" order="23"
twitter-template="twitter" twitter-template="twitter"
channel="inputChannel"> channel="inputChannel">
<twitter:request-handler-advice-chain> <twitter:request-handler-advice-chain>
<beans:bean class="org.springframework.integration.twitter.config.TestSendingMessageHandlerParserTests$FooAdvice" /> <beans:bean class="org.springframework.integration.twitter.config.TestSendingMessageHandlerParserTests$FooAdvice" />
</twitter:request-handler-advice-chain> </twitter:request-handler-advice-chain>
</twitter:dm-outbound-channel-adapter> </twitter:dm-outbound-channel-adapter>
<twitter:outbound-channel-adapter id="advised" twitter-template="twitter" channel="inputChannel"> <twitter:outbound-channel-adapter id="advised" twitter-template="twitter" channel="inputChannel">
<twitter:request-handler-advice-chain> <twitter:request-handler-advice-chain>
<beans:bean class="org.springframework.integration.twitter.config.TestSendingMessageHandlerParserTests$FooAdvice" /> <beans:bean class="org.springframework.integration.twitter.config.TestSendingMessageHandlerParserTests$FooAdvice" />
</twitter:request-handler-advice-chain> </twitter:request-handler-advice-chain>
</twitter:outbound-channel-adapter> </twitter:outbound-channel-adapter>
</beans:beans> </beans:beans>

4
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java
View File

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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.SearchResults;
import org.springframework.social.twitter.api.Tweet; import org.springframework.social.twitter.api.Tweet;
import org.springframework.social.twitter.api.Twitter; 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; import org.springframework.social.twitter.api.impl.TwitterTemplate;

4
spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java
View File

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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.SearchResults;
import org.springframework.social.twitter.api.Tweet; import org.springframework.social.twitter.api.Tweet;
import org.springframework.social.twitter.api.UserOperations; 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; import org.springframework.social.twitter.api.impl.TwitterTemplate;
/** /**