root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Sam Brannen 2023-01-30 15:33:47 +01:00
parent ad4e0d9ad7
commit 67c141f15b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 jakarta.jms.MessageListener} adapter that invokes a configurable * A {@link jakarta.jms.MessageListener} adapter that invokes a configurable
* {@link InvocableHandlerMethod}. * {@link InvocableHandlerMethod}.
* *
* <p>Wraps the incoming {@link jakarta.jms.Message} to Spring's {@link Message} * <p>Wraps the incoming {@link jakarta.jms.Message} in Spring's {@link Message}
* abstraction, copying the JMS standard headers using a configurable * abstraction, copying the JMS standard headers using a configurable
* {@link JmsHeaderMapper}. * {@link JmsHeaderMapper}.
* *
@ -44,6 +44,7 @@ import org.springframework.util.Assert;
* method arguments if necessary. * method arguments if necessary.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Sam Brannen
* @since 4.1 * @since 4.1
* @see Message * @see Message
* @see JmsHeaderMapper * @see JmsHeaderMapper
@ -95,18 +96,6 @@ public class MessagingMessageListenerAdapter extends AbstractAdaptableMessageLis
} }
} }
@Override
protected Object preProcessResponse(Object result) {
MethodParameter returnType = getHandlerMethod().getReturnType();
if (result instanceof Message<?> message) {
return MessageBuilder.fromMessage(message)
.setHeader(AbstractMessageSendingTemplate.CONVERSION_HINT_HEADER, returnType)
.build();
}
return MessageBuilder.withPayload(result).setHeader(
AbstractMessageSendingTemplate.CONVERSION_HINT_HEADER, returnType).build();
}
protected Message<?> toMessagingMessage(jakarta.jms.Message jmsMessage) { protected Message<?> toMessagingMessage(jakarta.jms.Message jmsMessage) {
try { try {
return (Message<?>) getMessagingMessageConverter().fromMessage(jmsMessage); return (Message<?>) getMessagingMessageConverter().fromMessage(jmsMessage);
@ -117,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. * with a dedicated error message.
*/ */
@Nullable @Nullable
@ -145,4 +134,15 @@ public class MessagingMessageListenerAdapter extends AbstractAdaptableMessageLis
return sb.toString(); return sb.toString();
} }
@Override
protected Object preProcessResponse(Object result) {
MethodParameter returnType = getHandlerMethod().getReturnType();
MessageBuilder<?> messageBuilder = (result instanceof Message<?> message ?
MessageBuilder.fromMessage(message) :
MessageBuilder.withPayload(result));
return messageBuilder
.setHeader(AbstractMessageSendingTemplate.CONVERSION_HINT_HEADER, returnType)
.build();
}
} }