Skip to content

Fix SpEL/placeholder resolution in @RetryableTopic.includeNames and @RetryableTopic.excludeNames #4016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2025
Merged

Fix SpEL/placeholder resolution in @RetryableTopic.includeNames and @RetryableTopic.excludeNames #4016

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions ...src/main/java/org/springframework/kafka/annotation/RetryableTopicAnnotationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -132,10 +133,15 @@ public RetryTopicConfiguration processAnnotation(String[] topics, Class<?> clazz
if (resolvedTimeout != null) {
timeout = resolvedTimeout;
}
List<Class<? extends Throwable>> includes = resolveClasses(annotation.include(), annotation.includeNames(),

String[] resolvedIncludeNames = resolveToStringArray(annotation.includeNames());
List<Class<? extends Throwable>> includes = resolveClasses(annotation.include(), resolvedIncludeNames,
"include");
List<Class<? extends Throwable>> excludes = resolveClasses(annotation.exclude(), annotation.excludeNames(),

String[] resolvedExcludeNames = resolveToStringArray(annotation.excludeNames());
List<Class<? extends Throwable>> excludes = resolveClasses(annotation.exclude(), resolvedExcludeNames,
"exclude");

boolean traverse = false;
if (StringUtils.hasText(annotation.traversingCauses())) {
Boolean traverseResolved = resolveExpressionAsBoolean(annotation.traversingCauses(), "traversingCauses");
Expand Down Expand Up @@ -423,4 +429,25 @@ private String resolve(String value) {
return value;
}

private String[] resolveToStringArray(String[] values) {
List<String> result = new ArrayList<>();
for (String value : values) {
Object resolved = resolveExpression(value);
if (resolved instanceof String[] strings) {
Collections.addAll(result, strings);
}
else if (resolved instanceof Collection<?> coll) {
for (Object item : coll) {
result.add(item.toString());
}
}
else if (resolved instanceof String str) {
result.addAll(Arrays.asList(StringUtils.commaDelimitedListToStringArray(str)));
}
else if (resolved != null) {
result.add(resolved.toString());
}
}
return result.toArray(new String[0]);
}
}