Fix call to deprecated return callback

Author: garyrussell

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java

@@ -219,7 +219,7 @@ public class RabbitTemplate extends RabbitAccessor // NOSONAR type line count
 	@Nullable
 	private ConfirmCallback confirmCallback;
 
-	private ReturnsCallback returnCallback;
+	private ReturnsCallback returnsCallback;
 
 	private Expression mandatoryExpression = new ValueExpression<Boolean>(false);
 
@@ -466,13 +466,13 @@ public void setConfirmCallback(ConfirmCallback confirmCallback) {
 	 */
 	@Deprecated
 	public void setReturnCallback(ReturnCallback returnCallback) {
-		Assert.state(this.returnCallback == null || this.returnCallback.delegate() == returnCallback,
+		Assert.state(this.returnsCallback == null || this.returnsCallback.delegate() == returnCallback,
 				"Only one ReturnCallback is supported by each RabbitTemplate");
-		this.returnCallback = new ReturnsCallback() {
+		this.returnsCallback = new ReturnsCallback() {
 
 			@Override
 			public void returnedMessage(ReturnedMessage returned) {
-				returnedMessage(returned.getMessage(), returned.getReplyCode(), returned.getReplyText(),
+				returnCallback.returnedMessage(returned.getMessage(), returned.getReplyCode(), returned.getReplyText(),
 						returned.getExchange(), returned.getRoutingKey());
 			}
 
@@ -485,9 +485,9 @@ public ReturnCallback delegate() {
 	}
 
 	public void setReturnsCallback(ReturnsCallback returnCallback) {
-		Assert.state(this.returnCallback == null || this.returnCallback == returnCallback,
+		Assert.state(this.returnsCallback == null || this.returnsCallback == returnCallback,
 				"Only one ReturnCallback is supported by each RabbitTemplate");
-		this.returnCallback = returnCallback;
+		this.returnsCallback = returnCallback;
 	}
 
 	/**
@@ -1043,7 +1043,7 @@ public void send(final String exchange, final String routingKey,
 			throws AmqpException {
 		execute(channel -> {
 			doSend(channel, exchange, routingKey, message,
-					(RabbitTemplate.this.returnCallback != null
+					(RabbitTemplate.this.returnsCallback != null
 							|| (correlationData != null && StringUtils.hasText(correlationData.getId())))
 							&& RabbitTemplate.this.mandatoryExpression.getValue(
 							RabbitTemplate.this.evaluationContext, message, Boolean.class),
@@ -1516,7 +1516,7 @@ private <S> void doSendReply(final ReplyToAddressCallback<S> replyToAddressCallb
 				replyTo.getExchangeName(),
 				replyTo.getRoutingKey(),
 				replyMessage,
-				RabbitTemplate.this.returnCallback != null && isMandatoryFor(replyMessage),
+				RabbitTemplate.this.returnsCallback != null && isMandatoryFor(replyMessage),
 				null);
 	}
 
@@ -2037,7 +2037,7 @@ private Message exchangeMessages(final String exchange, final String routingKey,
 
 		Message reply;
 		boolean mandatory = isMandatoryFor(message);
-		if (mandatory && this.returnCallback == null) {
+		if (mandatory && this.returnsCallback == null) {
 			message.getMessageProperties().getHeaders().put(RETURN_CORRELATION_KEY, messageTag);
 		}
 		doSend(channel, exchange, routingKey, message, mandatory, correlationData);
@@ -2524,7 +2524,7 @@ public void handleReturn(int replyCode,
 
 	@Override
 	public void handleReturn(Return returned) {
-		ReturnsCallback callback = this.returnCallback;
+		ReturnsCallback callback = this.returnsCallback;
 		if (callback == null) {
 			Object messageTagHeader = returned.getProperties().getHeaders().remove(RETURN_CORRELATION_KEY);
 			if (messageTagHeader != null) {

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -58,13 +58,15 @@
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.core.ReceiveAndReplyCallback;
+import org.springframework.amqp.core.ReturnedMessage;
 import org.springframework.amqp.rabbit.connection.AbstractRoutingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ChannelProxy;
 import org.springframework.amqp.rabbit.connection.PublisherCallbackChannel;
 import org.springframework.amqp.rabbit.connection.RabbitUtils;
 import org.springframework.amqp.rabbit.connection.SimpleRoutingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.SingleConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate.ReturnsCallback;
 import org.springframework.amqp.support.converter.SimpleMessageConverter;
 import org.springframework.amqp.utils.SerializationUtils;
 import org.springframework.amqp.utils.test.TestUtils;
@@ -559,6 +561,19 @@ public void testPublisherConnWithInvokeInTx() {
 		verify(conn).createChannel(true);
 	}
 
+	@SuppressWarnings("deprecation")
+	@Test
+	public void testReturnsFallback() {
+		RabbitTemplate template = new RabbitTemplate();
+		AtomicBoolean called = new AtomicBoolean();
+		template.setReturnCallback((message, replyCode, replyText, exchange, routingKey) -> {
+			called.set(true);
+		});
+		ReturnsCallback cb = TestUtils.getPropertyValue(template, "returnsCallback", ReturnsCallback.class);
+		cb.returnedMessage(new ReturnedMessage(null, 0, null, null, null));
+		assertThat(called.get()).isTrue();
+	}
+
 	@SuppressWarnings("serial")
 	private class TestTransactionManager extends AbstractPlatformTransactionManager {