Skip to content

🐛 Refactor toReader method in CloudEventHttpUtils to provide a temporary workaround to issue #704 #743

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

🐛 Refactor toReader method in CloudEventHttpUtils to provide a temporary workaround to issue #704 #743

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
21 changes: 16 additions & 5 deletions spring/src/main/java/io/cloudevents/spring/http/CloudEventHttpUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
Expand All @@ -55,10 +53,23 @@ private CloudEventHttpUtils() {
* @return a {@link MessageReader} representing the {@link CloudEvent}
* @throws CloudEventRWException if something goes wrong while resolving the {@link SpecVersion} or if the message has unknown encoding
*/
@SuppressWarnings("unchecked")
public static MessageReader toReader(HttpHeaders headers, Supplier<byte[]> body) throws CloudEventRWException {
Map<String, List<String>> headersMap = new HashMap<>();
headers.forEach((key, values) -> headersMap.put(key, new ArrayList<>(values)));
return HttpMessageFactory.createReaderFromMultimap(headersMap, body.get());
MessageReader reader;

// Temporary compatibility workaround for Spring Framework 7 HttpHeaders changes.
// Remove this branch and use the standard path once native Spring 7 support is released.
if (headers instanceof Map<?, ?>) {
reader = HttpMessageFactory.createReaderFromMultimap((Map<String, List<String>>) headers, body.get());
} else {
// Spring 7+ no longer guarantees HttpHeaders implements Map, so use the header visitor API.
reader = HttpMessageFactory.createReader(
processHeader -> headers.forEach(
(key, values) -> values.forEach(value -> processHeader.accept(key, value))),
body.get());
}

return reader;
}

/**
Expand Down
Loading