Skip to content

Commit 0d179e7

Browse files
garyrussellartembilan
authored andcommitted
GH-1376: Fix ContainerCustomizer
Resolves #1376 The customizer was not called for containers created for `@KafkaListener`, only for containers created manually via the factory. **cherry-pick to 2.3.x** (cherry picked from commit ba78721)
1 parent 959d344 commit 0d179e7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerContainerFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public C createListenerContainer(KafkaListenerEndpoint endpoint) {
343343

344344
endpoint.setupListenerContainer(instance, this.messageConverter);
345345
initializeContainer(instance, endpoint);
346-
346+
customizeContainer(instance);
347347
return instance;
348348
}
349349

spring-kafka/src/test/java/org/springframework/kafka/listener/ContainerStoppingBatchErrorHandlerTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public void stopContainerAfterException() throws Exception {
107107
assertThat(two).isSameAs(this.config.springManagedContainer());
108108
assertThat(one.getListenerId()).isEqualTo(CONTAINER_ID);
109109
assertThat(two.getListenerId()).isEqualTo("springManagedContainer");
110+
assertThat(this.config.customized).isEqualTo(2);
110111
}
111112

112113
@Configuration
@@ -123,6 +124,8 @@ public static class Config {
123124

124125
private final CountDownLatch commitLatch = new CountDownLatch(3);
125126

127+
private volatile int customized;
128+
126129
@KafkaListener(id = CONTAINER_ID, topics = "foo")
127130
public void foo(List<String> in) {
128131
this.deliveryLatch.countDown();
@@ -212,6 +215,7 @@ public void handle(Exception thrownException, ConsumerRecords<?, ?> records,
212215

213216
});
214217
factory.setBatchListener(true);
218+
factory.setContainerCustomizer(container -> this.customized++);
215219
return factory;
216220
}
217221

0 commit comments

Comments
 (0)