Skip to content

Commit 91d09c8

Browse files
committed
Add deprecation suppression for spring-kafka-2.8
Spring for Apache Kafka 2.8 has introduced an new `CommonErrorHandler` and deprecated its retying components including `RetryingMessageListenerAdapter`. * For proper compatibility with `spring-kafka-2.8.0`, which is going to be a foundation for upcoming Spring Boot 2.6, it is better to suppress deprecations and don't raise such a concern to end-users. In the future we will revise retrying logic to expected behavior from `spring-kafka-2.8.0`. Or will do home-made one as it is now with `AmqpInboundChannelAdapter`, for example. See #3605
1 parent 1b7d622 commit 91d09c8

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.springframework.kafka.listener.ContainerProperties;
4242
import org.springframework.kafka.listener.MessageListener;
4343
import org.springframework.kafka.listener.adapter.RecordMessagingMessageListenerAdapter;
44-
import org.springframework.kafka.listener.adapter.RetryingMessageListenerAdapter;
4544
import org.springframework.kafka.support.Acknowledgment;
4645
import org.springframework.kafka.support.KafkaHeaders;
4746
import org.springframework.kafka.support.converter.ConversionException;
@@ -130,7 +129,7 @@ public void setPayloadType(Class<?> payloadType) {
130129
/**
131130
* Specify a {@link RetryTemplate} instance to wrap
132131
* {@link KafkaInboundGateway.IntegrationRecordMessageListener} into
133-
* {@link RetryingMessageListenerAdapter}.
132+
* {@code RetryingMessageListenerAdapter}.
134133
* @param retryTemplate the {@link RetryTemplate} to use.
135134
*/
136135
public void setRetryTemplate(RetryTemplate retryTemplate) {
@@ -174,12 +173,14 @@ public void setBindSourceRecord(boolean bindSourceRecord) {
174173
}
175174

176175
@Override
176+
@SuppressWarnings("deprecation")
177177
protected void onInit() {
178178
super.onInit();
179179
MessageListener<K, V> kafkaListener = this.listener;
180180
if (this.retryTemplate != null) {
181181
kafkaListener =
182-
new RetryingMessageListenerAdapter<>(kafkaListener, this.retryTemplate, this.recoveryCallback);
182+
new org.springframework.kafka.listener.adapter.RetryingMessageListenerAdapter<>(kafkaListener,
183+
this.retryTemplate, this.recoveryCallback);
183184
this.retryTemplate.registerListener(this.listener);
184185
}
185186
ContainerProperties containerProperties = this.messageListenerContainer.getContainerProperties();

spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.springframework.kafka.listener.adapter.FilteringMessageListenerAdapter;
4747
import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
4848
import org.springframework.kafka.listener.adapter.RecordMessagingMessageListenerAdapter;
49-
import org.springframework.kafka.listener.adapter.RetryingMessageListenerAdapter;
5049
import org.springframework.kafka.support.Acknowledgment;
5150
import org.springframework.kafka.support.KafkaHeaders;
5251
import org.springframework.kafka.support.converter.BatchMessageConverter;
@@ -194,7 +193,7 @@ public void setAckDiscarded(boolean ackDiscarded) {
194193
/**
195194
* Specify a {@link RetryTemplate} instance to wrap
196195
* {@link KafkaMessageDrivenChannelAdapter.IntegrationRecordMessageListener} into
197-
* {@link RetryingMessageListenerAdapter}.
196+
* {@code RetryingMessageListenerAdapter}.
198197
* @param retryTemplate the {@link RetryTemplate} to use.
199198
* @since 2.0.1
200199
*/
@@ -218,12 +217,12 @@ public void setRecoveryCallback(RecoveryCallback<?> recoveryCallback) {
218217

219218
/**
220219
* The {@code boolean} flag to specify the order how
221-
* {@link RetryingMessageListenerAdapter} and
220+
* {@code RetryingMessageListenerAdapter} and
222221
* {@link FilteringMessageListenerAdapter} are wrapped to each other,
223222
* if both of them are present.
224223
* Does not make sense if only one of {@link RetryTemplate} or
225224
* {@link RecordFilterStrategy} is present, or any.
226-
* @param filterInRetry the order for {@link RetryingMessageListenerAdapter} and
225+
* @param filterInRetry the order for {@code RetryingMessageListenerAdapter} and
227226
* {@link FilteringMessageListenerAdapter} wrapping. Defaults to {@code false}.
228227
* @since 2.0.1
229228
*/
@@ -274,6 +273,7 @@ public String getComponentType() {
274273
}
275274

276275
@Override
276+
@SuppressWarnings("deprecation")
277277
protected void onInit() {
278278
super.onInit();
279279

@@ -292,14 +292,14 @@ protected void onInit() {
292292
if (doFilterInRetry) {
293293
listener = new FilteringMessageListenerAdapter<>(listener, this.recordFilterStrategy,
294294
this.ackDiscarded);
295-
listener = new RetryingMessageListenerAdapter<>(listener, this.retryTemplate,
296-
this.recoveryCallback);
295+
listener = new org.springframework.kafka.listener.adapter.RetryingMessageListenerAdapter<>(listener,
296+
this.retryTemplate, this.recoveryCallback);
297297
this.retryTemplate.registerListener(this.recordListener);
298298
}
299299
else {
300300
if (this.retryTemplate != null) {
301-
listener = new RetryingMessageListenerAdapter<>(listener, this.retryTemplate,
302-
this.recoveryCallback);
301+
listener = new org.springframework.kafka.listener.adapter.RetryingMessageListenerAdapter<>(listener,
302+
this.retryTemplate, this.recoveryCallback);
303303
this.retryTemplate.registerListener(this.recordListener);
304304
}
305305
if (this.recordFilterStrategy != null) {

0 commit comments

Comments
 (0)