From f76b2a6b794b23a839b43e4a8c3f0d0df3326dd7 Mon Sep 17 00:00:00 2001 From: Adrian Chlebosz Date: Fri, 19 Jan 2024 00:30:28 +0100 Subject: [PATCH] GH-2800: rebase changes on top of the most recent main --- .../annotation/RetryableTopicAnnotationProcessor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/RetryableTopicAnnotationProcessor.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/RetryableTopicAnnotationProcessor.java index 08f60e8ee6..f292c74745 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/RetryableTopicAnnotationProcessor.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/RetryableTopicAnnotationProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2023 the original author or authors. + * Copyright 2018-2024 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. @@ -21,6 +21,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanInitializationException; @@ -152,7 +156,6 @@ public RetryTopicConfiguration processAnnotation(String[] topics, Method method, .sameIntervalTopicReuseStrategy(annotation.sameIntervalTopicReuseStrategy()) .timeoutAfter(timeout) .dltRoutingRules(createDltRoutingSpecFromAnnotation(annotation.exceptionBasedDltRouting())) - .create(getKafkaTemplate(resolveExpressionAsString(annotation.kafkaTemplate(), "kafkaTemplate"), topics)); .timeoutAfter(timeout); Integer attempts = resolveExpressionAsInteger(annotation.attempts(), "attempts", true);