Skip to content

fix: handle null MessageHeaders in MessageBuilderMessageWriter (#689) #747

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
prashantdotnaagar wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

fix: handle null MessageHeaders in MessageBuilderMessageWriter (#689) #747

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
4 changes: 3 additions & 1 deletion spring/src/main/java/io/cloudevents/spring/messaging/MessageBuilderMessageWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ class MessageBuilderMessageWriter
private Map<String, Object> headers = new HashMap<>();

public MessageBuilderMessageWriter(Map<String, Object> headers) {
this.headers.putAll(headers);
if (headers != null) {
this.headers.putAll(headers);
}
}

public MessageBuilderMessageWriter() {
Expand Down
15 changes: 15 additions & 0 deletions spring/src/test/java/io/cloudevents/spring/messaging/CloudEventMessageConverterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,19 @@ void fromNonCloudEvent() {
assertThat(converter.toMessage(new byte[0], new MessageHeaders(Collections.emptyMap()))).isNull();
}

// gh-689: toMessage should not throw NPE when the caller provides no headers,
// e.g. RabbitMessagingTemplate#convertAndSend(String, Object) passes null.
@Test
void fromCloudEventWithNullHeaders() {
CloudEvent attributes = CloudEventBuilder.v1().withId("A234-1234-1234")
.withSource(URI.create("https://spring.io/")).withType("org.springframework")
.withData("hello".getBytes(StandardCharsets.UTF_8)).build();
Message<?> message = converter.toMessage(attributes, null);
Map<String, ?> headers = message.getHeaders();
assertThat(headers.get("ce-id")).isEqualTo("A234-1234-1234");
assertThat(headers.get("ce-specversion")).isEqualTo("1.0");
assertThat(headers.get("ce-source")).isEqualTo("https://spring.io/");
assertThat(headers.get("ce-type")).isEqualTo("org.springframework");
}

}
Loading