Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Subpackage rearrangements within 4.1's jms-messaging alignment

Browse Source 
Issue: SPR-10873
This commit is contained in:
Juergen Hoeller
2014-07-09 22:19:14 +02:00
parent 1fadd1c954
commit fa4f51c5d0
18 changed files with 165 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java
View File

@@ -50,7 +50,7 @@ import org.springframework.jms.listener.adapter.ReplyFailureException;
import org.springframework.jms.listener.adapter.ListenerExecutionFailedException;
import org.springframework.jms.listener.adapter.MessagingMessageListenerAdapter;
import org.springframework.jms.support.JmsMessageHeaderAccessor;
import org.springframework.jms.support.converter.JmsHeaders;
import org.springframework.jms.support.JmsHeaders;
import org.springframework.jms.support.destination.DestinationResolver;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;

9
spring-jms/src/test/java/org/springframework/jms/messaging/JmsMessagingTemplateTests.java → spring-jms/src/test/java/org/springframework/jms/core/JmsMessagingTemplateTests.java
View File

@@ -14,12 +14,11 @@
* limitations under the License.
*/
package org.springframework.jms.messaging;
package org.springframework.jms.core;
import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Session;
@@ -36,10 +35,8 @@ 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;
import org.springframework.jms.core.MessageCreator;
import org.springframework.jms.support.converter.MessageConversionException;
import org.springframework.jms.support.converter.SimpleMessageConverter;
import org.springframework.messaging.Message;
@@ -317,7 +314,7 @@ public class JmsMessagingTemplateTests {
javax.jms.Message jmsMessage = createJmsTextMessage("123");
given(jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
messagingTemplate.setMessageConverter(new GenericMessageConverter(new DefaultConversionService()));
messagingTemplate.setMessageConverter(new GenericMessageConverter());
Integer payload = messagingTemplate.receiveAndConvert("myQueue", Integer.class);
assertEquals(Integer.valueOf(123), payload);

1
spring-jms/src/test/java/org/springframework/jms/support/JmsMessageHeaderAccessorTests.java
View File

@@ -26,7 +26,6 @@ import javax.jms.JMSException;
import org.junit.Test;
import org.springframework.jms.StubTextMessage;
import org.springframework.jms.support.converter.SimpleJmsHeaderMapper;
import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder;

9
spring-jms/src/test/java/org/springframework/jms/support/converter/SimpleJmsHeaderMapperTests.java → spring-jms/src/test/java/org/springframework/jms/support/SimpleJmsHeaderMapperTests.java
View File

@@ -14,13 +14,10 @@
* limitations under the License.
*/
package org.springframework.jms.support.converter;
import static org.junit.Assert.*;
package org.springframework.jms.support;
import java.util.Date;
import java.util.Map;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.JMSException;
@@ -32,6 +29,8 @@ import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.support.MessageBuilder;
import static org.junit.Assert.*;
/**
*
* @author Mark Fisher
@@ -42,6 +41,7 @@ public class SimpleJmsHeaderMapperTests {
private final SimpleJmsHeaderMapper mapper = new SimpleJmsHeaderMapper();
// Outbound mapping
@Test
@@ -559,4 +559,5 @@ public class SimpleJmsHeaderMapperTests {
private MessageBuilder<String> initBuilder() {
return MessageBuilder.withPayload("test");
}
}