Skip to content

Commit dc6bc25

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

File tree

2 files changed

+29
-23
lines changed

2 files changed

+29
-23
lines changed

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

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

1717
package org.springframework.kafka.listener;
1818

19+
import java.time.Duration;
20+
import java.util.ArrayList;
21+
import java.util.HashMap;
22+
import java.util.List;
23+
import java.util.Map;
24+
import java.util.concurrent.CountDownLatch;
25+
import java.util.concurrent.TimeUnit;
26+
1927
import org.apache.kafka.clients.consumer.Consumer;
2028
import org.apache.kafka.clients.consumer.ConsumerRecord;
2129
import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -25,11 +33,6 @@
2533
import org.springframework.kafka.listener.adapter.FilteringMessageListenerAdapter;
2634
import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
2735

28-
import java.time.Duration;
29-
import java.util.*;
30-
import java.util.concurrent.CountDownLatch;
31-
import java.util.concurrent.TimeUnit;
32-
3336
import static org.assertj.core.api.Assertions.assertThat;
3437
import static org.mockito.ArgumentMatchers.any;
3538
import static org.mockito.BDDMockito.given;
@@ -45,7 +48,7 @@
4548
*/
4649
public class AckModeRecordFilteredTest {
4750

48-
@SuppressWarnings("unchecked")
51+
@SuppressWarnings({"unchecked", "deprecation"})
4952
@Test
5053
public void testRecordFilteredModeOnlyCommitsProcessedRecords() throws InterruptedException {
5154
// Given: A container with RECORD_FILTERED ack mode
@@ -88,7 +91,7 @@ public void testRecordFilteredModeOnlyCommitsProcessedRecords() throws Interrupt
8891

8992
given(consumer.poll(any(Duration.class)))
9093
.willReturn(consumerRecords)
91-
.willReturn(new ConsumerRecords<>(Collections.emptyMap()));
94+
.willReturn(ConsumerRecords.empty());
9295

9396
// When: Start the container and process records
9497
container.start();
@@ -102,7 +105,7 @@ public void testRecordFilteredModeOnlyCommitsProcessedRecords() throws Interrupt
102105
verify(consumer, times(2)).commitSync(any(), any(Duration.class));
103106
}
104107

105-
@SuppressWarnings("unchecked")
108+
@SuppressWarnings({"unchecked", "deprecation"})
106109
@Test
107110
public void testRecordFilteredModeWithAllRecordsFiltered() throws InterruptedException {
108111
// Given: All records are filtered
@@ -139,7 +142,7 @@ public void testRecordFilteredModeWithAllRecordsFiltered() throws InterruptedExc
139142

140143
given(consumer.poll(any(Duration.class)))
141144
.willReturn(consumerRecords)
142-
.willReturn(new ConsumerRecords<>(Collections.emptyMap()));
145+
.willReturn(ConsumerRecords.empty());
143146

144147
// When
145148
container.start();
@@ -150,7 +153,7 @@ public void testRecordFilteredModeWithAllRecordsFiltered() throws InterruptedExc
150153
verify(consumer, never()).commitSync(any(), any(Duration.class));
151154
}
152155

153-
@SuppressWarnings("unchecked")
156+
@SuppressWarnings({"unchecked", "deprecation"})
154157
@Test
155158
public void testRecordFilteredModeWithMixedPartitions() throws InterruptedException {
156159
// Given: Mixed partitions with different filtering scenarios
@@ -201,7 +204,7 @@ public void testRecordFilteredModeWithMixedPartitions() throws InterruptedExcept
201204

202205
given(consumer.poll(any(Duration.class)))
203206
.willReturn(consumerRecords)
204-
.willReturn(new ConsumerRecords<>(Collections.emptyMap()));
207+
.willReturn(ConsumerRecords.empty());
205208

206209
// When
207210
container.start();
@@ -213,7 +216,7 @@ public void testRecordFilteredModeWithMixedPartitions() throws InterruptedExcept
213216
verify(consumer, times(3)).commitSync(any(), any(Duration.class));
214217
}
215218

216-
@SuppressWarnings("unchecked")
219+
@SuppressWarnings({"unchecked", "deprecation"})
217220
@Test
218221
public void testRecordFilteredModeEfficiencyGains() throws InterruptedException {
219222
ConsumerFactory<String, String> consumerFactory = mock(ConsumerFactory.class);
@@ -266,7 +269,7 @@ public void testRecordFilteredModeEfficiencyGains() throws InterruptedException
266269
verify(consumer, times(1)).commitSync(any(), any(Duration.class));
267270
}
268271

269-
@SuppressWarnings("unchecked")
272+
@SuppressWarnings({"unchecked", "deprecation"})
270273
@Test
271274
public void testRecordFilteredModeDoesNotBreakNormalProcessing() throws InterruptedException {
272275
ConsumerFactory<String, String> consumerFactory = mock(ConsumerFactory.class);

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616

1717
package org.springframework.kafka.listener;
1818

19+
import java.time.Duration;
20+
import java.util.ArrayList;
21+
import java.util.HashMap;
22+
import java.util.List;
23+
import java.util.Map;
24+
import java.util.concurrent.CountDownLatch;
25+
import java.util.concurrent.TimeUnit;
26+
1927
import org.apache.kafka.clients.consumer.Consumer;
2028
import org.apache.kafka.clients.consumer.ConsumerRecord;
2129
import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -25,11 +33,6 @@
2533
import org.springframework.kafka.listener.adapter.FilteringMessageListenerAdapter;
2634
import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
2735

28-
import java.time.Duration;
29-
import java.util.*;
30-
import java.util.concurrent.CountDownLatch;
31-
import java.util.concurrent.TimeUnit;
32-
3336
import static org.assertj.core.api.Assertions.assertThat;
3437
import static org.mockito.ArgumentMatchers.any;
3538
import static org.mockito.ArgumentMatchers.anyMap;
@@ -46,7 +49,7 @@
4649
*/
4750
public class AckModeRecordWithFilteringTest {
4851

49-
@SuppressWarnings("unchecked")
52+
@SuppressWarnings({"unchecked", "deprecation"})
5053
@Test
5154
public void testCurrentRecordModeCommitsAllRecords() throws InterruptedException {
5255
// Given: A container with RECORD ack mode and a filter that filters out even offsets
@@ -103,7 +106,7 @@ public void testCurrentRecordModeCommitsAllRecords() throws InterruptedException
103106
verify(consumer, times(4)).commitSync(any(), any(Duration.class));
104107
}
105108

106-
@SuppressWarnings("unchecked")
109+
@SuppressWarnings({"unchecked", "deprecation"})
107110
@Test
108111
public void testAllRecordsFilteredStillCommits() throws InterruptedException {
109112
// Given: A container where all records are filtered
@@ -151,7 +154,7 @@ public void testAllRecordsFilteredStillCommits() throws InterruptedException {
151154
verify(consumer, times(2)).commitSync(any(), any(Duration.class));
152155
}
153156

154-
@SuppressWarnings("unchecked")
157+
@SuppressWarnings({"unchecked", "deprecation"})
155158
@Test
156159
public void testMixedPartitionsWithFiltering() throws InterruptedException {
157160
// Given: Multiple partitions with different records
@@ -215,7 +218,7 @@ record -> record.value().contains("skip");
215218
verify(consumer, times(5)).commitSync(any(), any(Duration.class));
216219
}
217220

218-
@SuppressWarnings("unchecked")
221+
@SuppressWarnings({"unchecked", "deprecation"})
219222
@Test
220223
public void testCommitLogging() throws InterruptedException {
221224
ConsumerFactory<String, String> consumerFactory = mock(ConsumerFactory.class);
@@ -262,7 +265,7 @@ public void testCommitLogging() throws InterruptedException {
262265
verify(consumer, times(2)).commitSync(anyMap(), any(Duration.class));
263266
}
264267

265-
@SuppressWarnings("unchecked")
268+
@SuppressWarnings({"unchecked", "deprecation"})
266269
@Test
267270
public void testAckDiscardedParameterBehavior() throws InterruptedException {
268271
ConsumerFactory<String, String> consumerFactory = mock(ConsumerFactory.class);

0 commit comments

Comments
 (0)