From 24521e97b9859590ba40e85f1b62ddc62a3ac1c8 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 12 Nov 2010 11:21:44 -0500 Subject: [PATCH] minor polishing of Twitter before polishing the Twitter docs --- .../integration/twitter/core/TwitterHeaders.java | 7 +------ .../twitter/inbound/AbstractTwitterMessageSource.java | 2 +- .../twitter/inbound/MentionsReceivingMessageSource.java | 1 + .../twitter/inbound/SearchReceivingMessageSource.java | 2 +- .../twitter/ignored/TestSendingDMsUsingNamespace.java | 9 ++++----- .../ignored/TestSendingUpdatesUsingNamespace.java | 7 +++---- .../OutboundDirectMessageMessageHandlerTests.java | 7 +------ .../TimelineUpdateSendingMessageHandlerTests.java | 3 --- 8 files changed, 12 insertions(+), 26 deletions(-) diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterHeaders.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterHeaders.java index 18fdbca3cd..58b44d24a5 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterHeaders.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/TwitterHeaders.java @@ -20,6 +20,7 @@ package org.springframework.integration.twitter.core; * Header keys used by the various Twitter adapters. * * @author Josh Long + * @author Oleg Zhurakousky * @since 2.0 */ public abstract class TwitterHeaders { @@ -28,12 +29,6 @@ public abstract class TwitterHeaders { public static final String IN_REPLY_TO_STATUS_ID = PREFIX + "inReplyToStatusId"; - public static final String PLACE_ID = PREFIX + "placeId"; - - public static final String GEOLOCATION = PREFIX + "geolocation"; - - public static final String DISPLAY_COORDINATES = PREFIX + "displayCoordinates"; - public static final String DM_TARGET_USER_ID = PREFIX + "dmTargetUserId"; } diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java index bcdb7893e3..6db2858d7a 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java @@ -86,9 +86,9 @@ abstract class AbstractTwitterMessageSource extends AbstractEndpoint implemen @Override protected void onInit() throws Exception{ + super.onInit(); Assert.notNull(this.getTaskScheduler(), "Unable to locate TaskScheduler. You must inject one explicitly or define a bean by the name 'taskScheduler'."); - super.onInit(); if (this.metadataStore == null) { // first try to look for a 'metadataStore' in the context BeanFactory beanFactory = this.getBeanFactory(); diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java index 7555815928..dae2cd742c 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/MentionsReceivingMessageSource.java @@ -26,6 +26,7 @@ import org.springframework.integration.twitter.core.TwitterOperations; * * @author Josh Long * @author Oleg Zhurakousky + * @since 2.0 */ public class MentionsReceivingMessageSource extends AbstractTwitterMessageSource { 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 d3f51d78f2..b621ac39ca 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 @@ -39,7 +39,7 @@ public class SearchReceivingMessageSource extends AbstractTwitterMessageSource mb = MessageBuilder.withPayload("'Hello world!', from the Spring Integration outbound Twitter adapter " + System.currentTimeMillis()) - .setHeader(TwitterHeaders.GEOLOCATION, new GeoLocation(-76.226823, 23.642465)) // antarctica - .setHeader(TwitterHeaders.DISPLAY_COORDINATES, true); + MessageBuilder mb = MessageBuilder.withPayload("'Hello world!', from the Spring Integration outbound Twitter adapter " + + System.currentTimeMillis()); + if (StringUtils.hasText(dmUsr)) { mb.setHeader(TwitterHeaders.DM_TARGET_USER_ID, dmUsr); } diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingUpdatesUsingNamespace.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingUpdatesUsingNamespace.java index 0577a635de..c809767f6a 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingUpdatesUsingNamespace.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingUpdatesUsingNamespace.java @@ -20,12 +20,12 @@ import java.util.Date; import org.junit.Ignore; import org.junit.Test; + import org.springframework.beans.factory.annotation.Value; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.twitter.core.TwitterHeaders; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @@ -42,9 +42,8 @@ public class TestSendingUpdatesUsingNamespace extends AbstractJUnit4SpringContex @Test @Ignore public void testSendingATweet() throws Throwable { - MessageBuilder mb = MessageBuilder.withPayload("Aligning #springintegration Twitter adapter with #SpringSocial API - " + new Date(System.currentTimeMillis())) - .setHeader(TwitterHeaders.IN_REPLY_TO_STATUS_ID, 21927437001L) - .setHeader(TwitterHeaders.DISPLAY_COORDINATES, true); + MessageBuilder mb = MessageBuilder.withPayload("Aligning #springintegration Twitter adapter with #SpringSocial API - " + + new Date(System.currentTimeMillis())); Message m = mb.build(); this.messagingTemplate.send(this.channel, m); } diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java index 459a96e6f3..7cde9df5b5 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/OutboundDirectMessageMessageHandlerTests.java @@ -21,12 +21,11 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import org.junit.Test; + import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.twitter.core.TwitterHeaders; import org.springframework.integration.twitter.core.TwitterOperations; -import twitter4j.GeoLocation; - /** * @author Oleg Zhurakousky */ @@ -37,8 +36,6 @@ public class OutboundDirectMessageMessageHandlerTests { @Test public void validateSendDirectMessage() throws Exception{ MessageBuilder mb = MessageBuilder.withPayload("hello") - .setHeader(TwitterHeaders.GEOLOCATION, new GeoLocation(-76.226823, 23.642465)) // antarctica - .setHeader(TwitterHeaders.DISPLAY_COORDINATES, true) .setHeader(TwitterHeaders.DM_TARGET_USER_ID, "foo"); DirectMessageSendingMessageHandler handler = new DirectMessageSendingMessageHandler(twitter); @@ -48,8 +45,6 @@ public class OutboundDirectMessageMessageHandlerTests { verify(twitter, times(1)).sendDirectMessage("foo", "hello"); mb = MessageBuilder.withPayload("hello") - .setHeader(TwitterHeaders.GEOLOCATION, new GeoLocation(-76.226823, 23.642465)) // antarctica - .setHeader(TwitterHeaders.DISPLAY_COORDINATES, true) .setHeader(TwitterHeaders.DM_TARGET_USER_ID, 123); handler.handleMessage(mb.build()); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandlerTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandlerTests.java index 4a94b8599c..cb0a24113e 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandlerTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/TimelineUpdateSendingMessageHandlerTests.java @@ -70,9 +70,6 @@ public class TimelineUpdateSendingMessageHandlerTests { StatusUpdatingMessageHandler handler = new StatusUpdatingMessageHandler(twitterOperations); Message message = MessageBuilder.withPayload("writing twitter tests") .setHeader(TwitterHeaders.IN_REPLY_TO_STATUS_ID, new Long(123)) - .setHeader(TwitterHeaders.PLACE_ID, "123") - .setHeader(TwitterHeaders.GEOLOCATION, mock(GeoLocation.class)) - .setHeader(TwitterHeaders.DISPLAY_COORDINATES, true) .build(); handler.handleMessage(message); verify(twitterOperations, times(1)).updateStatus(Mockito.any(String.class));