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

Renamed JmsAttributeKeys to JmsHeaders and MailAttributeKeys to MailHeaders. JMS Headers are now propagated properly by the JmsGateway (INT-290).

Browse Source
This commit is contained in:
Mark Fisher
2008-08-19 17:32:48 +00:00
parent c00c13bdff
commit ce87fef7ac
11 changed files with 122 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/jms/DefaultJmsHeaderMapperTests.java
View File

@@ -39,7 +39,7 @@ public class DefaultJmsHeaderMapperTests {
public void testJmsReplyToMappedFromHeader() throws JMSException {
Destination replyTo = new Destination() {};
Message<String> message = MessageBuilder.fromPayload("test")
.setHeader(JmsAttributeKeys.REPLY_TO, replyTo).build();
.setHeader(JmsHeaders.REPLY_TO, replyTo).build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
mapper.mapFromMessageHeaders(message.getHeaders(), jmsMessage);
@@ -50,7 +50,7 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testJmsReplyToIgnoredIfIncorrectType() throws JMSException {
Message<String> message = MessageBuilder.fromPayload("test")
.setHeader(JmsAttributeKeys.REPLY_TO, "not-a-destination").build();
.setHeader(JmsHeaders.REPLY_TO, "not-a-destination").build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
mapper.mapFromMessageHeaders(message.getHeaders(), jmsMessage);
@@ -61,7 +61,7 @@ public class DefaultJmsHeaderMapperTests {
public void testJmsCorrelationIdMappedFromHeader() throws JMSException {
String jmsCorrelationId = "ABC-123";
Message<String> message = MessageBuilder.fromPayload("test")
.setHeader(JmsAttributeKeys.CORRELATION_ID, jmsCorrelationId).build();
.setHeader(JmsHeaders.CORRELATION_ID, jmsCorrelationId).build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
mapper.mapFromMessageHeaders(message.getHeaders(), jmsMessage);
@@ -72,7 +72,7 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testJmsCorrelationIdIgnoredIfIncorrectType() throws JMSException {
Message<String> message = MessageBuilder.fromPayload("test")
.setHeader(JmsAttributeKeys.CORRELATION_ID, new Integer(123)).build();
.setHeader(JmsHeaders.CORRELATION_ID, new Integer(123)).build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
mapper.mapFromMessageHeaders(message.getHeaders(), jmsMessage);
@@ -83,7 +83,7 @@ public class DefaultJmsHeaderMapperTests {
public void testJmsTypeMappedFromHeader() throws JMSException {
String jmsType = "testing";
Message<String> message = MessageBuilder.fromPayload("test")
.setHeader(JmsAttributeKeys.TYPE, jmsType).build();
.setHeader(JmsHeaders.TYPE, jmsType).build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
mapper.mapFromMessageHeaders(message.getHeaders(), jmsMessage);
@@ -94,7 +94,7 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testJmsTypeIgnoredIfIncorrectType() throws JMSException {
Message<String> message = MessageBuilder.fromPayload("test")
.setHeader(JmsAttributeKeys.TYPE, new Integer(123)).build();
.setHeader(JmsHeaders.TYPE, new Integer(123)).build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
mapper.mapFromMessageHeaders(message.getHeaders(), jmsMessage);
@@ -104,7 +104,7 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testUserDefinedPropertyMappedFromHeader() throws JMSException {
Message<String> message = MessageBuilder.fromPayload("test")
.setHeader(JmsAttributeKeys.USER_DEFINED_ATTRIBUTE_PREFIX + "foo", new Integer(123))
.setHeader(JmsHeaders.USER_PREFIX + "foo", new Integer(123))
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
@@ -119,7 +119,7 @@ public class DefaultJmsHeaderMapperTests {
public void testUserDefinedPropertyWithUnsupportedType() throws JMSException {
Destination destination = new Destination() {};
Message<String> message = MessageBuilder.fromPayload("test")
.setHeader(JmsAttributeKeys.USER_DEFINED_ATTRIBUTE_PREFIX + "destination", destination)
.setHeader(JmsHeaders.USER_PREFIX + "destination", destination)
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage();
@@ -135,7 +135,7 @@ public class DefaultJmsHeaderMapperTests {
jmsMessage.setJMSReplyTo(replyTo);
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
Map<String, Object> headers = mapper.mapToMessageHeaders(jmsMessage);
Object attrib = headers.get(JmsAttributeKeys.REPLY_TO);
Object attrib = headers.get(JmsHeaders.REPLY_TO);
assertNotNull(attrib);
assertSame(replyTo, attrib);
}
@@ -147,7 +147,7 @@ public class DefaultJmsHeaderMapperTests {
jmsMessage.setJMSCorrelationID(correlationId);
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
Map<String, Object> headers = mapper.mapToMessageHeaders(jmsMessage);
Object attrib = headers.get(JmsAttributeKeys.CORRELATION_ID);
Object attrib = headers.get(JmsHeaders.CORRELATION_ID);
assertNotNull(attrib);
assertSame(correlationId, attrib);
}
@@ -159,7 +159,7 @@ public class DefaultJmsHeaderMapperTests {
jmsMessage.setJMSType(type);
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
Map<String, Object> headers = mapper.mapToMessageHeaders(jmsMessage);
Object attrib = headers.get(JmsAttributeKeys.TYPE);
Object attrib = headers.get(JmsHeaders.TYPE);
assertNotNull(attrib);
assertSame(type, attrib);
}
@@ -170,7 +170,7 @@ public class DefaultJmsHeaderMapperTests {
jmsMessage.setIntProperty("foo", 123);
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
Map<String, Object> headers = mapper.mapToMessageHeaders(jmsMessage);
Object attrib = headers.get(JmsAttributeKeys.USER_DEFINED_ATTRIBUTE_PREFIX + "foo");
Object attrib = headers.get(JmsHeaders.USER_PREFIX + "foo");
assertNotNull(attrib);
assertEquals(Integer.class, attrib.getClass());
assertEquals(123, ((Integer) attrib).intValue());
@@ -179,9 +179,9 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testJMSExceptionIsNotFatal() throws JMSException {
Message<String> message = MessageBuilder.fromPayload("test")
.setHeader(JmsAttributeKeys.USER_DEFINED_ATTRIBUTE_PREFIX + "foo", new Integer(123))
.setHeader(JmsAttributeKeys.USER_DEFINED_ATTRIBUTE_PREFIX + "bad", new Integer(456))
.setHeader(JmsAttributeKeys.USER_DEFINED_ATTRIBUTE_PREFIX + "bar", new Integer(789))
.setHeader(JmsHeaders.USER_PREFIX + "foo", new Integer(123))
.setHeader(JmsHeaders.USER_PREFIX + "bad", new Integer(456))
.setHeader(JmsHeaders.USER_PREFIX + "bar", new Integer(789))
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage() {
@@ -205,9 +205,9 @@ public class DefaultJmsHeaderMapperTests {
@Test
public void testIllegalArgumentExceptionIsNotFatal() throws JMSException {
Message<String> message = MessageBuilder.fromPayload("test")
.setHeader(JmsAttributeKeys.USER_DEFINED_ATTRIBUTE_PREFIX + "foo", new Integer(123))
.setHeader(JmsAttributeKeys.USER_DEFINED_ATTRIBUTE_PREFIX + "bad", new Integer(456))
.setHeader(JmsAttributeKeys.USER_DEFINED_ATTRIBUTE_PREFIX + "bar", new Integer(789))
.setHeader(JmsHeaders.USER_PREFIX + "foo", new Integer(123))
.setHeader(JmsHeaders.USER_PREFIX + "bad", new Integer(456))
.setHeader(JmsHeaders.USER_PREFIX + "bar", new Integer(789))
.build();
DefaultJmsHeaderMapper mapper = new DefaultJmsHeaderMapper();
javax.jms.Message jmsMessage = new StubTextMessage() {

12
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/DefaultMailMessageHeaderMapperTests.java
View File

@@ -53,7 +53,7 @@ public class DefaultMailMessageHeaderMapperTests {
EasyMock.expect(mailMessageMock.getSubject()).andReturn("mail test");
EasyMock.replay(mailMessageMock);
Map<String, Object> headers = mapper.mapToMessageHeaders(mailMessageMock);
Object fromHeader = headers.get(MailAttributeKeys.FROM);
Object fromHeader = headers.get(MailHeaders.FROM);
assertNotNull(fromHeader);
assertTrue(fromHeader instanceof String);
assertEquals("from@example.org", fromHeader);
@@ -72,7 +72,7 @@ public class DefaultMailMessageHeaderMapperTests {
EasyMock.expect(mailMessageMock.getSubject()).andReturn("mail test");
EasyMock.replay(mailMessageMock);
Map<String, Object> headers = mapper.mapToMessageHeaders(mailMessageMock);
Object replyToHeader = headers.get(MailAttributeKeys.REPLY_TO);
Object replyToHeader = headers.get(MailHeaders.REPLY_TO);
assertNotNull(replyToHeader);
assertTrue(replyToHeader instanceof String);
assertEquals("replyTo@example.org", replyToHeader);
@@ -93,7 +93,7 @@ public class DefaultMailMessageHeaderMapperTests {
EasyMock.expect(mailMessageMock.getSubject()).andReturn("mail test");
EasyMock.replay(mailMessageMock);
Map<String, Object> headers = mapper.mapToMessageHeaders(mailMessageMock);
Object toHeader = headers.get(MailAttributeKeys.TO);
Object toHeader = headers.get(MailHeaders.TO);
assertNotNull(toHeader);
assertTrue(toHeader instanceof String[]);
String[] addresses = (String[]) toHeader;
@@ -106,7 +106,7 @@ public class DefaultMailMessageHeaderMapperTests {
public void mapReplyToValueFromHeadersToMimeMessage() throws MessagingException {
DefaultMailMessageHeaderMapper mapper = new DefaultMailMessageHeaderMapper();
Map<String, Object> headerMap = new HashMap<String, Object>();
headerMap.put(MailAttributeKeys.REPLY_TO, "replyTo@example.org");
headerMap.put(MailHeaders.REPLY_TO, "replyTo@example.org");
MessageHeaders headers = new MessageHeaders(headerMap);
MimeMessage mailMessageMock = EasyMock.createNiceMock(MimeMessage.class);
EasyMock.replay(mailMessageMock);
@@ -121,7 +121,7 @@ public class DefaultMailMessageHeaderMapperTests {
public void mapFromValueFromHeadersToMimeMessage() throws MessagingException {
DefaultMailMessageHeaderMapper mapper = new DefaultMailMessageHeaderMapper();
Map<String, Object> headerMap = new HashMap<String, Object>();
headerMap.put(MailAttributeKeys.FROM, "from@example.org");
headerMap.put(MailHeaders.FROM, "from@example.org");
MessageHeaders headers = new MessageHeaders(headerMap);
MimeMessage mailMessageMock = EasyMock.createNiceMock(MimeMessage.class);
EasyMock.replay(mailMessageMock);
@@ -137,7 +137,7 @@ public class DefaultMailMessageHeaderMapperTests {
DefaultMailMessageHeaderMapper mapper = new DefaultMailMessageHeaderMapper();
Map<String, Object> headerMap = new HashMap<String, Object>();
String[] addressStrings = new String[] { "a@example.org", "b@example.org", "c@example.org" };
headerMap.put(MailAttributeKeys.TO, addressStrings);
headerMap.put(MailHeaders.TO, addressStrings);
MessageHeaders headers = new MessageHeaders(headerMap);
MimeMessage mailMessageMock = EasyMock.createNiceMock(MimeMessage.class);
EasyMock.replay(mailMessageMock);

12
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/mail/MailTargetTests.java
View File

@@ -95,12 +95,12 @@ public class MailTargetTests {
public void testDefaultMailHeaderGenerator() {
org.springframework.integration.message.Message<String> message =
MessageBuilder.fromPayload(MailTestsHelper.MESSAGE_TEXT)
.setHeader(MailAttributeKeys.SUBJECT, MailTestsHelper.SUBJECT)
.setHeader(MailAttributeKeys.TO, MailTestsHelper.TO)
.setHeader(MailAttributeKeys.CC, MailTestsHelper.CC)
.setHeader(MailAttributeKeys.BCC, MailTestsHelper.BCC)
.setHeader(MailAttributeKeys.FROM, MailTestsHelper.FROM)
.setHeader(MailAttributeKeys.REPLY_TO, MailTestsHelper.REPLY_TO).build();
.setHeader(MailHeaders.SUBJECT, MailTestsHelper.SUBJECT)
.setHeader(MailHeaders.TO, MailTestsHelper.TO)
.setHeader(MailHeaders.CC, MailTestsHelper.CC)
.setHeader(MailHeaders.BCC, MailTestsHelper.BCC)
.setHeader(MailHeaders.FROM, MailTestsHelper.FROM)
.setHeader(MailHeaders.REPLY_TO, MailTestsHelper.REPLY_TO).build();
this.mailTarget.send(message);
SimpleMailMessage mailMessage = MailTestsHelper.createSimpleMailMessage();
assertEquals("no mime message should have been sent",