Spring/spring-kafka
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify assertions in MessagingMListenerAdapter

Browse Source 
Merge assertion conditions into one in MessagingMessageListenerAdapter
This commit is contained in:
Johnny Lim
2018-07-20 00:36:49 +09:00
committed by Artem Bilan
parent 10db6e9711
commit 43a38614bd
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/MessagingMessageListenerAdapter.java
View File

@@ -491,14 +491,16 @@ public abstract class MessagingMessageListenerAdapter<K, V> implements ConsumerS
}
boolean validParametersForBatch = validParametersForBatch(method.getGenericParameterTypes().length,
this.hasAckParameter, hasConsumerParameter);
String stateMessage = "A parameter of type '%s' must be the only parameter "
+ "(except for an optional 'Acknowledgment' and/or 'Consumer')";
Assert.state(!this.isConsumerRecords || validParametersForBatch,
() -> String.format(stateMessage, "ConsumerRecords"));
Assert.state(!this.isConsumerRecordList || validParametersForBatch,
() -> String.format(stateMessage, "List<ConsumerRecord>"));
Assert.state(!this.isMessageList || validParametersForBatch,
() -> String.format(stateMessage, "List<Message<?>>"));
if (!validParametersForBatch) {
String stateMessage = "A parameter of type '%s' must be the only parameter "
+ "(except for an optional 'Acknowledgment' and/or 'Consumer')";
Assert.state(!this.isConsumerRecords,
() -> String.format(stateMessage, "ConsumerRecords"));
Assert.state(!this.isConsumerRecordList,
() -> String.format(stateMessage, "List<ConsumerRecord>"));
Assert.state(!this.isMessageList,
() -> String.format(stateMessage, "List<Message<?>>"));
}
this.messageReturnType = KafkaUtils.returnTypeMessageOrCollectionOf(method);
return genericParameterType;
}