Skip to content

Do not put a null message attribute when contentType is unsupported #1703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anjeongkyun wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −5
Open

Do not put a null message attribute when contentType is unsupported #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions spring-cloud-aws-sns/src/main/java/io/awspring/cloud/sns/core/SnsHeaderConverterUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,13 @@ public static Map<String, MessageAttributeValue> toSnsMessageAttributes(Message<
}

if (MessageHeaders.CONTENT_TYPE.equals(messageHeaderName) && messageHeaderValue != null) {
messageAttributes.put(messageHeaderName, getContentTypeMessageAttribute(messageHeaderValue));
MessageAttributeValue contentType = getContentTypeMessageAttribute(messageHeaderValue);
if (contentType != null) {
messageAttributes.put(messageHeaderName, contentType);
}
else {
logUnsupportedHeader(messageHeaderName, messageHeaderValue);
}
}
else if (MessageHeaders.ID.equals(messageHeaderName) && messageHeaderValue != null) {
messageAttributes.put(messageHeaderName, getStringMessageAttribute(messageHeaderValue.toString()));
Expand All @@ -81,16 +87,20 @@ else if (messageHeaderValue instanceof List) {
messageAttributes.put(messageHeaderName, getStringArrayMessageAttribute((List<?>) messageHeaderValue));
}
else {
logger.warn(String.format(
"Message header with name '%s' and type '%s' cannot be sent as"
+ " message attribute because it is not supported by SNS.",
messageHeaderName, messageHeaderValue != null ? messageHeaderValue.getClass().getName() : ""));
logUnsupportedHeader(messageHeaderName, messageHeaderValue);
}
}

return messageAttributes;
}

private static void logUnsupportedHeader(String messageHeaderName, @Nullable Object messageHeaderValue) {
logger.warn(String.format(
"Message header with name '%s' and type '%s' cannot be sent as"
+ " message attribute because it is not supported by SNS.",
messageHeaderName, messageHeaderValue != null ? messageHeaderValue.getClass().getName() : ""));
}

private static boolean isSkipHeader(String headerName) {
return NOTIFICATION_SUBJECT_HEADER.equals(headerName) || MESSAGE_GROUP_ID_HEADER.equals(headerName)
|| MESSAGE_DEDUPLICATION_ID_HEADER.equals(headerName);
Expand Down
16 changes: 16 additions & 0 deletions spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/core/TopicMessageChannelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,22 @@ void sendMessage_withStringArrayMessageHeader_shouldBeSentAsTopicMessageAttribut
}));
}

@Test
void sendMessage_withUnsupportedContentTypeHeader_shouldNotSetItAsMessageAttribute() {
// Arrange
// a contentType that is neither a MimeType nor a String
Message<String> message = MessageBuilder.withPayload("Hello")
.setHeader(MessageHeaders.CONTENT_TYPE, new Object()).build();

// Act
boolean sent = messageChannel.send(message);

// Assert
assertThat(sent).isTrue();
verify(snsClient).publish(requestMatches(
it -> assertThat(it.messageAttributes()).doesNotContainKey(MessageHeaders.CONTENT_TYPE)));
}

@Test
void sendMessage_withMessageGroupIdHeader_shouldSetMessageGroupIdOnPublishRequestAndNotSetItAsMessageAttribute() {
// Arrange
Expand Down