diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/converter/ByteArrayJsonMessageConverter.java b/spring-kafka/src/main/java/org/springframework/kafka/support/converter/ByteArrayJsonMessageConverter.java
index b359ae3f95..23ee772d94 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/support/converter/ByteArrayJsonMessageConverter.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/support/converter/ByteArrayJsonMessageConverter.java
@@ -31,6 +31,7 @@
  *
  * @author Gary Russell
  * @author Vladimir Loginov
+ *
  * @since 2.3
  *
  */
@@ -48,7 +49,7 @@ protected Object convertPayload(Message<?> message) {
 		try {
 			return message.getPayload() instanceof KafkaNull
 					? null
-					:  getObjectMapper().writeValueAsBytes(message.getPayload());
+					: getObjectMapper().writeValueAsBytes(message.getPayload());
 		}
 		catch (JsonProcessingException e) {
 			throw new ConversionException("Failed to convert to JSON", message, e);
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/converter/BytesJsonMessageConverter.java b/spring-kafka/src/main/java/org/springframework/kafka/support/converter/BytesJsonMessageConverter.java
index 65e3ca86df..f719f92a12 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/support/converter/BytesJsonMessageConverter.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/support/converter/BytesJsonMessageConverter.java
@@ -33,6 +33,7 @@
  *
  * @author Gary Russell
  * @author Vladimir Loginov
+ *
  * @since 2.1.7
  *
  */
diff --git a/spring-kafka/src/test/java/org/springframework/kafka/annotation/BatchListenerConversionTests.java b/spring-kafka/src/test/java/org/springframework/kafka/annotation/BatchListenerConversionTests.java
index 46a60052a3..8954e032f0 100644
--- a/spring-kafka/src/test/java/org/springframework/kafka/annotation/BatchListenerConversionTests.java
+++ b/spring-kafka/src/test/java/org/springframework/kafka/annotation/BatchListenerConversionTests.java
@@ -129,9 +129,13 @@ public void testBatchOfPojoMessages(@Autowired KafkaAdmin admin) throws Exceptio
 		assertThat(listener.received.size()).isGreaterThan(0);
 		assertThat(listener.received.get(0).getPayload()).isInstanceOf(Foo.class);
 		assertThat(listener.received.get(0).getPayload().getBar()).isEqualTo("bar");
-		assertThatNoException().isThrownBy(() -> this.template.send(
-				new GenericMessage<>(KafkaNull.INSTANCE, Collections.singletonMap(KafkaHeaders.TOPIC, topic))));
 		verify(admin, never()).clusterId();
+
+		assertThatNoException()
+				.isThrownBy(() ->
+						this.template.send(
+								new GenericMessage<>(KafkaNull.INSTANCE,
+										Collections.singletonMap(KafkaHeaders.TOPIC, topic))));
 	}
 
 	@Test