Polishing.

Reorganize imports.

See #2854

Author: mp911de

src/test/java/org/springframework/data/annotation/TypeAliasUnitTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.util.AnnotatedTypeScanner;
 
 /**

src/test/java/org/springframework/data/aot/CodeContributionAssert.java

@@ -21,7 +21,6 @@
 import java.util.stream.Stream;
 
 import org.assertj.core.api.AbstractAssert;
-
 import org.springframework.aot.generate.GenerationContext;
 import org.springframework.aot.hint.JdkProxyHint;
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;

src/test/java/org/springframework/data/aot/DeferredTypeBuilder.java

@@ -17,7 +17,6 @@
 
 import java.util.function.Consumer;
 
-import org.springframework.javapoet.TypeSpec;
 import org.springframework.javapoet.TypeSpec.Builder;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

src/test/java/org/springframework/data/aot/sample/ConfigWithQuerydslPredicateExecutor.java

@@ -15,10 +15,6 @@
  */
 package org.springframework.data.aot.sample;
 
-import javax.annotation.processing.Generated;
-
-import com.querydsl.core.types.dsl.BeanPath;
-import com.querydsl.core.types.dsl.EntityPathBase;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.data.aot.sample.ConfigWithQuerydslPredicateExecutor.MyRepo;

src/test/java/org/springframework/data/aot/types/Address.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.aot.types;
 
-import org.springframework.data.annotation.PersistenceConstructor;
 import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.geo.Point;
 

src/test/java/org/springframework/data/auditing/AnnotationAuditingMetadataUnitTests.java

@@ -20,7 +20,6 @@
 import java.lang.reflect.Field;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.util.ReflectionUtils;
 

src/test/java/org/springframework/data/auditing/DefaultAuditableBeanWrapperFactoryUnitTests.java

@@ -23,7 +23,6 @@
 import java.time.temporal.ChronoField;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.auditing.DefaultAuditableBeanWrapperFactory.AuditableInterfaceBeanWrapper;

src/test/java/org/springframework/data/auditing/IsNewAwareAuditingHandlerUnitTests.java

@@ -26,7 +26,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.context.PersistentEntities;
 import org.springframework.data.mapping.context.SampleMappingContext;

src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java

@@ -25,7 +25,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.core.type.AnnotationMetadata;

src/test/java/org/springframework/data/config/TypeFilterParserUnitTests.java

@@ -27,7 +27,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import org.springframework.beans.factory.parsing.ReaderContext;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.core.io.ClassPathResource;
@@ -36,7 +35,6 @@
 import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.data.config.TypeFilterParser.Type;
 import org.springframework.util.xml.DomUtils;
-
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 

src/test/java/org/springframework/data/convert/ConverterBuilderUnitTests.java

@@ -19,7 +19,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.mockito.internal.util.Supplier;
-
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.GenericConverter;
 import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;

src/test/java/org/springframework/data/convert/DefaultTypeMapperUnitTests.java

@@ -30,10 +30,8 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.data.mapping.Alias;
-import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 
 /**

src/test/java/org/springframework/data/convert/Jsr310ConvertersUnitTests.java

@@ -37,7 +37,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
 

src/test/java/org/springframework/data/convert/SimpleTypeInformationMapperUnitTests.java

@@ -18,10 +18,8 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.classloadersupport.HidingClassLoader;
 import org.springframework.data.mapping.Alias;
-import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 
 /**

src/test/java/org/springframework/data/domain/RangeUnitTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.domain.Range.Bound;
 
 /**

src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java

@@ -37,7 +37,6 @@
 import org.custommonkey.xmlunit.Diff;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.data.domain.Page;

src/test/java/org/springframework/data/geo/DistanceUnitTests.java

@@ -20,7 +20,6 @@
 
 import org.assertj.core.data.Offset;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.domain.Range.Bound;
 import org.springframework.util.SerializationUtils;
 

src/test/java/org/springframework/data/geo/format/DistanceFormatterUnitTests.java

@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Metrics;
 

src/test/java/org/springframework/data/geo/format/PointFormatterUnitTests.java

@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-
 import org.springframework.data.geo.Point;
 
 /**

src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java

@@ -24,7 +24,6 @@
 import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 
 /**

src/test/java/org/springframework/data/mapping/callback/DefaultReactiveEntityCallbacksUnitTests.java

@@ -17,12 +17,12 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;

src/test/java/org/springframework/data/mapping/context/MappingContextEventUnitTests.java

@@ -21,7 +21,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
 

src/test/java/org/springframework/data/mapping/model/CamelCaseAbbreviatingFieldNamingStrategyUnitTests.java

@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import org.springframework.data.mapping.PersistentProperty;
 
 /**

src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java

@@ -25,7 +25,6 @@
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-
 import org.springframework.data.annotation.AccessType;
 import org.springframework.data.annotation.AccessType.Type;
 import org.springframework.data.mapping.PersistentProperty;

src/test/java/org/springframework/data/mapping/model/EntityInstantiatorsUnitTests.java

@@ -25,7 +25,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import org.springframework.data.mapping.PersistentEntity;
 
 /**

src/test/java/org/springframework/data/mapping/model/KotlinCopyMethodUnitTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.mapping.context.SampleMappingContext;
 
 /**

src/test/java/org/springframework/data/mapping/model/ParameterizedKotlinInstantiatorUnitTests.java

@@ -26,7 +26,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-
 import org.springframework.data.mapping.Parameter;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.SampleMappingContext;

src/test/java/org/springframework/data/mapping/model/SnakeCaseFieldNamingStrategyUnitTests.java

@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import org.springframework.data.mapping.PersistentProperty;
 
 /**

src/test/java/org/springframework/data/mapping/model/SpelExpressionParameterProviderUnitTests.java

@@ -25,7 +25,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.mapping.Parameter;
 import org.springframework.data.mapping.model.AbstractPersistentPropertyUnitTests.SamplePersistentProperty;

src/test/java/org/springframework/data/projection/ProjectingMethodInterceptorUnitTests.java

@@ -33,7 +33,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 

src/test/java/org/springframework/data/projection/PropertyAccessingMethodInterceptorUnitTests.java

@@ -24,7 +24,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import org.springframework.beans.NotReadablePropertyException;
 import org.springframework.beans.NotWritablePropertyException;
 

src/test/java/org/springframework/data/projection/SpelAwareProxyProjectionFactoryUnitTests.java

@@ -21,7 +21,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.beans.NotWritablePropertyException;
 import org.springframework.beans.factory.annotation.Value;
 

src/test/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptorUnitTests.java

@@ -27,7 +27,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.expression.spel.standard.SpelExpressionParser;

src/test/java/org/springframework/data/querydsl/QPageRequestUnitTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.domain.AbstractPageRequest;
 import org.springframework.data.domain.AbstractPageRequestUnitTests;
 

src/test/java/org/springframework/data/querydsl/QSortUnitTests.java

@@ -23,7 +23,6 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;

src/test/java/org/springframework/data/querydsl/binding/PropertyPathInformationUnitTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.querydsl.QUser;
 import org.springframework.data.querydsl.User;
 

src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java

@@ -23,7 +23,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.repository.cdi.isolated.IsolatedComposedRepository;
 
 /**

src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java

@@ -38,7 +38,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;

src/test/java/org/springframework/data/repository/cdi/DummyCdiExtension.java

@@ -30,7 +30,6 @@
 
 import org.apache.webbeans.context.AbstractContext;
 import org.mockito.Mockito;
-
 import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;
 import org.springframework.data.repository.core.support.DummyRepositoryFactory;
 

src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java

@@ -25,7 +25,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.data.repository.Repository;
 
 /**

src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java

@@ -23,7 +23,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Primary;

src/test/java/org/springframework/data/repository/config/CustomRepositoryImplementationDetectorUnitTests.java

@@ -24,7 +24,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
-
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.DefaultResourceLoader;

src/test/java/org/springframework/data/repository/config/DefaultImplementationLookupConfigurationUnitTests.java

@@ -22,7 +22,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.util.ClassUtils;
 

src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportIntegrationTests.java

@@ -20,7 +20,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportUnitTests.java

@@ -25,7 +25,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanNameGenerator;

src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java

@@ -23,7 +23,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;