diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java index 75b56aa947..4050a0dbcf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java @@ -49,7 +49,6 @@ import java.util.concurrent.ConcurrentMap; * @author Dave Syer * @since 2.0 */ -@SuppressWarnings({"SynchronizationOnLocalVariableOrMethodParameter"}) public class CorrelatingMessageHandler extends AbstractMessageHandler implements MessageProducer { private static final Log logger = LogFactory.getLog(CorrelatingMessageHandler.class); @@ -154,6 +153,7 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements return "aggregator"; } + @SuppressWarnings("rawtypes") @Override protected void handleMessageInternal(Message message) throws Exception { Object correlationKey = correlationStrategy.getCorrelationKey(message); @@ -201,6 +201,7 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements } } + @SuppressWarnings("rawtypes") private void cleanUpForReleasedGroup(MessageGroup group, Collection completedMessages) { if (group.isComplete() || group.getSequenceSize() == 0) { // The group is complete or else there is no @@ -249,6 +250,7 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements messageStore.markMessageGroup(group); } + @SuppressWarnings("rawtypes") private void mark(MessageGroup group, Collection partialSequence) { Object id = group.getGroupId(); for (Message message : partialSequence) { @@ -295,6 +297,7 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements completeGroup(first, correlationKey, group); } + @SuppressWarnings({ "rawtypes", "unchecked" }) private Collection completeGroup(Message message, Object correlationKey, MessageGroup group) { if (logger.isDebugEnabled()) { logger.debug("Completing group with correlationKey [" @@ -310,6 +313,7 @@ public class CorrelatingMessageHandler extends AbstractMessageHandler implements return partialSequence; } + @SuppressWarnings("rawtypes") private void sendReplies(Object processorResult, Message message) { Object replyChannelHeader = null; if (message != null) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessor.java index e738e79aa5..01d8752862 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessor.java @@ -38,6 +38,7 @@ public class ResequencingMessageGroupProcessor implements MessageGroupProcessor this.comparator = comparator; } + @SuppressWarnings("rawtypes") public Object processMessageGroup(MessageGroup group) { Collection> messages = group.getUnmarked(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java index c980daee4d..a35d2a0668 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessor.java @@ -108,7 +108,7 @@ public class MessagingAnnotationPostProcessor implements BeanPostProcessor, Bean return bean; } ReflectionUtils.doWithMethods(beanClass, new ReflectionUtils.MethodCallback() { - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { Annotation[] annotations = AnnotationUtils.getAnnotations(method); for (Annotation annotation : annotations) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java index 9bf28e82e3..53016439ad 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelParser.java @@ -38,8 +38,8 @@ import org.springframework.util.xml.DomUtils; */ public abstract class AbstractChannelParser extends AbstractBeanDefinitionParser { + @SuppressWarnings("rawtypes") @Override - @SuppressWarnings("unchecked") protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = this.buildBeanDefinition(element, parserContext); ManagedList interceptors = null; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChainParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChainParser.java index 82d18e4b49..c639d32e91 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChainParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChainParser.java @@ -38,7 +38,7 @@ import org.springframework.beans.factory.xml.ParserContext; public class ChainParser extends AbstractConsumerEndpointParser { @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder .genericBeanDefinition(IntegrationNamespaceUtils.BASE_PACKAGE + ".handler.MessageHandlerChain"); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java index 101c43e813..12dc224ec8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java @@ -48,7 +48,7 @@ public class ChannelInterceptorParser { } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public ManagedList parseInterceptors(Element element, ParserContext parserContext) { ManagedList interceptors = new ManagedList(); NodeList childNodes = element.getChildNodes(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java index 9d3b72cf86..9461cd4f31 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java @@ -61,7 +61,7 @@ public abstract class HeaderEnricherParserSupport extends AbstractTransformerPar } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) protected void parseTransformer(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { ManagedMap headers = new ManagedMap(); this.processHeaders(element, headers, parserContext); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/RecipientListRouterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/RecipientListRouterParser.java index 352501f0e4..a397d8b2db 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/RecipientListRouterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/RecipientListRouterParser.java @@ -39,7 +39,7 @@ import org.springframework.util.xml.DomUtils; public class RecipientListRouterParser extends AbstractConsumerEndpointParser { @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder recipientListRouterBuilder = BeanDefinitionBuilder.genericBeanDefinition( IntegrationNamespaceUtils.BASE_PACKAGE + ".router.RecipientListRouter"); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java index 327b2fca7d..8e59a7678b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java @@ -54,7 +54,7 @@ public class SelectorChainParser extends AbstractSingleBeanDefinitionParser { this.parseSelectorChain(builder, element, parserContext); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) private void parseSelectorChain(BeanDefinitionBuilder builder, Element element, ParserContext parserContext) { IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "voting-strategy"); ManagedList selectors = new ManagedList(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareLinkedHashSet.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareLinkedHashSet.java index 5e289c3a50..e23f6f188b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareLinkedHashSet.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareLinkedHashSet.java @@ -152,6 +152,7 @@ class OrderedAwareLinkedHashSet extends LinkedHashSet { } } + @SuppressWarnings("rawtypes") private boolean addOrderedElement(Ordered adding) { boolean added = false; E[] tempUnorderedElements = (E[]) this.toArray(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java index 106b93ac4d..b5deeae3f9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java @@ -36,6 +36,7 @@ import org.springframework.util.StringUtils; * @author Mark Fisher * @since 2.0 */ +@SuppressWarnings("serial") public class MessageHistory implements List, Serializable { public static final String HEADER_NAME = MessageHeaders.PREFIX + "history"; @@ -206,7 +207,6 @@ public class MessageHistory implements List, Serializable { /** * Inner class for each Entry in the history. */ - @SuppressWarnings("serial") public static class Entry extends Properties { public String getName() { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java index 6951895fe7..a5baef6071 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java @@ -19,11 +19,8 @@ package org.springframework.integration.router; import java.util.Collections; import java.util.List; -import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java b/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java index ad2ca47016..9369ad6d44 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java @@ -44,8 +44,8 @@ public abstract class AbstractMessageSplitter extends AbstractReplyProducingMess this.applySequence = applySequence; } + @SuppressWarnings("rawtypes") @Override - @SuppressWarnings("unchecked") protected final Object handleRequestMessage(Message message) { Object result = this.splitMessage(message); // return null if 'null', empty Collection or empty Array @@ -78,7 +78,7 @@ public abstract class AbstractMessageSplitter extends AbstractReplyProducingMess return messageBuilders; } - @SuppressWarnings( { "unchecked" }) + @SuppressWarnings( { "unchecked", "rawtypes" }) private MessageBuilder createBuilder(Object item, MessageHeaders headers, Object correlationId, int sequenceNumber, int sequenceSize) { MessageBuilder builder; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderEnricher.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderEnricher.java index 0e8aaff1c9..5945b400af 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderEnricher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderEnricher.java @@ -108,7 +108,7 @@ public class HeaderEnricher implements Transformer { } } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private void addHeadersFromMessageProcessor(Message message, Map headerMap) { if (this.messageProcessor != null) { Object result = this.messageProcessor.processMessage(message); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java index 01c73c6315..07640e58ef 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java @@ -21,7 +21,6 @@ import java.util.Map; import org.springframework.beans.BeanUtils; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java index 7b66b71983..eb2ec2bbe2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java @@ -23,7 +23,6 @@ import org.springframework.beans.SimpleTypeConverter; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.core.convert.ConversionFailedException; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.support.ConversionServiceFactory; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategyTests.java index 4e78c0ecf3..63426ac290 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategyTests.java @@ -21,7 +21,7 @@ public class ExpressionEvaluatingReleaseStrategyTests { private SimpleMessageGroup messages = new SimpleMessageGroup("foo"); @Before - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void setup() { for (int i = 0; i < 5; i++) { messages.add(new GenericMessage(i + 1)); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java index dedd6735a9..4352bb9bbd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java @@ -75,7 +75,7 @@ public class ResequencerTests { @Test public void testBasicResequencingWithCustomComparator() throws InterruptedException { this.processor.setComparator(new Comparator>() { - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public int compare(Message o1, Message o2) { return ((Comparable)o1.getPayload()).compareTo(o2.getPayload()); } @@ -153,7 +153,7 @@ public class ResequencerTests { public void testResequencingWithPartialSequenceAndComparator() throws InterruptedException { this.resequencer.setReleaseStrategy(new SequenceSizeReleaseStrategy(true)); this.processor.setComparator(new Comparator>() { - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public int compare(Message o1, Message o2) { return ((Comparable)o1.getPayload()).compareTo(o2.getPayload()); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTest.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTest.java index acd58551ea..47de862cb4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTest.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTest.java @@ -18,6 +18,7 @@ public class ResequencingMessageGroupProcessorTest { private ResequencingMessageGroupProcessor processor = new ResequencingMessageGroupProcessor(); + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void shouldProcessSequence() { Message prototypeMessage = MessageBuilder.withPayload("foo").setCorrelationId("x").setSequenceNumber(1).setSequenceSize(3).build(); @@ -33,6 +34,7 @@ public class ResequencingMessageGroupProcessorTest { assertThat(processedMessages, hasItems(message1, message2, message3)); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void shouldPartiallProcessIncompleteSequence() { Message prototypeMessage = MessageBuilder.withPayload("foo").setCorrelationId("x").setSequenceNumber(1).setSequenceSize(4).build(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java index bd09af9ee9..7f4f6d6714 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java @@ -19,7 +19,6 @@ package org.springframework.integration.aggregator.integration; import static org.junit.Assert.assertEquals; import java.util.HashMap; -import java.util.List; import java.util.Map; import org.junit.Test; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java index f8306b4a0c..2ab9f014d2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java @@ -52,7 +52,7 @@ public class DefaultMessageAggregatorIntegrationTests { @Qualifier("output") private PollableChannel output; - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test(timeout = 10000) public void testAggregation() throws Exception { for (int i = 0; i < 5; i++) { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java index 84a2b56394..045cd78bca 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java @@ -70,8 +70,6 @@ public class AggregatorReplyChannelTests { this.verifyReply(MessageBuilder.withPayload(list).setReplyChannelName("output").build()); } - - @SuppressWarnings("unchecked") private void verifyReply(Message message) { assertNull(output.receive(0)); input.send(message); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java index 4949afbe6b..61492f8923 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java @@ -46,6 +46,7 @@ public class PartialSequencesWithGapsTests { @Autowired SubscribableChannel out; + @SuppressWarnings("rawtypes") Queue received = new ArrayBlockingQueue(10); @Before diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java index 94d564d801..93fba18161 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java @@ -158,8 +158,8 @@ public class ChainParserTests { assertThat(reply, sameExceptImmutableHeaders(successMessage)); } + @SuppressWarnings("rawtypes") @Test - @SuppressWarnings("unchecked") public void chainNestingAndAggregation() throws Exception { Message message = MessageBuilder.withPayload("test").setCorrelationId(1).setSequenceSize(1).build(); this.aggregatorInput.send(message); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java index 9c9dea0ba4..e55632d68b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java @@ -134,6 +134,7 @@ public class ResequencerParserTests { .getClass()); } + @SuppressWarnings("unused") private static Message createMessage(T payload, Object correlationId, int sequenceSize, int sequenceNumber, MessageChannel outputChannel) { return MessageBuilder.withPayload(payload).setCorrelationId(correlationId).setSequenceSize(sequenceSize) @@ -155,7 +156,7 @@ public class ResequencerParserTests { } static class TestComparator implements Comparator> { - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public int compare(Message o1, Message o2) { return ((Comparable) o1.getPayload()).compareTo(o2.getPayload()); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java index b140ef152f..b24c759df1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java @@ -79,6 +79,7 @@ public class SourcePollingChannelAdapterFactoryBeanTests { assertTrue("adviceChain was not applied", adviceApplied.get()); } + @SuppressWarnings("rawtypes") @Test public void testTransactionalAdviceChain() throws Throwable { SourcePollingChannelAdapterFactoryBean factoryBean = new SourcePollingChannelAdapterFactoryBean(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java index ed3b8b18d6..63ee8cb4cd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java @@ -59,7 +59,7 @@ public class MapToObjectTransformerParserTests { @Qualifier("outputA") private PollableChannel outputA; - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testMapToObjectTransformationWithType(){ Map map = new HashMap(); @@ -83,7 +83,7 @@ public class MapToObjectTransformerParserTests { assertEquals("1123 Main st", person.getAddress().getStreet()); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testMapToObjectTransformationWithRef(){ Map map = new HashMap(); @@ -106,7 +106,7 @@ public class MapToObjectTransformerParserTests { } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testMapToObjectTransformationWithConversionService(){ Map map = new HashMap(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java index 9d40fce5a3..81f4ffdae7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java @@ -91,7 +91,7 @@ public class ObjectToMapTransformerParserTests { directInput.send(message); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public Employee buildEmployee(){ Address companyAddress = new Address(); companyAddress.setCity("Philadelphia"); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java index e3d48e8192..f39d092f64 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java @@ -22,9 +22,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -45,7 +43,6 @@ import org.springframework.integration.mapping.OutboundMessageMapper; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.scheduling.PollerMetadata; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.support.channel.ChannelResolutionException; import org.springframework.integration.support.channel.ChannelResolver; import org.springframework.integration.support.converter.SimpleMessageConverter; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/OrderedAwareLinkedHashSetTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/OrderedAwareLinkedHashSetTests.java index 531c461aab..b1f713ee33 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/OrderedAwareLinkedHashSetTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/OrderedAwareLinkedHashSetTests.java @@ -34,6 +34,7 @@ public class OrderedAwareLinkedHashSetTests { /** * Tests that semantics of the LinkedHashSet were not broken */ + @SuppressWarnings("rawtypes") @Test public void testAddUnordered(){ OrderedAwareLinkedHashSet setToTest = new OrderedAwareLinkedHashSet(); @@ -54,6 +55,7 @@ public class OrderedAwareLinkedHashSetTests { * the already existing element, thus preserving the order of insertion (LinkedHashset semantics) * within the elements that have the same "order" value. */ + @SuppressWarnings("rawtypes") @Test public void testAddOrdered(){ OrderedAwareLinkedHashSet setToTest = new OrderedAwareLinkedHashSet(); @@ -91,6 +93,7 @@ public class OrderedAwareLinkedHashSetTests { assertEquals(o6, elements[9]); } + @SuppressWarnings("rawtypes") @Test public void testAddAllOrderedUnordered(){ List tempList = new ArrayList(); @@ -136,6 +139,7 @@ public class OrderedAwareLinkedHashSetTests { this.doConcurrent(); } } + @SuppressWarnings("rawtypes") private void doConcurrent(){ final OrderedAwareLinkedHashSet setToTest = new OrderedAwareLinkedHashSet(); final Object o1 = new Foo(3); @@ -199,6 +203,7 @@ public class OrderedAwareLinkedHashSetTests { this.doConcurrentAll(); } } + @SuppressWarnings("rawtypes") public void doConcurrentAll(){ final List tempList = new ArrayList(); Object o1 = new Foo(3); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/TransactionalPollerWithMixedAopConfigTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/TransactionalPollerWithMixedAopConfigTests.java index aeea2a9387..2b32bd4e7f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/TransactionalPollerWithMixedAopConfigTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/TransactionalPollerWithMixedAopConfigTests.java @@ -5,8 +5,6 @@ package org.springframework.integration.dispatcher; import static junit.framework.Assert.assertTrue; -import org.aopalliance.intercept.MethodInterceptor; -import org.aopalliance.intercept.MethodInvocation; import org.junit.Test; import org.springframework.aop.framework.Advised; import org.springframework.context.ApplicationContext; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java index 00fd458e3a..6ba15229ad 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java @@ -22,9 +22,7 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.springframework.core.convert.ConversionFailedException; import org.springframework.expression.Expression; -import org.springframework.expression.ExpressionParser; import org.springframework.expression.common.LiteralExpression; -import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.integration.Message; /** @@ -33,8 +31,6 @@ import org.springframework.integration.Message; */ public class ExpressionEvaluatingMessageSourceTests { - private static final ExpressionParser parser = new SpelExpressionParser(); - @Test public void literalExpression() { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java index 82db074094..d1f0ccea6c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java @@ -60,8 +60,10 @@ public class PollingConsumerEndpointTests { private TestConsumer consumer = new TestConsumer(); + @SuppressWarnings("rawtypes") private Message message = new GenericMessage("test"); + @SuppressWarnings("rawtypes") private Message badMessage = new GenericMessage("bad"); private TestErrorHandler errorHandler = new TestErrorHandler(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java index 1274185890..6aa45237c1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java @@ -31,8 +31,8 @@ import org.springframework.integration.message.ErrorMessage; */ public class PollingEndpointErrorHandlingTests { + @SuppressWarnings("rawtypes") @Test - @SuppressWarnings("unchecked") public void checkExceptionPlacedOnErrorChannel() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "pollingEndpointErrorHandlingTests.xml", this.getClass()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java index e070cc0e8a..0607413145 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java @@ -18,14 +18,12 @@ package org.springframework.integration.endpoint; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; -import static org.easymock.EasyMock.reset; import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import org.junit.Before; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java index be16801220..b81b8ec1ea 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java @@ -58,6 +58,7 @@ public class ExpressionEvaluatingMessageProcessorTests { public ExpectedException expected = ExpectedException.none(); + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessage() { Expression expression = expressionParser.parseExpression("payload"); @@ -65,6 +66,7 @@ public class ExpressionEvaluatingMessageProcessorTests { assertEquals("foo", processor.processMessage(new GenericMessage("foo"))); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageWithParameterCoercion() { @SuppressWarnings("unused") @@ -80,6 +82,7 @@ public class ExpressionEvaluatingMessageProcessorTests { assertEquals("2", processor.processMessage(new GenericMessage("2"))); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageWithVoidResult() { @SuppressWarnings("unused") @@ -94,6 +97,7 @@ public class ExpressionEvaluatingMessageProcessorTests { assertEquals(null, processor.processMessage(new GenericMessage("2"))); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageWithParameterCoercionToNonPrimitive() { class TestTarget { @@ -112,6 +116,7 @@ public class ExpressionEvaluatingMessageProcessorTests { assertTrue("Wrong result: "+result, result.contains("log4j.properties")); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageWithDollarInBrackets() { Expression expression = expressionParser.parseExpression("headers['$foo_id']"); @@ -120,6 +125,7 @@ public class ExpressionEvaluatingMessageProcessorTests { assertEquals("abc", processor.processMessage(message)); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageWithDollarPropertyAccess() { Expression expression = expressionParser.parseExpression("headers.$foo_id"); @@ -128,6 +134,7 @@ public class ExpressionEvaluatingMessageProcessorTests { assertEquals("xyz", processor.processMessage(message)); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageWithStaticKey() { Expression expression = expressionParser.parseExpression("headers[headers.ID]"); @@ -136,6 +143,7 @@ public class ExpressionEvaluatingMessageProcessorTests { assertEquals(message.getHeaders().getId(), processor.processMessage(message)); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageWithBeanAsMethodArgument() { StaticApplicationContext context = new StaticApplicationContext(); @@ -149,6 +157,7 @@ public class ExpressionEvaluatingMessageProcessorTests { assertEquals("foobar", processor.processMessage(message)); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageWithMethodCallOnBean() { StaticApplicationContext context = new StaticApplicationContext(); @@ -161,7 +170,7 @@ public class ExpressionEvaluatingMessageProcessorTests { GenericMessage message = new GenericMessage("foo"); assertEquals("barfoo", processor.processMessage(message)); } - + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageBadExpression() { expected.expect(new TypeSafeMatcher(Exception.class) { @@ -180,7 +189,8 @@ public class ExpressionEvaluatingMessageProcessorTests { ExpressionEvaluatingMessageProcessor processor = new ExpressionEvaluatingMessageProcessor(expression); assertEquals("foo", processor.processMessage(new GenericMessage("foo"))); } - + + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageExpressionThrowsRuntimeException() { expected.expect(new TypeSafeMatcher(Exception.class) { @@ -200,6 +210,7 @@ public class ExpressionEvaluatingMessageProcessorTests { assertEquals("foo", processor.processMessage(new GenericMessage(new TestPayload()))); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testProcessMessageExpressionThrowsCheckedException() { expected.expect(new TypeSafeMatcher(Exception.class) { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java index 8329eb46e0..472206d75f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java @@ -34,6 +34,7 @@ import org.springframework.integration.transformer.HeaderEnricher; */ public class MethodInvokingHeaderEnricherTests { + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void emptyHeadersOnRequest() { TestBean testBean = new TestBean(); @@ -47,6 +48,7 @@ public class MethodInvokingHeaderEnricherTests { assertEquals("ABC", result.getHeaders().get("bar")); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void overwriteFalseByDefault() { TestBean testBean = new TestBean(); @@ -59,6 +61,7 @@ public class MethodInvokingHeaderEnricherTests { assertEquals("XYZ", result.getHeaders().get("bar")); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void overwriteFalseExplicit() { TestBean testBean = new TestBean(); @@ -72,6 +75,7 @@ public class MethodInvokingHeaderEnricherTests { assertEquals("XYZ", result.getHeaders().get("bar")); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void overwriteTrue() { TestBean testBean = new TestBean(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java index ec354ef327..7ece28bf9b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java @@ -40,6 +40,7 @@ import static org.junit.Assert.*; * @author Iwein Fuld * @author Oleg Zhurakousky */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public class MethodInvokingMessageProcessorAnnotationTests { private final TestService testService = new TestService(); @@ -171,7 +172,6 @@ public class MethodInvokingMessageProcessorAnnotationTests { } @Test - @SuppressWarnings("unchecked") public void fromMessageWithMapMethodAndHeadersAnnotation() throws Exception { Method method = TestService.class.getMethod("mapHeaders", Map.class); MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(testService, method); @@ -184,7 +184,6 @@ public class MethodInvokingMessageProcessorAnnotationTests { } @Test - @SuppressWarnings("unchecked") public void fromMessageWithMapMethodAndMapPayload() throws Exception { Method method = TestService.class.getMethod("mapPayload", Map.class); MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(testService, method); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java index 5247d97caf..2ed66bdf20 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java @@ -46,6 +46,7 @@ import org.springframework.integration.support.MessageBuilder; * @author Oleg Zhurakousky * @author Dave Syer */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public class MethodInvokingMessageProcessorTests { private static final Log logger = LogFactory.getLog(MethodInvokingMessageProcessorTests.class); @@ -471,7 +472,6 @@ public class MethodInvokingMessageProcessorTests { return properties; } - @SuppressWarnings("unchecked") public Map mapMethod(Map map) { return map; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java index 2f7d6c8281..cffa393060 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java @@ -42,6 +42,7 @@ import org.springframework.integration.support.MessageBuilder; * @author Mark Fisher * @since 1.0.3 */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public class PayloadAndHeaderMappingTests { private TestBean bean; @@ -700,7 +701,7 @@ public class PayloadAndHeaderMappingTests { } } - @SuppressWarnings({"unchecked", "unused"}) + @SuppressWarnings("unused") private static class TestBean { private volatile Map lastHeaders; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java index 7f0f096aed..5854782d7b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java @@ -31,7 +31,6 @@ import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java index 0ee38d90f1..34417791d7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java @@ -16,12 +16,10 @@ package org.springframework.integration.router; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import org.junit.Test; -import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.ManagedMap; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.StaticApplicationContext; @@ -30,7 +28,6 @@ import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.support.channel.ChannelResolver; /** @@ -90,7 +87,7 @@ public class HeaderValueRouterTests { } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void resolveChannelNameFromMap() { StaticApplicationContext context = new StaticApplicationContext(); ManagedMap channelMap = new ManagedMap(); @@ -112,7 +109,7 @@ public class HeaderValueRouterTests { assertSame(message, result); } @Test - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void resolveChannelNameFromMapAndCustomeResolver() { final StaticApplicationContext context = new StaticApplicationContext(); ManagedMap channelMap = new ManagedMap(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java index c9a2ac1f2c..780e63fc25 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java @@ -23,14 +23,12 @@ import static org.mockito.Mockito.mock; import java.util.List; import org.junit.Test; - import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.util.CollectionUtils; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java index b996af909d..28f3426d95 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java @@ -70,6 +70,7 @@ public class PayloadTypeRouterParserTests { reader.loadBeanDefinitions(new InputStreamResource(stream)); } + @SuppressWarnings("unused") private String routerConfigFakeType = "" + "("foo")), "bar"); private boolean removed = false; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java index 02a76bdda9..3f2584ffca 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java @@ -147,8 +147,8 @@ public abstract class TestUtils { } } - @SuppressWarnings("unchecked") - public static MessageHandler handlerExpecting(final Matcher messageMatcher) { + @SuppressWarnings("rawtypes") + public static MessageHandler handlerExpecting(final Matcher messageMatcher) { return new MessageHandler() { public void handleMessage(Message message) throws MessageRejectedException, MessageHandlingException, MessageDeliveryException { assertThat(message, is(messageMatcher)); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java index a5f4258964..c5fcabd4c1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java @@ -26,8 +26,6 @@ import java.util.Map; import org.junit.Test; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.ConversionServiceFactory; @@ -39,9 +37,10 @@ import org.springframework.integration.support.MessageBuilder; * @author Oleg Zhurakousky * @since 2.0 */ +@SuppressWarnings({ "unchecked", "rawtypes" }) public class MapToObjectTransformerTests { - @SuppressWarnings("unchecked") + @Test public void testMapToObjectTransformation(){ Map map = new HashMap(); @@ -65,7 +64,6 @@ public class MapToObjectTransformerTests { assertEquals("1123 Main st", person.getAddress().getStreet()); } - @SuppressWarnings("unchecked") @Test public void testMapToObjectTransformationWithPrototype(){ Map map = new HashMap(); @@ -90,7 +88,6 @@ public class MapToObjectTransformerTests { assertEquals("1123 Main st", person.getAddress().getStreet()); } - @SuppressWarnings("unchecked") @Test public void testMapToObjectTransformationWithConversionService(){ Map map = new HashMap(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java index c90cd93cac..f1676e91d2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java @@ -212,6 +212,7 @@ public class MethodInvokingTransformerTests { assertNull(result); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test // this changed in 2.0 see INT-785 and INT-1130 public void headerEnricherConfiguredWithMethodReference() throws Exception { TestBean testBean = new TestBean(); @@ -230,6 +231,7 @@ public class MethodInvokingTransformerTests { assertEquals("baz", result.getHeaders().get("prop3")); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test // this changed in 2.0 see INT-785 and INT-1130 public void headerEnricherConfiguredWithMethodName() throws Exception { TestBean testBean = new TestBean(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java index c25c826774..725cf74520 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java @@ -74,7 +74,7 @@ public class ObjectToMapTransformerTests { transformer.transform(message); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public Employee buildEmployee(){ Address companyAddress = new Address(); companyAddress.setCity("Philadelphia"); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java index a2b5ae8ddc..b71b00ab7e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java @@ -17,6 +17,7 @@ import org.springframework.core.convert.TypeDescriptor; */ public class BeanFactoryTypeConverterTests { + @SuppressWarnings("unchecked") @Test public void testEmptyCollectionConversion(){ BeanFactoryTypeConverter typeConverter = new BeanFactoryTypeConverter();