Optimize imports based on new checkstyle rules

samples/sample-05/src/test/java/com/example/Sample05Application1Tests.java

@@ -16,8 +16,6 @@
 
 package com.example;
 
-import static org.awaitility.Awaitility.await;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -28,6 +26,8 @@
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.test.annotation.DirtiesContext;
 
+import static org.awaitility.Awaitility.await;
+
 /**
  * This test is going to fail from IDE since there is no exposed {@code spring.embedded.kafka.brokers} system property.
  * Use Maven to run tests which enables global embedded Kafka broker via properties provided to Surefire plugin.

samples/sample-05/src/test/java/com/example/Sample05Application2Tests.java

@@ -16,8 +16,6 @@
 
 package com.example;
 
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.kafka.common.errors.TimeoutException;
@@ -29,6 +27,8 @@
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.test.annotation.DirtiesContext;
 
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
 /**
  * This test is going to fail from IDE since there is no exposed {@code spring.embedded.kafka.brokers} system property.
  * This test demonstrates that global embedded Kafka broker config for {@code auto.create.topics.enable=false}

spring-kafka/src/main/java/org/springframework/kafka/core/KafkaTemplate.java

@@ -33,6 +33,8 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
 import org.apache.commons.logging.LogFactory;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.consumer.Consumer;
@@ -82,9 +84,6 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import io.micrometer.observation.Observation;
-import io.micrometer.observation.ObservationRegistry;
-
 /**
  * A template for executing high-level operations. When used with a
  * {@link DefaultKafkaProducerFactory}, the template is thread-safe. The producer factory

spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerConsumerListener.java

@@ -22,12 +22,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.kafka.clients.consumer.Consumer;
-
 import io.micrometer.core.instrument.ImmutableTag;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
+import org.apache.kafka.clients.consumer.Consumer;
 
 /**
  * A consumer factory listener that manages {@link KafkaClientMetrics}.

spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerProducerListener.java

@@ -22,12 +22,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.kafka.clients.producer.Producer;
-
 import io.micrometer.core.instrument.ImmutableTag;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
+import org.apache.kafka.clients.producer.Producer;
 
 /**
  * A producer factory listener that manages {@link KafkaClientMetrics}.

spring-kafka/src/main/java/org/springframework/kafka/core/reactive/ReactiveKafkaConsumerTemplate.java

@@ -30,9 +30,6 @@
 import org.apache.kafka.common.MetricName;
 import org.apache.kafka.common.PartitionInfo;
 import org.apache.kafka.common.TopicPartition;
-
-import org.springframework.util.Assert;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.kafka.receiver.KafkaReceiver;
@@ -42,6 +39,8 @@
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
+import org.springframework.util.Assert;
+
 /**
  * Reactive kafka consumer operations implementation.
  *

spring-kafka/src/main/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplate.java

@@ -26,14 +26,6 @@
 import org.apache.kafka.common.MetricName;
 import org.apache.kafka.common.PartitionInfo;
 import org.reactivestreams.Publisher;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.kafka.support.KafkaHeaders;
-import org.springframework.kafka.support.converter.MessagingMessageConverter;
-import org.springframework.kafka.support.converter.RecordMessageConverter;
-import org.springframework.messaging.Message;
-import org.springframework.util.Assert;
-
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.kafka.sender.KafkaSender;
@@ -44,6 +36,13 @@
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.kafka.support.converter.MessagingMessageConverter;
+import org.springframework.kafka.support.converter.RecordMessageConverter;
+import org.springframework.messaging.Message;
+import org.springframework.util.Assert;
+
 /**
  * Reactive kafka producer operations implementation.
  *

spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java

@@ -47,6 +47,8 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.consumer.CommitFailedException;
 import org.apache.kafka.clients.consumer.Consumer;
@@ -132,9 +134,6 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import io.micrometer.observation.Observation;
-import io.micrometer.observation.ObservationRegistry;
-
 
 /**
  * Single-threaded Message listener container using the Java {@link Consumer} supporting

spring-kafka/src/main/java/org/springframework/kafka/streams/KafkaStreamsMicrometerListener.java

@@ -22,14 +22,13 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.kafka.streams.KafkaStreams;
-
-import org.springframework.kafka.config.StreamsBuilderFactoryBean;
-
 import io.micrometer.core.instrument.ImmutableTag;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics;
+import org.apache.kafka.streams.KafkaStreams;
+
+import org.springframework.kafka.config.StreamsBuilderFactoryBean;
 
 /**
  * Creates a {@link KafkaStreamsMetrics} for the {@link KafkaStreams}.

spring-kafka/src/main/java/org/springframework/kafka/support/DefaultKafkaHeaderMapper.java

@@ -27,15 +27,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.kafka.common.header.Header;
-import org.apache.kafka.common.header.Headers;
-import org.apache.kafka.common.header.internals.RecordHeader;
-
-import org.springframework.messaging.MessageHeaders;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.MimeType;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationContext;
@@ -45,6 +36,14 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.fasterxml.jackson.databind.type.TypeFactory;
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.common.header.internals.RecordHeader;
+
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.MimeType;
 
 /**
  * Default header mapper for Apache Kafka.

spring-kafka/src/main/java/org/springframework/kafka/support/JacksonMimeTypeModule.java

@@ -18,13 +18,13 @@
 
 import java.io.IOException;
 
-import org.springframework.util.MimeType;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
+import org.springframework.util.MimeType;
+
 /**
  * A {@link SimpleModule} extension for {@link MimeType} serialization.
  *

spring-kafka/src/main/java/org/springframework/kafka/support/JacksonUtils.java

@@ -16,13 +16,13 @@
 
 package org.springframework.kafka.support;
 
-import org.springframework.util.ClassUtils;
-
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 
+import org.springframework.util.ClassUtils;
+
 /**
  * The utilities for Jackson {@link ObjectMapper} instances.
  *

spring-kafka/src/main/java/org/springframework/kafka/support/converter/ByteArrayJsonMessageConverter.java

@@ -16,12 +16,12 @@
 
 package org.springframework.kafka.support.converter;
 
-import org.springframework.kafka.support.KafkaNull;
-import org.springframework.messaging.Message;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.springframework.kafka.support.KafkaNull;
+import org.springframework.messaging.Message;
+
 /**
  * JSON Message converter - {@code byte[]} on output, String, Bytes, or byte[] on input.
  * Used in conjunction with Kafka

spring-kafka/src/main/java/org/springframework/kafka/support/converter/BytesJsonMessageConverter.java

@@ -16,14 +16,13 @@
 
 package org.springframework.kafka.support.converter;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.kafka.common.utils.Bytes;
 
 import org.springframework.kafka.support.KafkaNull;
 import org.springframework.messaging.Message;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * JSON Message converter - {@code Bytes} on output, String, Bytes, or byte[] on input.
  * Used in conjunction with Kafka

spring-kafka/src/main/java/org/springframework/kafka/support/converter/JsonMessageConverter.java

@@ -19,6 +19,9 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.common.header.Headers;
 import org.apache.kafka.common.header.internals.RecordHeaders;
@@ -32,10 +35,6 @@
 import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
 /**
  * Base class for JSON message converters; on the consumer side, it can
  * handle {@code byte[]}, {@link Bytes} and {@link String} record values.

spring-kafka/src/main/java/org/springframework/kafka/support/converter/MappingJacksonParameterizedConverter.java

@@ -19,6 +19,8 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.apache.kafka.common.header.Headers;
 import org.apache.kafka.common.utils.Bytes;
 
@@ -32,9 +34,6 @@
 import org.springframework.util.Assert;
 import org.springframework.util.MimeType;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
 /**
  * Subclass of {@link MappingJackson2MessageConverter} that can handle parameterized
  * (generic) types.

spring-kafka/src/main/java/org/springframework/kafka/support/converter/ProjectingMessageConverter.java

@@ -21,6 +21,8 @@
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.common.utils.Bytes;
 
@@ -34,9 +36,6 @@
 import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
-
 /**
  * A {@link MessageConverter} implementation that uses a Spring Data
  * {@link ProjectionFactory} to bind incoming messages to projection interfaces.

spring-kafka/src/main/java/org/springframework/kafka/support/converter/StringJsonMessageConverter.java

@@ -16,12 +16,12 @@
 
 package org.springframework.kafka.support.converter;
 
-import org.springframework.kafka.support.KafkaNull;
-import org.springframework.messaging.Message;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.springframework.kafka.support.KafkaNull;
+import org.springframework.messaging.Message;
+
 /**
  * JSON Message converter - String on output, String, Bytes, or byte[] on input. Used in
  * conjunction with Kafka

spring-kafka/src/main/java/org/springframework/kafka/support/mapping/DefaultJackson2JavaTypeMapper.java

@@ -20,16 +20,15 @@
 import java.util.List;
 import java.util.Set;
 
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.apache.kafka.common.header.Headers;
 
 import org.springframework.messaging.converter.MessageConversionException;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.PatternMatchUtils;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
 /**
  * Jackson 2 type mapper.
  *

spring-kafka/src/main/java/org/springframework/kafka/support/mapping/Jackson2JavaTypeMapper.java

@@ -16,9 +16,8 @@
 
 package org.springframework.kafka.support.mapping;
 
-import org.apache.kafka.common.header.Headers;
-
 import com.fasterxml.jackson.databind.JavaType;
+import org.apache.kafka.common.header.Headers;
 
 /**
  * Strategy for setting metadata on messages such that one can create the class that needs

spring-kafka/src/main/java/org/springframework/kafka/support/micrometer/KafkaRecordReceiverContext.java

@@ -19,11 +19,10 @@
 import java.nio.charset.StandardCharsets;
 import java.util.function.Supplier;
 
+import io.micrometer.observation.transport.ReceiverContext;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.common.header.Header;
 
-import io.micrometer.observation.transport.ReceiverContext;
-
 /**
  * {@link ReceiverContext} for {@link ConsumerRecord}s.
  *

spring-kafka/src/main/java/org/springframework/kafka/support/micrometer/KafkaRecordSenderContext.java

@@ -19,9 +19,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.function.Supplier;
 
-import org.apache.kafka.clients.producer.ProducerRecord;
-
 import io.micrometer.observation.transport.SenderContext;
+import org.apache.kafka.clients.producer.ProducerRecord;
 
 /**
  * {@link SenderContext} for {@link ProducerRecord}s.