MessageListenerAdapter improve

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessageListenerAdapter.java

@@ -288,7 +288,7 @@ else if (delegateListener instanceof MessageListener) {
 		}
 
 		// Invoke the handler method with appropriate arguments.
-		Object[] listenerArguments = buildListenerArguments(convertedMessage);
+		Object[] listenerArguments = buildListenerArguments(convertedMessage, channel, message);
 		Object result = invokeListenerMethod(methodName, listenerArguments, message);
 		if (result != null) {
 			handleResult(new InvocationResult(result, null, null), message, channel);
@@ -344,6 +344,25 @@ protected Object[] buildListenerArguments(Object extractedMessage) {
 		return new Object[] {extractedMessage};
 	}
 
+	/**
+	 * Build an array of arguments to be passed into the target listener method. Allows for multiple method arguments to
+	 * be built from message object with channel, More detail about extractedMessage in the method
+	 * #buildListenerArguments(java.lang.Object)
+	 * <p>
+	 * This can be overridden to treat special message content such as arrays differently, and add argument in case of
+	 * receiving Channel and original Message object to invoke basicAck method in the listener by manual acknowledge
+	 * mode
+	 *
+	 * @param extractedMessage the content of the message
+	 * @param channel the Rabbit channel to operate on
+	 * @param message the incoming Rabbit message
+	 * @return the array of arguments to be passed into the listener method (each element of the array corresponding to
+	 * a distinct method argument)
+	 */
+	protected Object[] buildListenerArguments(Object extractedMessage, Channel channel, Message message) {
+		return buildListenerArguments(extractedMessage);
+	}
+
 	/**
 	 * Invoke the specified listener method.
 	 * @param methodName the name of the listener method

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/adapter/MessageListenerAdapterTests.java

@@ -22,6 +22,7 @@
 import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.Mockito.mock;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -30,6 +31,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.core.Address;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
@@ -54,6 +56,8 @@ public class MessageListenerAdapterTests {
 
 	private MessageListenerAdapter adapter;
 
+	private MessageListenerAdapter extendedAdapter;
+
 	private final SimpleService simpleService = new SimpleService();
 
 	@Before
@@ -62,6 +66,28 @@ public void init() {
 		this.messageProperties.setContentType(MessageProperties.CONTENT_TYPE_TEXT_PLAIN);
 		this.adapter = new MessageListenerAdapter();
 		this.adapter.setMessageConverter(new SimpleMessageConverter());
+		this.extendedAdapter = new ExtendedListenerAdapter();
+		this.extendedAdapter.setMessageConverter(new SimpleMessageConverter());
+	}
+
+	@Test
+	public void testExtendedListenerAdapter() throws Exception {
+		final AtomicBoolean called = new AtomicBoolean(false);
+		Channel channel = mock(Channel.class);
+		class Delegate {
+			@SuppressWarnings("unused")
+			public void handleMessage(String input, Channel channel, Message message) throws IOException {
+				assertThat(input).isNotNull();
+				assertThat(channel).isNotNull();
+				assertThat(message).isNotNull();
+				channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+				called.set(true);
+			}
+		}
+		this.extendedAdapter.setDelegate(new Delegate());
+		this.extendedAdapter.containerAckMode(AcknowledgeMode.MANUAL);
+		this.extendedAdapter.onMessage(new Message("foo".getBytes(), messageProperties), channel);
+		assertThat(called.get()).isTrue();
 	}
 
 	@Test
@@ -205,4 +231,12 @@ public String notDefinedOnInterface(String input) {
 		}
 
 	}
+
+	private class ExtendedListenerAdapter extends MessageListenerAdapter {
+		@Override
+		protected Object[] buildListenerArguments(Object extractedMessage, Channel channel, Message message) {
+			return new Object[]{extractedMessage, channel, message};
+		}
+	}
+
 }