From 11aaba9877b62287d3376d37b961e4bb5731ee71 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Mon, 30 Jan 2023 15:33:47 +0100
Subject: [PATCH] Polishing

---
 .../MessagingMessageListenerAdapter.java      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java
index 7c685b745b1..28904b425e3 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
  * A {@link javax.jms.MessageListener} adapter that invokes a configurable
  * {@link InvocableHandlerMethod}.
  *
- * <p>Wraps the incoming {@link javax.jms.Message} to Spring's {@link Message}
+ * <p>Wraps the incoming {@link javax.jms.Message} in Spring's {@link Message}
  * abstraction, copying the JMS standard headers using a configurable
  * {@link JmsHeaderMapper}.
  *
@@ -44,6 +44,7 @@ import org.springframework.util.Assert;
  * method arguments if necessary.
  *
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 4.1
  * @see Message
  * @see JmsHeaderMapper
@@ -95,17 +96,6 @@ public class MessagingMessageListenerAdapter extends AbstractAdaptableMessageLis
 		}
 	}
 
-	@Override
-	protected Object preProcessResponse(Object result) {
-		MethodParameter returnType = getHandlerMethod().getReturnType();
-		if (result instanceof Message) {
-			return MessageBuilder.fromMessage((Message<?>) result)
-					.setHeader(AbstractMessageSendingTemplate.CONVERSION_HINT_HEADER, returnType).build();
-		}
-		return MessageBuilder.withPayload(result).setHeader(
-				AbstractMessageSendingTemplate.CONVERSION_HINT_HEADER, returnType).build();
-	}
-
 	protected Message<?> toMessagingMessage(javax.jms.Message jmsMessage) {
 		try {
 			return (Message<?>) getMessagingMessageConverter().fromMessage(jmsMessage);
@@ -116,7 +106,7 @@ public class MessagingMessageListenerAdapter extends AbstractAdaptableMessageLis
 	}
 
 	/**
-	 * Invoke the handler, wrapping any exception to a {@link ListenerExecutionFailedException}
+	 * Invoke the handler, wrapping any exception in a {@link ListenerExecutionFailedException}
 	 * with a dedicated error message.
 	 */
 	@Nullable
@@ -144,4 +134,15 @@ public class MessagingMessageListenerAdapter extends AbstractAdaptableMessageLis
 		return sb.toString();
 	}
 
+	@Override
+	protected Object preProcessResponse(Object result) {
+		MethodParameter returnType = getHandlerMethod().getReturnType();
+		MessageBuilder<?> messageBuilder = (result instanceof Message ?
+				MessageBuilder.fromMessage((Message<?>) result) :
+				MessageBuilder.withPayload(result));
+		return messageBuilder
+				.setHeader(AbstractMessageSendingTemplate.CONVERSION_HINT_HEADER, returnType)
+				.build();
+	}
+
 }