Skip to content

Commit 4387d81

Browse files
committed
refactor: check style
Signed-off-by: Chaedong Im <[email protected]>
1 parent b92290e commit 4387d81

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616

1717
package org.springframework.kafka.listener;
1818

19+
import java.time.Duration;
20+
import java.util.*;
21+
import java.util.concurrent.CountDownLatch;
22+
import java.util.concurrent.TimeUnit;
23+
1924
import org.apache.kafka.clients.consumer.Consumer;
2025
import org.apache.kafka.clients.consumer.ConsumerRecord;
2126
import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -25,11 +30,6 @@
2530
import org.springframework.kafka.listener.adapter.FilteringMessageListenerAdapter;
2631
import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
2732

28-
import java.time.Duration;
29-
import java.util.*;
30-
import java.util.concurrent.CountDownLatch;
31-
import java.util.concurrent.TimeUnit;
32-
3333
import static org.assertj.core.api.Assertions.assertThat;
3434
import static org.mockito.ArgumentMatchers.any;
3535
import static org.mockito.BDDMockito.given;
@@ -88,7 +88,7 @@ public void testRecordFilteredModeOnlyCommitsProcessedRecords() throws Interrupt
8888

8989
given(consumer.poll(any(Duration.class)))
9090
.willReturn(consumerRecords)
91-
.willReturn(new ConsumerRecords<>(Collections.emptyMap()));
91+
.willReturn(ConsumerRecords.empty());
9292

9393
// When: Start the container and process records
9494
container.start();
@@ -139,7 +139,7 @@ public void testRecordFilteredModeWithAllRecordsFiltered() throws InterruptedExc
139139

140140
given(consumer.poll(any(Duration.class)))
141141
.willReturn(consumerRecords)
142-
.willReturn(new ConsumerRecords<>(Collections.emptyMap()));
142+
.willReturn(ConsumerRecords.empty());
143143

144144
// When
145145
container.start();
@@ -201,7 +201,7 @@ public void testRecordFilteredModeWithMixedPartitions() throws InterruptedExcept
201201

202202
given(consumer.poll(any(Duration.class)))
203203
.willReturn(consumerRecords)
204-
.willReturn(new ConsumerRecords<>(Collections.emptyMap()));
204+
.willReturn(ConsumerRecords.empty());
205205

206206
// When
207207
container.start();

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616

1717
package org.springframework.kafka.listener;
1818

19+
import java.time.Duration;
20+
import java.util.*;
21+
import java.util.concurrent.CountDownLatch;
22+
import java.util.concurrent.TimeUnit;
23+
1924
import org.apache.kafka.clients.consumer.Consumer;
2025
import org.apache.kafka.clients.consumer.ConsumerRecord;
2126
import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -25,11 +30,6 @@
2530
import org.springframework.kafka.listener.adapter.FilteringMessageListenerAdapter;
2631
import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
2732

28-
import java.time.Duration;
29-
import java.util.*;
30-
import java.util.concurrent.CountDownLatch;
31-
import java.util.concurrent.TimeUnit;
32-
3333
import static org.assertj.core.api.Assertions.assertThat;
3434
import static org.mockito.ArgumentMatchers.any;
3535
import static org.mockito.ArgumentMatchers.anyMap;
@@ -85,6 +85,8 @@ public void testCurrentRecordModeCommitsAllRecords() throws InterruptedException
8585

8686
Map<TopicPartition, List<ConsumerRecord<String, String>>> recordsMap = new HashMap<>();
8787
recordsMap.put(tp, records);
88+
89+
@SuppressWarnings("deprecation")
8890
ConsumerRecords<String, String> consumerRecords = new ConsumerRecords<>(recordsMap);
8991

9092
given(consumer.poll(any(Duration.class)))
@@ -135,6 +137,8 @@ public void testAllRecordsFilteredStillCommits() throws InterruptedException {
135137

136138
Map<TopicPartition, List<ConsumerRecord<String, String>>> recordsMap = new HashMap<>();
137139
recordsMap.put(tp, records);
140+
141+
@SuppressWarnings("deprecation")
138142
ConsumerRecords<String, String> consumerRecords = new ConsumerRecords<>(recordsMap);
139143

140144
given(consumer.poll(any(Duration.class)))
@@ -197,6 +201,8 @@ record -> record.value().contains("skip");
197201
Map<TopicPartition, List<ConsumerRecord<String, String>>> recordsMap = new HashMap<>();
198202
recordsMap.put(tp0, records.subList(0, 2));
199203
recordsMap.put(tp1, records.subList(2, 5));
204+
205+
@SuppressWarnings("deprecation")
200206
ConsumerRecords<String, String> consumerRecords = new ConsumerRecords<>(recordsMap);
201207

202208
given(consumer.poll(any(Duration.class)))
@@ -247,6 +253,8 @@ public void testCommitLogging() throws InterruptedException {
247253

248254
Map<TopicPartition, List<ConsumerRecord<String, String>>> recordsMap = new HashMap<>();
249255
recordsMap.put(tp, records);
256+
257+
@SuppressWarnings("deprecation")
250258
ConsumerRecords<String, String> consumerRecords = new ConsumerRecords<>(recordsMap);
251259

252260
given(consumer.poll(any(Duration.class)))
@@ -299,6 +307,8 @@ public void testAckDiscardedParameterBehavior() throws InterruptedException {
299307

300308
Map<TopicPartition, List<ConsumerRecord<String, String>>> recordsMap = new HashMap<>();
301309
recordsMap.put(tp, records);
310+
311+
@SuppressWarnings("deprecation")
302312
ConsumerRecords<String, String> consumerRecords = new ConsumerRecords<>(recordsMap);
303313

304314
given(consumer.poll(any(Duration.class)))

0 commit comments

Comments
 (0)