Skip to content

Commit b29908e

Browse files
committed
GH-4337: Fix compilation warnings
Fixes: #4337 Fix test compile warnings: use mocks for ConsumerGroupMetadata, add serialVersionUID Signed-off-by: Soby Chacko <soby.chacko@broadcom.com>
1 parent 8ee8d0f commit b29908e

10 files changed

+14
-11
lines changed

spring-kafka/src/test/java/org/springframework/kafka/core/KafkaSaslHandlerClassloadingTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ static class TestableProducerFactory<K, V> extends DefaultKafkaProducerFactory<K
140140
/**
141141
* Marker exception to exit producer creation after capturing classloader.
142142
*/
143+
@SuppressWarnings("serial")
143144
static class TestAbortedException extends RuntimeException {
145+
146+
private static final long serialVersionUID = 1L;
144147
}
145148

146149
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public Consumer consumer() {
196196
this.closeLatch.countDown();
197197
return null;
198198
}).given(consumer).close();
199-
willReturn(new ConsumerGroupMetadata("")).given(consumer).groupMetadata();
199+
willReturn(mock(ConsumerGroupMetadata.class)).given(consumer).groupMetadata();
200200
return consumer;
201201
}
202202

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void testClassifier() {
7979
IllegalStateException illegalState = new IllegalStateException();
8080
@SuppressWarnings("unchecked")
8181
Consumer<String, String> consumer = mock(Consumer.class);
82-
given(consumer.groupMetadata()).willReturn(new ConsumerGroupMetadata("foo"));
82+
given(consumer.groupMetadata()).willReturn(mock(ConsumerGroupMetadata.class));
8383
MessageListenerContainer container = mock(MessageListenerContainer.class);
8484
given(container.getContainerProperties()).willReturn(new ContainerProperties("foo"));
8585
processor.process(records, consumer, container, illegalState, true, EOSMode.V2);
@@ -130,7 +130,7 @@ void testBackOffNoBatchRecover() {
130130
IllegalStateException illegalState = new IllegalStateException();
131131
@SuppressWarnings("unchecked")
132132
Consumer<String, String> consumer = mock(Consumer.class);
133-
given(consumer.groupMetadata()).willReturn(new ConsumerGroupMetadata("foo"));
133+
given(consumer.groupMetadata()).willReturn(mock(ConsumerGroupMetadata.class));
134134
MessageListenerContainer container = mock(MessageListenerContainer.class);
135135
given(container.isRunning()).willReturn(true);
136136
processor.processBatch(consumerRecords, records, consumer, container, illegalState, false, EOSMode.V2);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public Consumer consumer() {
218218
this.closeLatch.countDown();
219219
return null;
220220
}).given(consumer).close();
221-
willReturn(new ConsumerGroupMetadata(CONTAINER_ID)).given(consumer).groupMetadata();
221+
willReturn(mock(ConsumerGroupMetadata.class)).given(consumer).groupMetadata();
222222
return consumer;
223223
}
224224

@@ -250,7 +250,7 @@ public Consumer consumer2() {
250250
return new ConsumerRecords(Collections.emptyMap(), Map.of());
251251
}
252252
}).given(consumer).poll(any());
253-
willReturn(new ConsumerGroupMetadata(CONTAINER_ID_2)).given(consumer).groupMetadata();
253+
willReturn(mock(ConsumerGroupMetadata.class)).given(consumer).groupMetadata();
254254
return consumer;
255255
}
256256

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public Consumer consumer() {
200200
this.closeLatch.countDown();
201201
return null;
202202
}).given(consumer).close();
203-
willReturn(new ConsumerGroupMetadata(CONTAINER_ID)).given(consumer).groupMetadata();
203+
willReturn(mock(ConsumerGroupMetadata.class)).given(consumer).groupMetadata();
204204
return consumer;
205205
}
206206

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public Consumer consumer() {
236236
this.closeLatch.countDown();
237237
return null;
238238
}).given(consumer).close();
239-
willReturn(new ConsumerGroupMetadata(CONTAINER_ID)).given(consumer).groupMetadata();
239+
willReturn(mock(ConsumerGroupMetadata.class)).given(consumer).groupMetadata();
240240
return consumer;
241241
}
242242

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public Consumer consumer() {
237237
this.closeLatch.countDown();
238238
return null;
239239
}).given(consumer).close();
240-
willReturn(new ConsumerGroupMetadata(CONTAINER_ID)).given(consumer).groupMetadata();
240+
willReturn(mock(ConsumerGroupMetadata.class)).given(consumer).groupMetadata();
241241
return consumer;
242242
}
243243

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public Consumer consumer() {
210210
this.closeLatch.countDown();
211211
return null;
212212
}).given(consumer).close();
213-
willReturn(new ConsumerGroupMetadata(CONTAINER_ID)).given(consumer).groupMetadata();
213+
willReturn(mock(ConsumerGroupMetadata.class)).given(consumer).groupMetadata();
214214
return consumer;
215215
}
216216

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public Consumer consumer() {
196196
this.closeLatch.countDown();
197197
return null;
198198
}).given(consumer).close();
199-
willReturn(new ConsumerGroupMetadata(CONTAINER_ID)).given(consumer).groupMetadata();
199+
willReturn(mock(ConsumerGroupMetadata.class)).given(consumer).groupMetadata();
200200
return consumer;
201201
}
202202

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ private void testConsumeAndProduceTransactionGuts(boolean handleError, AckMode a
244244
props.setAssignmentCommitOption(AssignmentCommitOption.ALWAYS);
245245
props.setEosMode(eosMode);
246246
props.setStopContainerWhenFenced(stopWhenFenced);
247-
ConsumerGroupMetadata consumerGroupMetadata = new ConsumerGroupMetadata("group");
247+
ConsumerGroupMetadata consumerGroupMetadata = mock(ConsumerGroupMetadata.class);
248248
given(consumer.groupMetadata()).willReturn(consumerGroupMetadata);
249249
final KafkaTemplate template = new KafkaTemplate(pf);
250250
if (AckMode.MANUAL_IMMEDIATE.equals(ackMode)) {

0 commit comments

Comments
 (0)