Spring/spring-kafka
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix @SendTo Runtime SpEL Detection

Browse Source 
Previously, `setReplyTopic` detected runtime SpEL by checking if
the expression starts with `!{`. Since we use a `TemplateParserContext`
the topic can be evaluated even if the `!{` is not at the beginning.

This is not a breaking change since `!` and `{` are not valid topic characters.
This commit is contained in:
Gary Russell
2018-01-30 13:40:58 -05:00
committed by Artem Bilan
parent ac323ec5b8
commit 3771e2a5e6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/MessagingMessageListenerAdapter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2017 the original author or authors.
* Copyright 2016-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -158,7 +158,7 @@ public abstract class MessagingMessageListenerAdapter<K, V> implements ConsumerS
* @since 2.0
*/
public void setReplyTopic(String replyTopic) {
if (replyTopic.startsWith(PARSER_CONTEXT.getExpressionPrefix())) {
if (replyTopic.contains(PARSER_CONTEXT.getExpressionPrefix())) {
this.replyTopicExpression = PARSER.parseExpression(replyTopic, PARSER_CONTEXT);
}
else {

10
spring-kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java
View File

@@ -477,10 +477,10 @@ public class EnableKafkaIntegrationTests {
ConsumerFactory<Integer, String> cf = new DefaultKafkaConsumerFactory<>(consumerProps);
Consumer<Integer, String> consumer = cf.createConsumer();
embeddedKafka.consumeFromAnEmbeddedTopic(consumer, "annotated21reply");
template.send("annotated21", 0, "annotated21reply");
template.send("annotated21", 0, "nnotated21reply"); // drop the leading 'a'.
template.flush();
ConsumerRecord<Integer, String> reply = KafkaTestUtils.getSingleRecord(consumer, "annotated21reply");
assertThat(reply.value()).isEqualTo("ANNOTATED21REPLY");
assertThat(reply.value()).isEqualTo("NNOTATED21REPLY");
consumer.close();
}
@@ -1019,7 +1019,7 @@ public class EnableKafkaIntegrationTests {
private Object listen16Message;
private CountDownLatch listen16ErrorLatch = new CountDownLatch(1);
private final CountDownLatch listen16ErrorLatch = new CountDownLatch(1);
@Bean
public ConsumerAwareErrorHandler listen16ErrorHandler() {
@@ -1290,13 +1290,13 @@ public class EnableKafkaIntegrationTests {
}
@KafkaListener(id = "replyingListener", topics = "annotated21")
@SendTo("!{request.value()}") // runtime SpEL - test payload is the reply queue
@SendTo("a!{request.value()}") // runtime SpEL - test payload is the reply queue minus leading 'a'
public String replyingListener(String in) {
return in.toUpperCase();
}
@KafkaListener(id = "replyingBatchListener", topics = "annotated22", containerFactory = "batchFactory")
@SendTo("#{'annotated22reply'}") // config time SpEL
@SendTo("a#{'nnotated22reply'}") // config time SpEL
public Collection<String> replyingBatchListener(List<String> in) {
return in.stream().map(String::toUpperCase).collect(Collectors.toList());
}