Skip to content

Commit 9ce3d04

Browse files
Fixes lint error.
1 parent ebae43a commit 9ce3d04

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

spring-kafka/src/main/java/org/springframework/kafka/listener/DeliveryAttemptAwareRetryListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
import org.apache.kafka.common.header.Header;
2424
import org.apache.kafka.common.header.Headers;
2525
import org.apache.kafka.common.header.internals.RecordHeader;
26+
2627
import org.springframework.kafka.support.KafkaHeaders;
2728

2829
/**
29-
* DeliveryAttemptAwareRetryListener class for {@link RetryListener} implementations.
30+
* The DeliveryAttemptAwareRetryListener class for {@link RetryListener} implementations.
3031
* The DeliveryAttemptAwareRetryListener adds the {@link KafkaHeaders}.DELIVERY_ATTEMPT header
3132
* to the record's headers when batch records fail and are retried.
3233
* Note that DeliveryAttemptAwareRetryListener modifies the headers of the original record.

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.apache.kafka.common.serialization.StringDeserializer;
3636
import org.apache.kafka.common.serialization.StringSerializer;
3737
import org.junit.jupiter.api.Test;
38+
3839
import org.springframework.beans.factory.annotation.Autowired;
3940
import org.springframework.context.annotation.Bean;
4041
import org.springframework.context.annotation.Configuration;
@@ -128,7 +129,6 @@ void should_have_delivery_attempt_header_in_each_consumer_record_with_more_bigge
128129
}
129130
}
130131

131-
132132
private Map<Integer, Integer> convertToMap(List<Header> headers) {
133133
Map<Integer, Integer> map = new HashMap<>();
134134
for (Header header : headers) {
@@ -139,6 +139,15 @@ private Map<Integer, Integer> convertToMap(List<Header> headers) {
139139
return map;
140140
}
141141

142+
private boolean awaitLatch(CountDownLatch latch) {
143+
try {
144+
return latch.await(60, TimeUnit.SECONDS);
145+
}
146+
catch (Exception e) {
147+
fail(e.getMessage());
148+
throw new RuntimeException(e);
149+
}
150+
}
142151

143152
static class TestTopicListener0 {
144153
final List<Header> receivedHeaders = new ArrayList<>();
@@ -291,19 +300,9 @@ ConsumerFactory<String, String> consumerFactory() {
291300
containerProperties.setDeliveryAttemptHeader(true);
292301

293302
return factory;
294-
}
295303

296-
297-
}
298-
299-
private boolean awaitLatch(CountDownLatch latch) {
300-
try {
301-
return latch.await(60, TimeUnit.SECONDS);
302-
}
303-
catch (Exception e) {
304-
fail(e.getMessage());
305-
throw new RuntimeException(e);
306304
}
305+
307306
}
308307

309308
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.kafka.listener;
1818

19-
import static org.assertj.core.api.Assertions.*;
19+
import static org.assertj.core.api.Assertions.assertThat;
2020

2121
import java.nio.ByteBuffer;
2222
import java.util.HashMap;
@@ -28,6 +28,7 @@
2828
import org.apache.kafka.common.TopicPartition;
2929
import org.apache.kafka.common.header.Header;
3030
import org.junit.jupiter.api.Test;
31+
3132
import org.springframework.kafka.support.KafkaHeaders;
3233

3334
/**
@@ -38,7 +39,6 @@
3839

3940
class DeliveryAttemptAwareRetryListenerTest {
4041

41-
4242
@Test
4343
void should_have_single_header_and_header_value_should_be_1() {
4444
// Given

0 commit comments

Comments
 (0)