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

Use SI BeanFactoryChannelResolver

Browse Source 
Resolve channel names in the HeaderChannelRegistry.

Add back MessagingTemplate (subclass of GenericMessagingTemplate).
This commit is contained in:
Gary Russell
2013-11-25 18:05:57 -05:00
parent a24b9ffa22
commit 48a005ec2a
58 changed files with 227 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java
View File

@@ -33,7 +33,7 @@ import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
/**
* @author ozhurakousky
@@ -63,7 +63,7 @@ public class ExtractRequestReplyPayloadTests {
jmsInputChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof String);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -85,7 +85,7 @@ public class ExtractRequestReplyPayloadTests {
jmsInputChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof String);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -107,7 +107,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof javax.jms.Message);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -130,7 +130,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof javax.jms.Message);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -152,7 +152,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof String);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -172,7 +172,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof String);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -192,7 +192,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof String);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}
@@ -218,7 +218,7 @@ public class ExtractRequestReplyPayloadTests {
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) throws MessagingException {
assertTrue(message.getPayload() instanceof javax.jms.Message);
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
template.send(message);
}

4
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java
View File

@@ -29,7 +29,7 @@ import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -81,7 +81,7 @@ public class JmsDynamicDestinationTests {
public void gateway() throws Exception {
Message<?> message1 = MessageBuilder.withPayload("test-1").setHeader("destinationNumber", 1).build();
Message<?> message2 = MessageBuilder.withPayload("test-2").setHeader("destinationNumber", 2).build();
GenericMessagingTemplate template = new GenericMessagingTemplate();
MessagingTemplate template = new MessagingTemplate();
Message<?> result1 = template.sendAndReceive(gatewayChannel, message1);
Message<?> result2 = template.sendAndReceive(gatewayChannel, message2);
assertNotNull(result1);

4
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java
View File

@@ -59,7 +59,7 @@ import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.core.GenericMessagingTemplate;
import org.springframework.integration.core.MessagingTemplate;
/**
* @author Jonas Partner
@@ -219,7 +219,7 @@ public class JmsOutboundGatewayParserTests {
Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "inboundGateway", 0);
assertNotNull(componentHistoryRecord);
assertEquals("jms:inbound-gateway", componentHistoryRecord.get("type"));
GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate();
MessagingTemplate messagingTemplate = new MessagingTemplate();
messagingTemplate.setDefaultDestination((MessageChannel)message.getHeaders().getReplyChannel());
messagingTemplate.send(message);
}