Support expression in @sendto

The attributes of @JmsListener allows to specify the reference to a key
in the Environment but @sendto did not.

This commit fixes this inconsistency so that response destinations are
now also externally configurable.

Issue: SPR-12899

Author: snicoll

spring-jms/src/main/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -247,6 +247,7 @@ protected void processJmsListener(JmsListener jmsListener, Method method, Object
 		endpoint.setBean(bean);
 		endpoint.setMethod(method);
 		endpoint.setMessageHandlerMethodFactory(this.messageHandlerMethodFactory);
+		endpoint.setBeanFactory(this.beanFactory);
 		endpoint.setId(getEndpointId(jmsListener));
 		endpoint.setDestination(resolve(jmsListener.destination()));
 		if (StringUtils.hasText(jmsListener.selector())) {

spring-jms/src/main/java/org/springframework/jms/config/MethodJmsListenerEndpoint.java

@@ -21,6 +21,8 @@
 
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.jms.listener.MessageListenerContainer;
 import org.springframework.jms.listener.adapter.MessagingMessageListenerAdapter;
@@ -46,6 +48,8 @@ public class MethodJmsListenerEndpoint extends AbstractJmsListenerEndpoint {
 
 	private MessageHandlerMethodFactory messageHandlerMethodFactory;
 
+	private BeanFactory beanFactory;
+
 
 	/**
 	 * Set the object instance that should manage this endpoint.
@@ -78,6 +82,12 @@ public void setMessageHandlerMethodFactory(MessageHandlerMethodFactory messageHa
 		this.messageHandlerMethodFactory = messageHandlerMethodFactory;
 	}
 
+	/**
+	 * Set the {@link BeanFactory} to use to resolve expressions (can be null).
+	 */
+	public void setBeanFactory(BeanFactory beanFactory) {
+		this.beanFactory = beanFactory;
+	}
 
 	@Override
 	protected MessagingMessageListenerAdapter createMessageListener(MessageListenerContainer container) {
@@ -110,7 +120,10 @@ protected MessagingMessageListenerAdapter createMessageListenerInstance() {
 		return new MessagingMessageListenerAdapter();
 	}
 
-	private String getDefaultResponseDestination() {
+	/**
+	 * Return the default response destination, if any.
+	 */
+	protected String getDefaultResponseDestination() {
 		Method specificMethod = getMostSpecificMethod();
 		SendTo ann = AnnotationUtils.getAnnotation(specificMethod, SendTo.class);
 		if (ann != null) {
@@ -119,11 +132,23 @@ private String getDefaultResponseDestination() {
 				throw new IllegalStateException("Invalid @" + SendTo.class.getSimpleName() + " annotation on '"
 						+ specificMethod + "' one destination must be set (got " + Arrays.toString(destinations) + ")");
 			}
-			return (String) destinations[0];
+			return resolve((String) destinations[0]);
 		}
 		return null;
 	}
 
+	/**
+	 * Resolve the specified value if possible.
+	 * @see ConfigurableBeanFactory#resolveEmbeddedValue
+	 */
+	private String resolve(String value) {
+		if (this.beanFactory instanceof ConfigurableBeanFactory) {
+			return ((ConfigurableBeanFactory) this.beanFactory).resolveEmbeddedValue(value);
+		}
+		return value;
+	}
+
+
 	private Method getMostSpecificMethod() {
 		if (AopUtils.isAopProxy(this.bean)) {
 			Class<?> target = AopProxyUtils.ultimateTargetClass(this.bean);

spring-jms/src/test/java/org/springframework/jms/annotation/AbstractJmsAnnotationDrivenTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -16,6 +16,7 @@
 
 package org.springframework.jms.annotation;
 
+import java.lang.reflect.Method;
 import javax.jms.JMSException;
 import javax.jms.Session;
 
@@ -32,7 +33,9 @@
 import org.springframework.jms.config.SimpleJmsListenerEndpoint;
 import org.springframework.jms.listener.SimpleMessageListenerContainer;
 import org.springframework.jms.listener.adapter.MessagingMessageListenerAdapter;
+import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 import org.springframework.validation.annotation.Validated;
@@ -111,13 +114,19 @@ public void testFullConfiguration(ApplicationContext context) {
 		assertEquals("mySelector", endpoint.getSelector());
 		assertEquals("mySubscription", endpoint.getSubscription());
 		assertEquals("1-10", endpoint.getConcurrency());
+
+		Method m = ReflectionUtils.findMethod(endpoint.getClass(), "getDefaultResponseDestination");
+		ReflectionUtils.makeAccessible(m);
+		Object destination = ReflectionUtils.invokeMethod(m, endpoint);
+		assertEquals("queueOut", destination);
 	}
 
 	@Component
 	static class FullBean {
 
 		@JmsListener(id = "listener1", containerFactory = "simpleFactory", destination = "queueIn",
 				selector = "mySelector", subscription = "mySubscription", concurrency = "1-10")
+		@SendTo("queueOut")
 		public String fullHandle(String msg) {
 			return "reply";
 		}
@@ -129,6 +138,7 @@ static class FullConfigurableBean {
 		@JmsListener(id = "${jms.listener.id}", containerFactory = "${jms.listener.containerFactory}",
 				destination = "${jms.listener.destination}", selector = "${jms.listener.selector}",
 				subscription = "${jms.listener.subscription}", concurrency = "${jms.listener.concurrency}")
+		@SendTo("${jms.listener.sendTo}")
 		public String fullHandle(String msg) {
 			return "reply";
 		}

spring-jms/src/test/resources/org/springframework/jms/annotation/jms-listener.properties

@@ -3,4 +3,5 @@ jms.listener.containerFactory=simpleFactory
 jms.listener.destination=queueIn
 jms.listener.selector=mySelector
 jms.listener.subscription=mySubscription
-jms.listener.concurrency=1-10
+jms.listener.concurrency=1-10
+jms.listener.sendTo=queueOut