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

GH-1127 Fix String cast to OffsetDateTime issue for CloudEventMessageUtils

Browse Source 
Resolves #1127

Resolves #1128
This commit is contained in:
sheheryar aamir
2024-03-22 16:28:42 +01:00
committed by Oleg Zhurakousky
parent cdb25edd57
commit 7969d06fc8
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,7 +205,8 @@ public final class CloudEventMessageUtils {
public static OffsetDateTime getTime(Message<?> message) {
String prefix = determinePrefixToUse(message.getHeaders());
return (OffsetDateTime) message.getHeaders().get(prefix + _TIME);
Object time = message.getHeaders().get(prefix + _TIME);
return time instanceof String ? OffsetDateTime.parse((String) time) : null;
}
@SuppressWarnings("unchecked")

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

@@ -18,6 +18,7 @@ package org.springframework.cloud.function.cloudevent;
import java.net.URI;
import java.text.SimpleDateFormat;
import java.time.OffsetDateTime;
import java.util.UUID;
import java.util.function.Function;
@@ -58,7 +59,7 @@ public class CloudEventFunctionTests {
.withData("{\"name\":\"Ricky\"}")
.setId(id)
.setSource("https://spring.io/")
.setType("org.springframework")
.setType("org.springframework.cloud.function.cloudevent.CloudEventFunctionTests$Person")
.build();
assertThat(CloudEventMessageUtils.isCloudEvent(inputMessage)).isTrue();
@@ -73,7 +74,7 @@ public class CloudEventFunctionTests {
*/
assertThat(CloudEventMessageUtils.isCloudEvent(resultMessage)).isTrue();
assertThat(CloudEventMessageUtils.getType(resultMessage)).isEqualTo(Person.class.getName());
assertThat(CloudEventMessageUtils.getSource(resultMessage)).isEqualTo(URI.create("http://spring.io/"));
assertThat(CloudEventMessageUtils.getSource(resultMessage)).isEqualTo(URI.create("https://spring.io/"));
}
/*
@@ -204,7 +205,8 @@ public class CloudEventFunctionTests {
.withData("{\"name\":\"Ricky\"}")
.setHeader("ce_id", id)
.setHeader("ce_source", "https://spring.io/")
.setHeader("ce_type", "org.springframework")
.setHeader("ce_type", "org.springframework.cloud.function.cloudevent.CloudEventFunctionTests$Person")
.setHeader("ce_time", "2024-03-22T03:56:24Z")
.build();
Message<Person> resultMessage = (Message<Person>) function.apply(inputMessage);
@@ -216,7 +218,8 @@ public class CloudEventFunctionTests {
*/
assertThat(CloudEventMessageUtils.isCloudEvent(resultMessage)).isTrue();
assertThat(CloudEventMessageUtils.getType(resultMessage)).isEqualTo(Person.class.getName());
assertThat(CloudEventMessageUtils.getSource(resultMessage)).isEqualTo(URI.create("http://spring.io/"));
assertThat(CloudEventMessageUtils.getSource(resultMessage)).isEqualTo(URI.create("https://spring.io/"));
assertThat(CloudEventMessageUtils.getTime(resultMessage)).isEqualTo(OffsetDateTime.parse("2024-03-22T03:56:24Z"));
}
@SuppressWarnings("unchecked")
@@ -341,7 +344,7 @@ public class CloudEventFunctionTests {
@Configuration
public static class TestConfiguration {
@Bean
Function<Person, Person> echo() {
Function<Message<Person>, Message<Person>> echo() {
return Function.identity();
}