From 1cd3ebfa3a64f1abb45b77a00595de3084a3e78f Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Fri, 8 Nov 2019 09:28:35 -0500
Subject: [PATCH] Fix Sonar issues

---
 .../kafka/test/assertj/KafkaConditions.java     | 17 ++++++++++++-----
 .../kafka/test/utils/KafkaTestUtils.java        |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/spring-kafka-test/src/main/java/org/springframework/kafka/test/assertj/KafkaConditions.java b/spring-kafka-test/src/main/java/org/springframework/kafka/test/assertj/KafkaConditions.java
index a49ef0d9..cb1bbf1f 100644
--- a/spring-kafka-test/src/main/java/org/springframework/kafka/test/assertj/KafkaConditions.java
+++ b/spring-kafka-test/src/main/java/org/springframework/kafka/test/assertj/KafkaConditions.java
@@ -102,8 +102,12 @@ public final class KafkaConditions {
 
 		@Override
 		public boolean matches(ConsumerRecord<K, ?> value) {
-			return value != null && ((value.key() == null && this.key == null)
-					|| (value.key() != null && value.key().equals(this.key)));
+			if (value == null) {
+				return false;
+			}
+			return value.key() == null
+					? this.key == null
+					: value.key().equals(this.key);
 		}
 
 	}
@@ -119,9 +123,12 @@ public final class KafkaConditions {
 
 		@Override
 		public boolean matches(ConsumerRecord<?, V> value) {
-			return value != null
-					&& (value.value() == null && this.payload == null
-					|| (value.value() != null && value.value().equals(this.payload)));
+			if (value == null) {
+				return false;
+			}
+			return value.value() == null
+					? this.payload == null
+					: value.value().equals(this.payload);
 		}
 
 	}
diff --git a/spring-kafka-test/src/main/java/org/springframework/kafka/test/utils/KafkaTestUtils.java b/spring-kafka-test/src/main/java/org/springframework/kafka/test/utils/KafkaTestUtils.java
index 961a845a..92403253 100644
--- a/spring-kafka-test/src/main/java/org/springframework/kafka/test/utils/KafkaTestUtils.java
+++ b/spring-kafka-test/src/main/java/org/springframework/kafka/test/utils/KafkaTestUtils.java
@@ -165,7 +165,7 @@ public final class KafkaTestUtils {
 			});
 			reset.forEach((tp, off) -> consumer.seek(tp, off));
 			try {
-				Thread.sleep(50);
+				Thread.sleep(50); // NOSONAR magic#
 			}
 			catch (InterruptedException e) {
 				Thread.currentThread().interrupt();