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

Fix JMS and JMX module to the latest SF

Browse Source 
* Fix `ControlBusParserTests` test to pass `Object.class` to the
`MessageConverter` since we can't use `null` there any more
* Fix `JmsOutboundGateway` for empty string for the
`replyDestinationName` since we can't pass `null` there any more
This commit is contained in:
Artem Bilan
2017-06-07 14:34:01 -04:00
parent 2670a2872e
commit 45ae138091
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,6 +600,10 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
if (StringUtils.hasText(this.replyDestinationName)) {
container.setDestinationName(this.replyDestinationName);
}
else {
// to be resolved to the TemporaryQueue
container.setDestinationName("");
}
if (this.destinationResolver != null) {
container.setDestinationResolver(this.destinationResolver);
}
@@ -1399,7 +1403,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
@Override
protected String getDestinationDescription() {
if (this.replyDestination instanceof TemporaryQueue) {
return "Temporary queue:" + this.replyDestination.toString();
return "Temporary queue: " + this.replyDestination.toString();
}
else if (super.getDestination() != null) {
try {

12
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,16 +27,16 @@ import org.springframework.integration.core.MessagingTemplate;
import org.springframework.jmx.export.MBeanExporter;
import org.springframework.messaging.MessageChannel;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit4.SpringRunner;
/**
* @author Mark Fisher
* @author Gary Russell
* @author Artem Bilan
*
* @since 2.0
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
@RunWith(SpringRunner.class)
@DirtiesContext
public class ControlBusParserTests {
@@ -48,7 +48,7 @@ public class ControlBusParserTests {
MessageChannel control = this.context.getBean("controlChannel", MessageChannel.class);
MessagingTemplate messagingTemplate = new MessagingTemplate();
Object value = messagingTemplate.convertSendAndReceive(control,
"@integrationMbeanExporter.getChannelSendRate('testChannel').count", null);
"@integrationMbeanExporter.getChannelSendRate('testChannel').count", Object.class);
assertEquals(0, value);
MBeanExporter exporter = this.context.getBean(MBeanExporter.class);
exporter.destroy();