Skip to content

Commit 1fc25d8

Browse files
authored
MINOR: remove arguments from AsyncKafkaConsumerTest.newConsumer() that are identical (apache#20426)
Very minor cleanup of redundant arguments in `AsyncKafkaConsumerTest`. Reviewers: Andrew Schofield <[email protected]>
1 parent 74b2228 commit 1fc25d8

File tree

1 file changed

+11
-35
lines changed

1 file changed

+11
-35
lines changed

clients/src/test/java/org/apache/kafka/clients/consumer/internals/AsyncKafkaConsumerTest.java

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,13 @@ private AsyncKafkaConsumer<String, String> newConsumer(
250250
FetchBuffer fetchBuffer,
251251
ConsumerInterceptors<String, String> interceptors,
252252
ConsumerRebalanceListenerInvoker rebalanceListenerInvoker,
253-
SubscriptionState subscriptions,
254-
String groupId,
255-
String clientId,
256-
boolean autoCommitEnabled) {
253+
SubscriptionState subscriptions) {
257254
long retryBackoffMs = 100L;
258255
int requestTimeoutMs = 30000;
259256
int defaultApiTimeoutMs = 1000;
260257
return new AsyncKafkaConsumer<>(
261258
new LogContext(),
262-
clientId,
259+
"client-id",
263260
new Deserializers<>(new StringDeserializer(), new StringDeserializer(), metrics),
264261
fetchBuffer,
265262
fetchCollector,
@@ -275,8 +272,8 @@ private AsyncKafkaConsumer<String, String> newConsumer(
275272
retryBackoffMs,
276273
requestTimeoutMs,
277274
defaultApiTimeoutMs,
278-
groupId,
279-
autoCommitEnabled);
275+
"group-id",
276+
false);
280277
}
281278

282279
@Test
@@ -707,10 +704,7 @@ public void testCloseLeavesGroup(long timeoutMs) {
707704
mock(FetchBuffer.class),
708705
mock(ConsumerInterceptors.class),
709706
mock(ConsumerRebalanceListenerInvoker.class),
710-
subscriptions,
711-
"group-id",
712-
"client-id",
713-
false));
707+
subscriptions));
714708
consumer.close(CloseOptions.timeout(Duration.ofMillis(timeoutMs)));
715709
verify(applicationEventHandler).addAndGet(any(LeaveGroupOnCloseEvent.class));
716710
}
@@ -730,10 +724,7 @@ public void testCloseLeavesGroupDespiteOnPartitionsLostError() {
730724
mock(FetchBuffer.class),
731725
new ConsumerInterceptors<>(Collections.emptyList(), metrics),
732726
invoker,
733-
subscriptions,
734-
"group-id",
735-
"client-id",
736-
false));
727+
subscriptions));
737728
consumer.setGroupAssignmentSnapshot(partitions);
738729

739730
Throwable t = assertThrows(KafkaException.class, () -> consumer.close(CloseOptions.timeout(Duration.ZERO)));
@@ -754,10 +745,7 @@ public void testCloseLeavesGroupDespiteInterrupt(long timeoutMs) {
754745
mock(FetchBuffer.class),
755746
mock(ConsumerInterceptors.class),
756747
mock(ConsumerRebalanceListenerInvoker.class),
757-
subscriptions,
758-
"group-id",
759-
"client-id",
760-
false));
748+
subscriptions));
761749

762750
Duration timeout = Duration.ofMillis(timeoutMs);
763751

@@ -778,10 +766,7 @@ public void testCommitSyncAllConsumed() {
778766
mock(FetchBuffer.class),
779767
mock(ConsumerInterceptors.class),
780768
mock(ConsumerRebalanceListenerInvoker.class),
781-
subscriptions,
782-
"group-id",
783-
"client-id",
784-
false);
769+
subscriptions);
785770
completeTopicSubscriptionChangeEventSuccessfully();
786771
consumer.subscribe(singleton("topic"), mock(ConsumerRebalanceListener.class));
787772
subscriptions.assignFromSubscribed(singleton(new TopicPartition("topic", 0)));
@@ -803,10 +788,7 @@ public void testAutoCommitSyncDisabled() {
803788
mock(FetchBuffer.class),
804789
mock(ConsumerInterceptors.class),
805790
mock(ConsumerRebalanceListenerInvoker.class),
806-
subscriptions,
807-
"group-id",
808-
"client-id",
809-
false);
791+
subscriptions);
810792
completeTopicSubscriptionChangeEventSuccessfully();
811793
consumer.subscribe(singleton("topic"), mock(ConsumerRebalanceListener.class));
812794
subscriptions.assignFromSubscribed(singleton(new TopicPartition("topic", 0)));
@@ -1651,10 +1633,7 @@ public void testEnsurePollEventSentOnConsumerPoll() {
16511633
mock(FetchBuffer.class),
16521634
new ConsumerInterceptors<>(Collections.emptyList(), metrics),
16531635
mock(ConsumerRebalanceListenerInvoker.class),
1654-
subscriptions,
1655-
"group-id",
1656-
"client-id",
1657-
false);
1636+
subscriptions);
16581637
final TopicPartition tp = new TopicPartition("topic", 0);
16591638
final List<ConsumerRecord<String, String>> records = singletonList(
16601639
new ConsumerRecord<>("topic", 0, 2, "key1", "value1"));
@@ -2034,10 +2013,7 @@ public void testRecordBackgroundEventQueueSizeAndBackgroundEventQueueTime() {
20342013
mock(FetchBuffer.class),
20352014
mock(ConsumerInterceptors.class),
20362015
mock(ConsumerRebalanceListenerInvoker.class),
2037-
mock(SubscriptionState.class),
2038-
"group-id",
2039-
"client-id",
2040-
false);
2016+
mock(SubscriptionState.class));
20412017
Metrics metrics = consumer.metricsRegistry();
20422018
AsyncConsumerMetrics kafkaConsumerMetrics = consumer.kafkaConsumerMetrics();
20432019

0 commit comments

Comments
 (0)