fix some defects of setting default Message headers in MessagingMessageListenerAdapter #2908
Conversation
| @@ -514,11 +515,11 @@ private Message<?> checkHeaders(Object result, String topic, @Nullable Object so | |||
| if (needsTopic) { | |||
| builder.setHeader(KafkaHeaders.TOPIC, topic); | |||
| } | |||
| if (needsCorrelation && sourceIsMessage) { | |||
There was a problem hiding this comment.
seems the second condtion has been implied in the first condition
| builder.setHeader(this.correlationHeaderName, | ||
| ((Message<?>) source).getHeaders().get(this.correlationHeaderName)); | ||
| } | ||
| if (sourceIsMessage && reply.getHeaders().get(KafkaHeaders.REPLY_PARTITION) == null) { |
There was a problem hiding this comment.
seems only PARTITION header matters for reply side, which has been covered in existing needsPartition variable.
| @@ -501,24 +502,24 @@ else if (result instanceof Message) { | |||
| } | |||
| } | |||
|
|
|||
| private Message<?> checkHeaders(Object result, String topic, @Nullable Object source) { // NOSONAR (complexity) | |||
| Message<?> reply = (Message<?>) result; | |||
| private Message<?> checkHeaders(Message<?> reply, @Nullable String topic, @Nullable Object source) { // NOSONAR (complexity) | |||
There was a problem hiding this comment.
I think choosing Message<?> as the first argument type makes more sense, for this method is only meant to be used with that precondition.
There was a problem hiding this comment.
not sure whether we can use Nullable to topic, but from its invocation context, seems we could not rule out the nullness possibility?
NathanQingyangXu
changed the title
NathanQingyangXu
changed the title
NathanQingyangXu
changed the title
|
@NathanQingyangXu Thanks for the PR! It is now merged upstream. |
thanks. I really appreciate that the PR got merged finally. |
This PR aims to fix some minor defects in MessagingMessageListenerAdapter, including:
checkHeaders()methodcheckHeaders()to Message element in Collection type return of method annotated with@SendToIterable<Message<?>>return type