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

INT-3242 Final Polish for 4.0.0.M2

Browse Source 
- Rename EiMessageHeaderAccessor to IntegrationMessageHeaderAccessor
- Remove GenericMessage
- Minor TODOs
- Start a new What's new" chapter in the reference

JIRA: https://jira.springsource.org/browse/INT-3242
This commit is contained in:
Gary Russell
2013-12-17 14:38:36 -05:00
parent 64cc1faafe
commit c2ee2161a1
62 changed files with 995 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-jms/src/main/java/org/springframework/integration/jms/AbstractJmsChannel.java
View File

@@ -17,7 +17,7 @@
package org.springframework.integration.jms;
import org.springframework.messaging.Message;
import org.springframework.integration.EiMessageHeaderAccessor;
import org.springframework.integration.IntegrationMessageHeaderAccessor;
import org.springframework.integration.channel.AbstractMessageChannel;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.util.Assert;
@@ -45,7 +45,7 @@ public abstract class AbstractJmsChannel extends AbstractMessageChannel {
@Override
protected boolean doSend(Message<?> message, long timeout) {
try {
DynamicJmsTemplateProperties.setPriority(new EiMessageHeaderAccessor(message).getPriority());
DynamicJmsTemplateProperties.setPriority(new IntegrationMessageHeaderAccessor(message).getPriority());
this.jmsTemplate.convertAndSend(message);
}
finally {

6
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
View File

@@ -44,7 +44,7 @@ import javax.jms.Topic;
import org.springframework.context.SmartLifecycle;
import org.springframework.expression.Expression;
import org.springframework.integration.EiMessageHeaderAccessor;
import org.springframework.integration.IntegrationMessageHeaderAccessor;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.MessageTimeoutException;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
@@ -668,7 +668,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
jmsRequest.setJMSReplyTo(replyTo);
connection.start();
Integer priority = new EiMessageHeaderAccessor(requestMessage).getPriority();
Integer priority = new IntegrationMessageHeaderAccessor(requestMessage).getPriority();
if (priority == null) {
priority = this.priority;
}
@@ -722,7 +722,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
jmsRequest.setJMSReplyTo(replyTo);
connection.start();
Integer priority = new EiMessageHeaderAccessor(requestMessage).getPriority();
Integer priority = new IntegrationMessageHeaderAccessor(requestMessage).getPriority();
if (priority == null) {
priority = this.priority;
}

4
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java
View File

@@ -20,7 +20,7 @@ import javax.jms.Destination;
import javax.jms.JMSException;
import org.springframework.expression.Expression;
import org.springframework.integration.EiMessageHeaderAccessor;
import org.springframework.integration.IntegrationMessageHeaderAccessor;
import org.springframework.integration.handler.AbstractMessageHandler;
import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor;
import org.springframework.jms.core.JmsTemplate;
@@ -109,7 +109,7 @@ public class JmsSendingMessageHandler extends AbstractMessageHandler {
Object objectToSend = (this.extractPayload) ? message.getPayload() : message;
MessagePostProcessor messagePostProcessor = new HeaderMappingMessagePostProcessor(message, this.headerMapper);
try {
DynamicJmsTemplateProperties.setPriority(new EiMessageHeaderAccessor(message).getPriority());
DynamicJmsTemplateProperties.setPriority(new IntegrationMessageHeaderAccessor(message).getPriority());
this.send(destination, objectToSend, messagePostProcessor);
}
finally {