Optimize imports

spring-kafka-test/src/main/java/org/springframework/kafka/test/EmbeddedKafkaKraftBroker.java

@@ -38,6 +38,9 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import kafka.server.KafkaConfig;
+import kafka.testkit.KafkaClusterTestKit;
+import kafka.testkit.TestKitNodes;
 import org.apache.commons.logging.LogFactory;
 import org.apache.kafka.clients.CommonClientConfigs;
 import org.apache.kafka.clients.admin.AdminClient;
@@ -54,10 +57,6 @@
 import org.springframework.core.log.LogAccessor;
 import org.springframework.util.Assert;
 
-import kafka.server.KafkaConfig;
-import kafka.testkit.KafkaClusterTestKit;
-import kafka.testkit.TestKitNodes;
-
 /**
  * An embedded Kafka Broker(s) using KRaft.
  * This class is intended to be used in the unit tests.

spring-kafka-test/src/test/java/org/springframework/kafka/test/EmbeddedKafkaKraftBrokerTests.java

@@ -16,12 +16,12 @@
 
 package org.springframework.kafka.test;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
 import org.springframework.util.StringUtils;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Gary Russell
  * @since 3.1

spring-kafka-test/src/test/java/org/springframework/kafka/test/EmbeddedKafkaZKBrokerTests.java

@@ -16,10 +16,10 @@
 
 package org.springframework.kafka.test;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Gary Russell
  * @since 2.3

spring-kafka-test/src/test/java/org/springframework/kafka/test/assertj/KafkaConditionsTests.java

@@ -16,14 +16,14 @@
 
 package org.springframework.kafka.test.assertj;
 
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.junit.jupiter.api.Test;
+
 import static org.assertj.core.api.Assertions.allOf;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.kafka.test.assertj.KafkaConditions.keyValue;
 import static org.springframework.kafka.test.assertj.KafkaConditions.partition;
 
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.junit.jupiter.api.Test;
-
 /**
  * @author Gary Russell
  * @since 2.2.12

spring-kafka-test/src/test/java/org/springframework/kafka/test/condition/EmbeddedKafkaConditionTests.java

@@ -16,15 +16,15 @@
 
 package org.springframework.kafka.test.condition;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
 import org.springframework.kafka.test.EmbeddedKafkaBroker;
 import org.springframework.kafka.test.EmbeddedKafkaZKBroker;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Gary Russell
  * @author Michał Padula

spring-kafka-test/src/test/java/org/springframework/kafka/test/condition/WithNestedClassContextTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.kafka.test.condition;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -31,6 +29,8 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Lee Jaeheon
  * @author Soby Chacko

spring-kafka-test/src/test/java/org/springframework/kafka/test/condition/WithSpringTestContextTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.kafka.test.condition;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +25,8 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Gary Russell
  * @since 2.7.2

spring-kafka-test/src/test/java/org/springframework/kafka/test/context/EmbeddedKafkaContextCustomizerTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.kafka.test.context;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -27,6 +25,8 @@
 import org.springframework.kafka.test.EmbeddedKafkaBroker;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Oleg Artyomov
  * @author Sergio Lourenco

spring-kafka-test/src/test/java/org/springframework/kafka/test/hamcrest/KafkaMatchersTests.java

@@ -16,20 +16,20 @@
 
 package org.springframework.kafka.test.hamcrest;
 
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasKey;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasPartition;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasTimestamp;
-import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasValue;
-
 import java.util.Optional;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.common.header.internals.RecordHeaders;
 import org.apache.kafka.common.record.TimestampType;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasKey;
+import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasPartition;
+import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasTimestamp;
+import static org.springframework.kafka.test.hamcrest.KafkaMatchers.hasValue;
+
 /**
  * @author Biju Kunjummen
  *

spring-kafka-test/src/test/java/org/springframework/kafka/test/junit/GlobalEmbeddedKafkaTestExecutionListenerTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.kafka.test.junit;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -49,6 +47,8 @@
 
 import org.springframework.util.DefaultPropertiesPersister;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Artem Bilan
  *

spring-kafka-test/src/test/java/org/springframework/kafka/test/rule/AddressableEmbeddedBrokerTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.kafka.test.rule;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.Map;
@@ -39,6 +37,8 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Gary Russell
  * @author Kamill Sokol

spring-kafka-test/src/test/java/org/springframework/kafka/test/utils/KafkaTestUtilsTests.java

@@ -16,9 +16,6 @@
 
 package org.springframework.kafka.test.utils;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +35,9 @@
 import org.springframework.kafka.test.EmbeddedKafkaBroker;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
 /**
  * @author Gary Russell
  * @author Artem Bilan