GH-STREAM-2971 Properly handle Kafka tombstone payload conversion

olegz · olegz · commit da9163032039 · 2024-07-17T16:09:53.000+02:00
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java
@@ -128,6 +128,9 @@ else if (logger.isDebugEnabled()) {
 	@Override
 	protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers,
 			@Nullable Object conversionHint) {
+		if (payload.getClass().getName().equals("org.springframework.kafka.support.KafkaNull")) {
+			return payload;
+		}
 		return jsonMapper.toJson(payload);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,9 @@ else if (logger.isDebugEnabled()) {`
`128`	`128`	`@Override`
`129`	`129`	`protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers,`
`130`	`130`	`@Nullable Object conversionHint) {`
	`131`	`+ if (payload.getClass().getName().equals("org.springframework.kafka.support.KafkaNull")) {`
	`132`	`+ return payload;`
	`133`	`+ }`
`131`	`134`	`return jsonMapper.toJson(payload);`
`132`	`135`	`}`
`133`	`136`