SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-924 Fix regression with structured CE cnversion into Message

Browse Source 
Resolves #924
This commit is contained in:
Oleg Zhurakousky
2022-09-08 16:20:43 +02:00
parent c8109270d2
commit 0abfeee528
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java
View File

@@ -231,15 +231,16 @@ public final class CloudEventMessageUtils {
inputMessage = canonicalizeHeadersWithPossibleCopy(inputMessage); inputMessage = canonicalizeHeadersWithPossibleCopy(inputMessage);
Map<String, Object> headers = new HashMap<>(inputMessage.getHeaders()); Map<String, Object> headers = new HashMap<>(inputMessage.getHeaders());
if (isCloudEvent(inputMessage) && headers.containsKey("content-type")) { boolean isCloudEvent = isCloudEvent(inputMessage);
if (isCloudEvent && headers.containsKey("content-type")) {
inputMessage = MessageBuilder.fromMessage(inputMessage).setHeader(MessageHeaders.CONTENT_TYPE, headers.get("content-type")).build(); inputMessage = MessageBuilder.fromMessage(inputMessage).setHeader(MessageHeaders.CONTENT_TYPE, headers.get("content-type")).build();
} }
MimeType contentType = contentTypeResolver.resolve(inputMessage.getHeaders());
String inputContentType = (String) inputMessage.getHeaders().get(DATACONTENTTYPE); String inputContentType = (String) inputMessage.getHeaders().get(DATACONTENTTYPE);
// first check the obvious and see if content-type is `cloudevents` // first check the obvious and see if content-type is `cloudevents`
if (!isCloudEvent(inputMessage) && headers.containsKey(MessageHeaders.CONTENT_TYPE)) { if (!isCloudEvent && contentType != null) {
// structured-mode // structured-mode
MimeType contentType = contentTypeResolver.resolve(inputMessage.getHeaders());
if (contentType.getType().equals(APPLICATION_CLOUDEVENTS.getType()) && contentType if (contentType.getType().equals(APPLICATION_CLOUDEVENTS.getType()) && contentType
.getSubtype().startsWith(APPLICATION_CLOUDEVENTS.getSubtype())) { .getSubtype().startsWith(APPLICATION_CLOUDEVENTS.getSubtype())) {
@@ -254,7 +255,6 @@ public final class CloudEventMessageUtils {
.setHeader(DATACONTENTTYPE, dataContentType).build(); .setHeader(DATACONTENTTYPE, dataContentType).build();
Map<String, Object> structuredCloudEvent = (Map<String, Object>) messageConverter Map<String, Object> structuredCloudEvent = (Map<String, Object>) messageConverter
.fromMessage(cloudEventMessage, Map.class); .fromMessage(cloudEventMessage, Map.class);
canonicalizeHeaders(structuredCloudEvent, true); canonicalizeHeaders(structuredCloudEvent, true);
return buildBinaryMessageFromStructuredMap(structuredCloudEvent, return buildBinaryMessageFromStructuredMap(structuredCloudEvent,
inputMessage.getHeaders()); inputMessage.getHeaders());

1
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventFunctionTests.java
View File

@@ -391,6 +391,7 @@ public class CloudEventFunctionTests {
Function<Message<SpringReleaseEvent>, Message<SpringReleaseEvent>> springReleaseAsMessage() { Function<Message<SpringReleaseEvent>, Message<SpringReleaseEvent>> springReleaseAsMessage() {
return message -> { return message -> {
SpringReleaseEvent updated = springRelease().apply(message.getPayload()); SpringReleaseEvent updated = springRelease().apply(message.getPayload());
assertThat(message.getHeaders().get("ce-type")).isEqualTo("org.springframework");
return CloudEventMessageBuilder.withData(updated) return CloudEventMessageBuilder.withData(updated)
.copyHeaders(message.getHeaders()) .copyHeaders(message.getHeaders())
.setSource("https://spring.release.event") .setSource("https://spring.release.event")