Apply DestinationResolver to listener container

Previously, a custom `DestinationResolver` was not made available
to the underlying `MessageListener`: if a reply needs to be sent, the
default `DestinationResolver` was used.

This commit ensures that if a custom `DestinationResolver` has been set,
it is also configured accordingly for replies.

Issue: SPR-12927

spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java

@@ -186,6 +186,7 @@ public class JmsListenerContainerFactoryTests {
 
 	private void assertDefaultJcaConfig(JmsMessageEndpointManager container) {
 		assertEquals(messageConverter, container.getMessageConverter());
+		assertEquals(destinationResolver, container.getDestinationResolver());
 		JmsActivationSpecConfig config = container.getActivationSpecConfig();
 		assertNotNull(config);
 		assertEquals(Session.DUPS_OK_ACKNOWLEDGE, config.getAcknowledgeMode());

spring-jms/src/test/java/org/springframework/jms/config/MessageListenerTestContainer.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jms.JmsException;
 import org.springframework.jms.listener.MessageListenerContainer;
 import org.springframework.jms.support.converter.MessageConverter;
+import org.springframework.jms.support.destination.DestinationResolver;
 
 /**
  * @author Stephane Nicoll
@@ -103,6 +104,11 @@ public class MessageListenerTestContainer
 		return null;
 	}
 
+	@Override
+	public DestinationResolver getDestinationResolver() {
+		return null;
+	}
+
 	@Override
 	public boolean isPubSubDomain() {
 		return true;

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

@@ -36,6 +36,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TestName;
 
+import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.support.StaticListableBeanFactory;
 import org.springframework.jms.StubTextMessage;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
@@ -46,6 +47,7 @@ import org.springframework.jms.listener.adapter.MessagingMessageListenerAdapter;
 import org.springframework.jms.listener.adapter.ReplyFailureException;
 import org.springframework.jms.support.JmsHeaders;
 import org.springframework.jms.support.JmsMessageHeaderAccessor;
+import org.springframework.jms.support.converter.MessageConverter;
 import org.springframework.jms.support.destination.DestinationResolver;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
@@ -107,6 +109,20 @@ public class MethodJmsListenerEndpointTests {
 		assertNotNull(endpoint.createMessageListener(container));
 	}
 
+	@Test
+	public void setExtraCollaborators() {
+		MessageConverter messageConverter = mock(MessageConverter.class);
+		DestinationResolver destinationResolver = mock(DestinationResolver.class);
+		this.container.setMessageConverter(messageConverter);
+		this.container.setDestinationResolver(destinationResolver);
+
+		MessagingMessageListenerAdapter listener = createInstance(this.factory,
+				getListenerMethod("resolveObjectPayload", MyBean.class), container);
+		DirectFieldAccessor accessor = new DirectFieldAccessor(listener);
+		assertSame(messageConverter, accessor.getPropertyValue("messageConverter"));
+		assertSame(destinationResolver, accessor.getPropertyValue("destinationResolver"));
+	}
+
 	@Test
 	public void resolveMessageAndSession() throws JMSException {
 		MessagingMessageListenerAdapter listener = createDefaultInstance(javax.jms.Message.class, Session.class);

spring-jms/src/test/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManagerTests.java

@@ -82,4 +82,10 @@ public class JmsMessageEndpointManagerTests {
 		JmsMessageEndpointManager endpoint = new JmsMessageEndpointManager();
 		assertNull(endpoint.getMessageConverter());
 	}
+
+	@Test
+	public void getDestinationResolverNoConfig() {
+		JmsMessageEndpointManager endpoint = new JmsMessageEndpointManager();
+		assertNull(endpoint.getDestinationResolver());
+	}
 }