minor polishing of Twitter before polishing the Twitter docs

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";
 
 }

spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java

@@ -86,9 +86,9 @@ abstract class AbstractTwitterMessageSource<T> 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();

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<Tweet> {
 

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

@@ -39,7 +39,7 @@ public class SearchReceivingMessageSource extends AbstractTwitterMessageSource<T
 
 
 	public void setQuery(String query) {
-		Assert.hasText(query, "query must no be null");
+		Assert.hasText(query, "'query' must not be null");
 		this.query = query;
 	}
 

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingDMsUsingNamespace.java

@@ -18,6 +18,7 @@ package org.springframework.integration.twitter.ignored;
 
 import org.junit.Ignore;
 import org.junit.Test;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.MessageChannel;
@@ -27,8 +28,6 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 import org.springframework.util.StringUtils;
 
-import twitter4j.GeoLocation;
-
 /**
  * @author Josh Long
  * @author Oleg Zhurakouksy
@@ -44,9 +43,9 @@ public class TestSendingDMsUsingNamespace extends AbstractJUnit4SpringContextTes
  	@Ignore
 	public void testSendigRealDirectMessage() throws Throwable {
 		String dmUsr = "z_oleg";
-		MessageBuilder<String> 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<String> 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);
 		}

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<String> 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<String> mb = MessageBuilder.withPayload("Aligning #springintegration Twitter adapter with #SpringSocial API - " 
+				+ new Date(System.currentTimeMillis()));
 		Message<String> m = mb.build();
 		this.messagingTemplate.send(this.channel, m);
 	}

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<String> 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());

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));