From 8dec1db914c1b7465019e100b640523c6482d51f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 28 May 2014 12:45:26 +0200
Subject: [PATCH] Tweak JmsMessagingTemplateTests for Eclipse 4.4

Eclipse 4.4 early release versions have issues with generics.

This commit slightly tweaks the use of generics in
JmsMessagingTemplateTests so that the class compiles in the latest
builds of Eclipse 4.4
---
 .../messaging/JmsMessagingTemplateTests.java    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/spring-jms/src/test/java/org/springframework/jms/messaging/JmsMessagingTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/messaging/JmsMessagingTemplateTests.java
index ffdfe97c31..b3e1ed403c 100644
--- a/spring-jms/src/test/java/org/springframework/jms/messaging/JmsMessagingTemplateTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/messaging/JmsMessagingTemplateTests.java
@@ -16,13 +16,6 @@
 
 package org.springframework.jms.messaging;
 
-import static org.junit.Assert.*;
-import static org.mockito.BDDMockito.any;
-import static org.mockito.BDDMockito.eq;
-import static org.mockito.BDDMockito.*;
-import static org.mockito.BDDMockito.verify;
-import static org.mockito.Mockito.mock;
-
 import java.io.Writer;
 import java.util.HashMap;
 import java.util.Map;
@@ -38,12 +31,12 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
+import org.mockito.BDDMockito;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.jms.StubTextMessage;
 import org.springframework.jms.core.JmsTemplate;
@@ -54,6 +47,9 @@ import org.springframework.messaging.Message;
 import org.springframework.messaging.converter.GenericMessageConverter;
 import org.springframework.messaging.support.MessageBuilder;
 
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.*;
+
 /**
  *
  * @author Stephane Nicoll
@@ -388,14 +384,15 @@ public class JmsMessagingTemplateTests {
 
 	protected TextMessage createTextMessage(MessageCreator creator) throws JMSException {
 		Session mock = mock(Session.class);
-		given(mock.createTextMessage(any())).willAnswer(new Answer<TextMessage>() {
+		given(mock.createTextMessage(BDDMockito.<String> any())).willAnswer(
+				new Answer<TextMessage>() {
 			@Override
 			public TextMessage answer(InvocationOnMock invocation) throws Throwable {
 				return new StubTextMessage((String) invocation.getArguments()[0]);
 			}
 		});
 		javax.jms.Message message = creator.createMessage(mock);
-		verify(mock).createTextMessage(any());
+		verify(mock).createTextMessage(BDDMockito.<String> any());
 		return TextMessage.class.cast(message);
 	}