apply review.

spring-projects · Apr 23, 2024 · 99f5430 · 99f5430
1 parent 22483e8
commit 99f5430
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...n/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java b/...n/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java
@@ -703,14 +703,12 @@ private void resolveFilter(MethodKafkaListenerEndpoint<?, ?> endpoint, KafkaList
 		Object filter = resolveExpression(kafkaListener.filter());
 		if (filter instanceof RecordFilterStrategy rfs) {
 			endpoint.setRecordFilterStrategy(rfs);
-			endpoint.setAckDiscarded(true);
 		}
 		else {
 			String filterBeanName = resolveExpressionAsString(kafkaListener.filter(), "filter");
 			if (StringUtils.hasText(filterBeanName)) {
 				endpoint.setRecordFilterStrategy(
 						this.beanFactory.getBean(filterBeanName, RecordFilterStrategy.class));
-				endpoint.setAckDiscarded(true);
 			}
 		}
 	}

diff --git a/...g-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerEndpoint.java b/...g-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerEndpoint.java
@@ -326,6 +326,7 @@ public void setReplyTemplate(KafkaTemplate<?, ?> replyTemplate) {
 	@SuppressWarnings("unchecked")
 	public void setRecordFilterStrategy(RecordFilterStrategy<? super K, ? super V> recordFilterStrategy) {
 		this.recordFilterStrategy = (RecordFilterStrategy<K, V>) recordFilterStrategy;
+		setAckDiscarded(true);
 	}
 
 	protected boolean isAckDiscarded() {