Skip to content

Commit 9260145

Browse files
authored
KafkaTemplate Code Cleanup
Fixes: #3065 * Cleanup unnecessary usage of KakaTemplate.this to access members
1 parent c383b13 commit 9260145

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

spring-kafka/src/main/java/org/springframework/kafka/core/KafkaTemplate.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -839,17 +839,17 @@ private Callback buildCallback(final ProducerRecord<K, V> producerRecord, final
839839
}
840840
}
841841
catch (Exception e) {
842-
KafkaTemplate.this.logger.warn(e, () -> "Error executing interceptor onAcknowledgement callback");
842+
this.logger.warn(e, () -> "Error executing interceptor onAcknowledgement callback");
843843
}
844844
try {
845845
if (exception == null) {
846846
successTimer(sample, producerRecord);
847847
observation.stop();
848848
future.complete(new SendResult<>(producerRecord, metadata));
849-
if (KafkaTemplate.this.producerListener != null) {
850-
KafkaTemplate.this.producerListener.onSuccess(producerRecord, metadata);
849+
if (this.producerListener != null) {
850+
this.producerListener.onSuccess(producerRecord, metadata);
851851
}
852-
KafkaTemplate.this.logger.trace(() -> "Sent ok: " + KafkaUtils.format(producerRecord)
852+
this.logger.trace(() -> "Sent ok: " + KafkaUtils.format(producerRecord)
853853
+ ", metadata: " + metadata);
854854
}
855855
else {
@@ -858,17 +858,14 @@ private Callback buildCallback(final ProducerRecord<K, V> producerRecord, final
858858
observation.stop();
859859
future.completeExceptionally(
860860
new KafkaProducerException(producerRecord, "Failed to send", exception));
861-
if (KafkaTemplate.this.producerListener != null) {
862-
KafkaTemplate.this.producerListener.onError(producerRecord, metadata, exception);
861+
if (this.producerListener != null) {
862+
this.producerListener.onError(producerRecord, metadata, exception);
863863
}
864-
KafkaTemplate.this.logger.debug(exception, () -> "Failed to send: "
865-
+ KafkaUtils.format(producerRecord));
864+
this.logger.debug(exception, () -> "Failed to send: " + KafkaUtils.format(producerRecord));
866865
}
867866
}
868867
finally {
869-
if (!KafkaTemplate.this.transactional) {
870-
closeProducer(producer, false);
871-
}
868+
closeProducer(producer, this.transactional);
872869
}
873870
};
874871
}
@@ -985,7 +982,6 @@ public void destroy() {
985982
}
986983
}
987984

988-
@SuppressWarnings("serial")
989985
private static final class SkipAbortException extends RuntimeException {
990986

991987
SkipAbortException(Throwable cause) {

0 commit comments

Comments
 (0)