From 8ce3aa2eb8d62ce3f51dbf37d153656b90e2b6d4 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 26 Oct 2018 18:33:19 -0400 Subject: [PATCH] Sonar fixes --- .../annotation/KafkaListenerAnnotationBeanPostProcessor.java | 2 +- .../kafka/config/MethodKafkaListenerEndpoint.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java index 639837b5..ced5bd2e 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java @@ -352,7 +352,7 @@ public class KafkaListenerAnnotationBeanPostProcessor Method defaultMethod = null; for (Method method : multiMethods) { Method checked = checkProxy(method, bean); - if (AnnotationUtils.findAnnotation(method, KafkaHandler.class).isDefault()) { + if (AnnotationUtils.findAnnotation(method, KafkaHandler.class).isDefault()) { // NOSONAR never null final Method toAssert = defaultMethod; Assert.state(toAssert == null, () -> "Only one @KafkaHandler can be marked 'isDefault', found: " + toAssert.toString() + " and " + method.toString()); diff --git a/spring-kafka/src/main/java/org/springframework/kafka/config/MethodKafkaListenerEndpoint.java b/spring-kafka/src/main/java/org/springframework/kafka/config/MethodKafkaListenerEndpoint.java index 2092406a..d0977a86 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/config/MethodKafkaListenerEndpoint.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/config/MethodKafkaListenerEndpoint.java @@ -110,13 +110,12 @@ public class MethodKafkaListenerEndpoint extends AbstractKafkaListenerEndp if (method != null) { SendTo ann = AnnotationUtils.getAnnotation(method, SendTo.class); if (ann != null) { - if (method.getReturnType().equals(void.class)) { - if (this.logger.isWarnEnabled()) { + if (method.getReturnType().equals(void.class) + && this.logger.isWarnEnabled()) { this.logger.warn("Method " + method + " has a void return type; @SendTo is ignored" + (this.errorHandler == null ? "" : " unless the error handler returns a result")); - } } String[] destinations = ann.value(); if (destinations.length > 1) {