Optimize imports

spring-projects · Oct 18, 2024 · 862c190 · 862c190
1 parent 2cd85c0
commit 862c190
Show file tree

Hide file tree

Showing 100 changed files with 644 additions and 662 deletions.
diff --git a/...ng-kafka-docs/src/main/kotlin/org/springframework/kafka/kdocs/requestreply/Application.kt b/...ng-kafka-docs/src/main/kotlin/org/springframework/kafka/kdocs/requestreply/Application.kt
@@ -15,27 +15,25 @@
  */
 package org.springframework.kafka.kdocs.requestreply
 
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.kafka.core.KafkaAdmin.NewTopics
-import org.springframework.kafka.config.TopicBuilder
-import org.springframework.kafka.core.KafkaTemplate
-import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory
-import org.springframework.kafka.requestreply.ReplyingKafkaTemplate
-import org.springframework.kafka.support.converter.ByteArrayJsonMessageConverter
-import org.springframework.boot.ApplicationRunner
-import org.springframework.boot.ApplicationArguments
-import org.springframework.kafka.requestreply.RequestReplyTypedMessageFuture
-import org.springframework.messaging.support.MessageBuilder
-import org.springframework.core.ParameterizedTypeReference
-import org.springframework.kafka.annotation.KafkaListener
-import org.springframework.messaging.handler.annotation.SendTo
-import kotlin.jvm.JvmStatic
 import org.apache.kafka.common.serialization.ByteArrayDeserializer
 import org.apache.kafka.common.serialization.ByteArraySerializer
 import org.slf4j.LoggerFactory
+import org.springframework.boot.ApplicationRunner
 import org.springframework.boot.SpringApplication
+import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.Bean
+import org.springframework.core.ParameterizedTypeReference
+import org.springframework.kafka.annotation.KafkaListener
+import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory
+import org.springframework.kafka.config.TopicBuilder
+import org.springframework.kafka.core.KafkaAdmin.NewTopics
+import org.springframework.kafka.core.KafkaTemplate
 import org.springframework.kafka.core.ProducerFactory
+import org.springframework.kafka.requestreply.ReplyingKafkaTemplate
+import org.springframework.kafka.requestreply.RequestReplyTypedMessageFuture
+import org.springframework.kafka.support.converter.ByteArrayJsonMessageConverter
+import org.springframework.messaging.handler.annotation.SendTo
+import org.springframework.messaging.support.MessageBuilder
 import java.util.concurrent.TimeUnit
 import java.util.function.Consumer
 

diff --git a/...afka-docs/src/main/kotlin/org/springframework/kafka/kdocs/started/consumer/Application.kt b/...afka-docs/src/main/kotlin/org/springframework/kafka/kdocs/started/consumer/Application.kt
@@ -15,12 +15,11 @@
  */
 package org.springframework.kafka.kdocs.started.consumer
 
-import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.apache.kafka.clients.admin.NewTopic
-import org.springframework.kafka.annotation.KafkaListener
-import kotlin.jvm.JvmStatic
+import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 import org.springframework.context.annotation.Bean
+import org.springframework.kafka.annotation.KafkaListener
 import org.springframework.kafka.kdocs.started.producer.Application
 
 /**

diff --git a/spring-kafka-docs/src/main/kotlin/org/springframework/kafka/kdocs/started/noboot/Sender.kt b/spring-kafka-docs/src/main/kotlin/org/springframework/kafka/kdocs/started/noboot/Sender.kt
@@ -15,11 +15,7 @@
  */
 package org.springframework.kafka.kdocs.started.noboot
 
-import org.springframework.boot.runApplication
 import org.springframework.kafka.core.KafkaTemplate
-import kotlin.jvm.JvmStatic
-import org.springframework.context.annotation.AnnotationConfigApplicationContext
-import org.springframework.kafka.kdocs.started.producer.Application
 
 /**
  * Code snippet for quick start.

diff --git a/spring-kafka-test/src/main/java/org/springframework/kafka/test/EmbeddedKafkaBroker.java b/spring-kafka-test/src/main/java/org/springframework/kafka/test/EmbeddedKafkaBroker.java
@@ -19,14 +19,13 @@
 import java.util.Map;
 import java.util.Set;
 
+import kafka.server.KafkaConfig;
 import org.apache.kafka.clients.admin.NewTopic;
 import org.apache.kafka.clients.consumer.Consumer;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 
-import kafka.server.KafkaConfig;
-
 /**
  * @author Gary Russell
  * @since 3.1

diff --git a/spring-kafka-test/src/main/java/org/springframework/kafka/test/EmbeddedKafkaKraftBroker.java b/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.

diff --git a/spring-kafka-test/src/main/java/org/springframework/kafka/test/EmbeddedKafkaZKBroker.java b/spring-kafka-test/src/main/java/org/springframework/kafka/test/EmbeddedKafkaZKBroker.java
@@ -42,6 +42,13 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import kafka.cluster.EndPoint;
+import kafka.server.KafkaConfig;
+import kafka.server.KafkaServer;
+import kafka.utils.CoreUtils;
+import kafka.utils.TestUtils;
+import kafka.zk.ZkFourLetterWords;
+import kafka.zookeeper.ZooKeeperClient;
 import org.apache.commons.logging.LogFactory;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
@@ -67,14 +74,6 @@
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.util.Assert;
 
-import kafka.cluster.EndPoint;
-import kafka.server.KafkaConfig;
-import kafka.server.KafkaServer;
-import kafka.utils.CoreUtils;
-import kafka.utils.TestUtils;
-import kafka.zk.ZkFourLetterWords;
-import kafka.zookeeper.ZooKeeperClient;
-
 /**
  * An embedded Kafka Broker(s) and Zookeeper manager.
  * This class is intended to be used in the unit tests.

diff --git a/spring-kafka-test/src/main/java/org/springframework/kafka/test/core/BrokerAddress.java b/spring-kafka-test/src/main/java/org/springframework/kafka/test/core/BrokerAddress.java
@@ -16,10 +16,10 @@
 
 package org.springframework.kafka.test.core;
 
-import org.springframework.util.Assert;
-
 import kafka.cluster.BrokerEndPoint;
 
+import org.springframework.util.Assert;
+
 /**
  * Encapsulates the address of a Kafka broker.
  *

diff --git a/...afka-test/src/test/java/org/springframework/kafka/test/EmbeddedKafkaKraftBrokerTests.java b/...afka-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

diff --git a/...g-kafka-test/src/test/java/org/springframework/kafka/test/EmbeddedKafkaZKBrokerTests.java b/...g-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

diff --git a/...kafka-test/src/test/java/org/springframework/kafka/test/assertj/KafkaConditionsTests.java b/...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

diff --git a/...t/src/test/java/org/springframework/kafka/test/condition/EmbeddedKafkaConditionTests.java b/...t/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

diff --git a/...t/src/test/java/org/springframework/kafka/test/condition/WithNestedClassContextTests.java b/...t/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;
 
@@ -30,6 +28,8 @@
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 @EmbeddedKafka
 @SpringJUnitConfig(WithNestedClassContextTests.Config.class)
 class WithNestedClassContextTests {

diff --git a/...st/src/test/java/org/springframework/kafka/test/condition/WithSpringTestContextTests.java b/...st/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

diff --git a/...test/java/org/springframework/kafka/test/context/EmbeddedKafkaContextCustomizerTests.java b/...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

diff --git a/...-kafka-test/src/test/java/org/springframework/kafka/test/hamcrest/KafkaMatchersTests.java b/...-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
  *

diff --git a/...a/org/springframework/kafka/test/junit/GlobalEmbeddedKafkaTestExecutionListenerTests.java b/...a/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
  *

diff --git a/...est/src/test/java/org/springframework/kafka/test/rule/AddressableEmbeddedBrokerTests.java b/...est/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

diff --git a/...ng-kafka-test/src/test/java/org/springframework/kafka/test/utils/KafkaTestUtilsTests.java b/...ng-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

diff --git a/spring-kafka/src/test/java/org/springframework/kafka/annotation/AliasPropertiesTests.java b/spring-kafka/src/test/java/org/springframework/kafka/annotation/AliasPropertiesTests.java
@@ -16,8 +16,6 @@
 
 package org.springframework.kafka.annotation;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -54,6 +52,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 Artem Bilan

diff --git a/...fka/src/test/java/org/springframework/kafka/annotation/BatchListenerConversion2Tests.java b/...fka/src/test/java/org/springframework/kafka/annotation/BatchListenerConversion2Tests.java
@@ -16,8 +16,6 @@
 
 package org.springframework.kafka.annotation;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -48,6 +46,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 Victor Perez Rey