From 8cce5cdc1fada14c31f249926eb1233f0fef84b4 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 11 Nov 2010 10:39:03 -0800 Subject: [PATCH] Remove illegal @Override and other polishing --- .../twitter/core/Twitter4jTemplate.java | 4 +--- .../twitter/core/Twitter4jTemplateTests.java | 3 --- .../SearchReceivingMessageSourceTests.java | 23 ++++++++++++++----- .../xmpp/XmppConnectionFactoryBean.java | 6 ----- .../config/XmppHeaderEnricherParserTests.java | 1 - .../XmppMessageDrivenEndpointTests.java | 7 ++---- ...RosterEventMessageDrivenEndpointTests.java | 6 ++--- 7 files changed, 22 insertions(+), 28 deletions(-) diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java index 8f0c3e3d7d..05f2873e16 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java @@ -13,18 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.twitter.core; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang.NotImplementedException; - import org.springframework.util.Assert; import twitter4j.DirectMessage; -import twitter4j.IDs; import twitter4j.Paging; import twitter4j.Query; import twitter4j.QueryResult; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java index bd4236cf62..fa17f8274d 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/core/Twitter4jTemplateTests.java @@ -132,9 +132,6 @@ public class Twitter4jTemplateTests { List tweets = results.getTweets(); assertNotNull(tweets); assertEquals(3, tweets.size()); - assertTrue(tweets.get(0) instanceof Tweet); - assertTrue(tweets.get(1) instanceof Tweet); - assertTrue(tweets.get(2) instanceof Tweet); } } 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 bb14791b3b..94f1d69601 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,14 +1,25 @@ -/** - * +/* + * Copyright 2002-2010 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package org.springframework.integration.twitter.inbound; import org.junit.Ignore; import org.junit.Test; - import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.MessagingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.core.MessageHandler; @@ -17,9 +28,9 @@ import org.springframework.integration.twitter.core.Tweet; import org.springframework.integration.twitter.core.Twitter4jTemplate; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + /** - * @author ozhurakousky - * + * @author Oleg Zhurakousky */ public class SearchReceivingMessageSourceTests { diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java index 2bf0414782..23b27fba9a 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppConnectionFactoryBean.java @@ -89,7 +89,6 @@ public class XmppConnectionFactoryBean extends AbstractFactoryBean packetListSet = new HashSet(); XMPPConnection connection = mock(XMPPConnection.class); XmppMessageDrivenEndpoint endpoint = new XmppMessageDrivenEndpoint(connection); - - + doAnswer(new Answer() { - @Override public Object answer(InvocationOnMock invocation) throws Throwable { packetListSet.add((PacketListener) invocation.getArguments()[0]); return null; } }).when(connection).addPacketListener(Mockito.any(PacketListener.class), (PacketFilter) Mockito.any()); - + doAnswer(new Answer() { - @Override public Object answer(InvocationOnMock invocation) throws Throwable { packetListSet.remove(invocation.getArguments()[0]); return null; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java index e38600f4a2..feb8b9be65 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpointTests.java @@ -54,17 +54,15 @@ public class XmppRosterEventMessageDrivenEndpointTests { XMPPConnection connection = mock(XMPPConnection.class); Roster roster = mock(Roster.class); when(connection.getRoster()).thenReturn(roster); - + doAnswer(new Answer() { - @Override public Object answer(InvocationOnMock invocation) throws Throwable { rosterSet.add((RosterListener) invocation.getArguments()[0]); return null; } }).when(roster).addRosterListener(Mockito.any(RosterListener.class)); - + doAnswer(new Answer() { - @Override public Object answer(InvocationOnMock invocation) throws Throwable { rosterSet.remove(invocation.getArguments()[0]); return null;