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

Add KafkaNull test

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-07-24 09:22:32 +02:00
parent a24f0bac04
commit 470eadfaf9
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SmartMessageMethodArgumentResolver.java
View File

@@ -74,7 +74,7 @@ class SmartMessageMethodArgumentResolver extends MessageMethodArgumentResolver {
Object payload = message.getPayload();
if (isEmptyPayload(payload)) {
if (isExplicitNullPayload(payload)) {
return null;
return message;
}
throw new MessageConversionException(message,
"Cannot convert from actual payload type '"

27
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
View File

@@ -149,16 +149,21 @@ public class ImplicitFunctionBindingTests {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(NullMessagerConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false", "--spring.cloud.function.definition=func")) {
.run("--spring.jmx.enabled=false", "--spring.cloud.function.definition=func;funcMessage")) {
InputDestination inputDestination = context.getBean(InputDestination.class);
OutputDestination outputDestination = context.getBean(OutputDestination.class);
Message inputMessage = MessageBuilder.withPayload(KafkaNull.INSTANCE).build();
inputDestination.send(inputMessage);
inputDestination.send(inputMessage, "func-in-0");
Message<byte[]> outputMessage = outputDestination.receive();
Message<byte[]> outputMessage = outputDestination.receive(1000, "func-out-0");
assertThat(outputMessage.getPayload()).isEqualTo("NULL".getBytes());
inputDestination.send(inputMessage, "funcMessage-in-0");
outputMessage = outputDestination.receive(1000, "funcMessage-out-0");
assertThat(outputMessage.getPayload()).isEqualTo("NULL".getBytes());
}
}
@@ -941,6 +946,22 @@ public class ImplicitFunctionBindingTests {
return "NULL";
};
}
@Bean
public Function<Message<Person>, String> funcMessage() {
return value -> {
Object v = value.getPayload();
System.out.println(v.getClass());
if (value.getPayload() instanceof Object) {
System.out.println("");
}
if (((Object) value.getPayload()).getClass() != null) {
System.out.println();
}
//assertThat(value.getPayload().getClass().getName()).isEqualTo("org.springframework.kafka.support.KafkaNull");
return "NULL";
};
}
}
@EnableAutoConfiguration