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

GH-221: Fix KafkaListenerBPP.resolveAsString()

Browse Source 
Fixes GH-221 (https://github.com/spring-projects/spring-kafka/issues/221)

When the value is `String[]` we iterate it for the `if (resolvedValue instanceof String[]) {` and then just go to a new `if` block instead of `else if` or `return`

* Fix `KafkaListenerBPP.resolveAsString()` as an `else if` for the second condition
* Confirm the fix with the  `EnableKafkaIntegrationTests` test modification to resolve `topics` to the `String[]`
This commit is contained in:
Artem Bilan
2017-01-06 12:14:39 -05:00
committed by Gary Russell
parent bc4eaa2b01
commit 943e48c32f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 the original author or authors.
* Copyright 2014-2017 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.
@@ -523,7 +523,7 @@ public class KafkaListenerAnnotationBeanPostProcessor<K, V>
resolveAsString(object, result);
}
}
if (resolvedValue instanceof String) {
else if (resolvedValue instanceof String) {
result.add((String) resolvedValue);
}
else if (resolvedValue instanceof Iterable) {

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

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 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.
@@ -88,7 +88,8 @@ public class EnableKafkaIntegrationTests {
public Listener listener;
@ClassRule
public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1, true, "annotated1", "annotated2", "annotated3",
public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1, true,
"annotated1", "annotated2", "annotated3",
"annotated4", "annotated5", "annotated6", "annotated7", "annotated8", "annotated9", "annotated10",
"annotated11", "annotated12", "annotated13");
@@ -433,7 +434,7 @@ public class EnableKafkaIntegrationTests {
public void manualStart(String foo) {
}
@KafkaListener(id = "foo", topics = "${topicOne:annotated1}")
@KafkaListener(id = "foo", topics = "#{'${topicOne:annotated1,foo}'.split(',')}")
public void listen1(String foo) {
this.latch1.countDown();
}