Update Import Order

Closes gh-749

buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy

@@ -14,19 +14,19 @@
  * the License.
  */
 
-package io.spring.gradle.convention;
+package io.spring.gradle.convention
 
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.plugins.GroovyPlugin;
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.plugins.GroovyPlugin
 import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.plugins.PluginManager;
-import org.gradle.plugins.ide.eclipse.EclipseWtpPlugin;
-import org.gradle.plugins.ide.idea.IdeaPlugin;
+import org.gradle.api.plugins.PluginManager
+import org.gradle.plugins.ide.eclipse.EclipseWtpPlugin
+import org.gradle.plugins.ide.idea.IdeaPlugin
 import org.springframework.gradle.CopyPropertiesPlugin
 import org.springframework.gradle.propdeps.PropDepsEclipsePlugin
 import org.springframework.gradle.propdeps.PropDepsIdeaPlugin
-import org.springframework.gradle.propdeps.PropDepsPlugin;
+import org.springframework.gradle.propdeps.PropDepsPlugin
 
 /**
  * @author Rob Winch

buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy

@@ -15,8 +15,6 @@
  */
 package io.spring.gradle.convention
 
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 

buildSrc/src/main/groovy/io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy

@@ -19,7 +19,6 @@ package io.spring.gradle.convention
 import io.spring.gradle.IncludeRepoTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.provider.Property
 import org.gradle.api.tasks.GradleBuild
 import org.gradle.api.tasks.TaskProvider
 

buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy

@@ -14,23 +14,19 @@
  * the License.
  */
 
-package io.spring.gradle.convention;
+package io.spring.gradle.convention
 
-import java.io.File;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.gradle.api.Action;
+import org.gradle.api.Action
 import org.gradle.api.JavaVersion
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.plugins.JavaPluginConvention;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.javadoc.Javadoc;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginConvention
+import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.javadoc.Javadoc
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+import java.util.regex.Pattern
 
 /**
  * @author Rob Winch

buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomPlugin.groovy

@@ -3,7 +3,6 @@ package io.spring.gradle.convention
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPlatformPlugin
-import org.sonarqube.gradle.SonarQubePlugin
 import org.springframework.gradle.CopyPropertiesPlugin
 import org.springframework.gradle.maven.SpringMavenPlugin
 

buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy

@@ -1,7 +1,5 @@
 package io.spring.gradle.convention
 
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 

buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaPlugin.groovy

@@ -1,7 +1,5 @@
 package io.spring.gradle.convention
 
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 

buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy

@@ -1,9 +1,9 @@
 package io.spring.gradle.convention
 
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.bundling.Zip
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.tasks.bundling.Zip
 
 public class SchemaZipPlugin implements Plugin<Project> {
 

buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy

@@ -13,15 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.spring.gradle.convention;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Properties;
-
+package io.spring.gradle.convention
 /**
  * A Properties which sorts they keys so that they can be written to a File with
  * the keys sorted.

buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy

@@ -16,12 +16,11 @@
 
 package io.spring.gradle.convention
 
-import org.gradle.api.JavaVersion;
+import org.gradle.api.JavaVersion
 import org.gradle.api.Project
-import org.gradle.api.plugins.JavaLibraryPlugin;
-import org.gradle.api.plugins.MavenPlugin;
+import org.gradle.api.plugins.JavaLibraryPlugin
 import org.gradle.api.plugins.PluginManager
-import org.springframework.gradle.maven.SpringMavenPlugin;
+import org.springframework.gradle.maven.SpringMavenPlugin
 
 /**
  * @author Rob Winch

buildSrc/src/main/java/lock/GlobalLockTask.java

@@ -1,13 +1,13 @@
 package lock;
 
+import java.util.function.Consumer;
+
 import org.gradle.api.Action;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.tasks.TaskAction;
 
-import java.util.function.Consumer;
-
 /**
  * @author Rob Winch
  */

buildSrc/src/main/java/org/springframework/gradle/antora/CheckAntoraVersionTask.java

@@ -1,5 +1,9 @@
 package org.springframework.gradle.antora;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.RegularFileProperty;
@@ -11,10 +15,6 @@ import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.representer.Representer;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
 public abstract class CheckAntoraVersionTask extends DefaultTask {
 
 	@TaskAction

buildSrc/src/main/java/org/springframework/gradle/maven/PublishAllJavaComponentsPlugin.java

@@ -7,8 +7,6 @@ import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaPlatformPlugin;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.publish.PublishingExtension;
-import org.gradle.api.publish.VariantVersionMappingStrategy;
-import org.gradle.api.publish.VersionMappingStrategy;
 import org.gradle.api.publish.maven.MavenPublication;
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
 

buildSrc/src/main/java/org/springframework/gradle/maven/PublishLocalPlugin.java

@@ -1,5 +1,7 @@
 package org.springframework.gradle.maven;
 
+import java.io.File;
+
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
@@ -7,8 +9,6 @@ import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.gradle.api.publish.PublishingExtension;
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
 
-import java.io.File;
-
 public class PublishLocalPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {

buildSrc/src/main/java/org/springframework/gradle/maven/SpringNexusPublishPlugin.java

@@ -1,5 +1,8 @@
 package org.springframework.gradle.maven;
 
+import java.net.URI;
+import java.time.Duration;
+
 import io.github.gradlenexus.publishplugin.NexusPublishExtension;
 import io.github.gradlenexus.publishplugin.NexusPublishPlugin;
 import io.github.gradlenexus.publishplugin.NexusRepository;
@@ -7,9 +10,6 @@ import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 
-import java.net.URI;
-import java.time.Duration;
-
 public class SpringNexusPublishPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {

buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java

@@ -16,17 +16,16 @@
 
 package org.springframework.gradle.maven;
 
+import java.util.concurrent.Callable;
+
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.publish.Publication;
 import org.gradle.api.publish.PublishingExtension;
-import org.gradle.api.publish.plugins.PublishingPlugin;
 import org.gradle.plugins.signing.SigningExtension;
 import org.gradle.plugins.signing.SigningPlugin;
 
-import java.util.concurrent.Callable;
-
 public class SpringSigningPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {

buildSrc/src/main/java/org/springframework/gradle/sagan/SaganApi.java

@@ -16,12 +16,17 @@
 
 package org.springframework.gradle.sagan;
 
-import com.google.gson.Gson;
-import okhttp3.*;
-
 import java.io.IOException;
 import java.util.Base64;
 
+import com.google.gson.Gson;
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
 /**
  * Implements necessary calls to the Sagan API See https://spring.io/restdocs/index.html
  */

buildSrc/src/main/java/org/springframework/gradle/sagan/SaganPlugin.java

@@ -17,7 +17,9 @@
 package org.springframework.gradle.sagan;
 
 import io.spring.gradle.convention.Utils;
-import org.gradle.api.*;
+import org.gradle.api.Action;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
 
 public class SaganPlugin implements Plugin<Project> {
 	@Override

buildSrc/src/main/java/org/springframework/security/convention/versions/GitHubApi.java

@@ -1,5 +1,11 @@
 package org.springframework.security.convention.versions;
 
+import java.io.IOException;
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 import com.apollographql.apollo.ApolloCall;
 import com.apollographql.apollo.ApolloClient;
 import com.apollographql.apollo.api.Input;
@@ -10,16 +16,8 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Mono;
-import reactor.util.retry.Retry;
 import reactor.util.retry.RetrySpec;
 
-import java.io.IOException;
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 public class GitHubApi {
 
 	private final ApolloClient apolloClient;

buildSrc/src/main/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtils.java

@@ -16,11 +16,8 @@
 
 package org.springframework.security.convention.versions;
 
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
@@ -29,8 +26,12 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import java.io.IOException;
-import java.io.InputStream;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
 
 class TransitiveDependencyLookupUtils {
 	static String OIDC_SDK_NAME = "oauth2-oidc-sdk";

buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesExtension.java

@@ -1,16 +1,15 @@
 package org.springframework.security.convention.versions;
 
-import com.github.benmanes.gradle.versions.updates.resolutionstrategy.ComponentSelectionRulesWithCurrent;
-import com.github.benmanes.gradle.versions.updates.resolutionstrategy.ComponentSelectionWithCurrent;
-import com.github.benmanes.gradle.versions.updates.resolutionstrategy.ResolutionStrategyWithCurrent;
-import org.gradle.api.Action;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 
+import com.github.benmanes.gradle.versions.updates.resolutionstrategy.ComponentSelectionRulesWithCurrent;
+import com.github.benmanes.gradle.versions.updates.resolutionstrategy.ComponentSelectionWithCurrent;
+import org.gradle.api.Action;
+
 public class UpdateDependenciesExtension {
 	private Supplier<List<File>> files;
 

buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesPlugin.java

@@ -16,6 +16,24 @@
 
 package org.springframework.security.convention.versions;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.SortedSet;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import com.github.benmanes.gradle.versions.reporter.result.Dependency;
 import com.github.benmanes.gradle.versions.reporter.result.DependencyOutdated;
 import com.github.benmanes.gradle.versions.reporter.result.Result;
@@ -32,18 +50,6 @@ import org.gradle.api.Project;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import reactor.core.publisher.Mono;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.nio.file.Files;
-import java.time.Duration;
-import java.util.*;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import static org.springframework.security.convention.versions.TransitiveDependencyLookupUtils.NIMBUS_JOSE_JWT_NAME;
 import static org.springframework.security.convention.versions.TransitiveDependencyLookupUtils.OIDC_SDK_NAME;
 

buildSrc/src/main/java/trang/RncToXsd.java

@@ -1,5 +1,16 @@
 package trang;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
 import com.thaiopensource.relaxng.translate.Driver;
 import net.sf.saxon.TransformerFactoryImpl;
 import org.gradle.api.DefaultTask;
@@ -8,16 +19,6 @@ import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
 
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-
 /**
  * Converts .rnc files to .xsd files using trang and then applies an xsl file to cleanup the results.
  */

buildSrc/src/test/java/io/spring/gradle/TestKit.java

@@ -15,11 +15,6 @@
  */
 package io.spring.gradle;
 
-import org.apache.commons.io.FileUtils;
-import org.gradle.testkit.runner.GradleRunner;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -27,6 +22,9 @@ import java.net.URL;
 import java.nio.file.Paths;
 import java.util.Enumeration;
 
+import org.apache.commons.io.FileUtils;
+import org.gradle.testkit.runner.GradleRunner;
+
 public class TestKit {
 	final File buildDir;
 

buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java

@@ -16,6 +16,8 @@
 
 package io.spring.gradle.convention;
 
+import java.util.Arrays;
+
 import io.spring.gradle.IncludeRepoTask;
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.Project;
@@ -24,8 +26,6 @@ import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 class IncludeCheckRemotePluginTests {

buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java

@@ -23,8 +23,6 @@ import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.File;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**

buildSrc/src/test/java/io/spring/gradle/convention/IntegrationTestPluginITests.java

@@ -1,5 +1,8 @@
 package io.spring.gradle.convention;
 
+import java.io.File;
+import java.nio.file.Path;
+
 import io.spring.gradle.TestKit;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
@@ -7,9 +10,6 @@ import org.junit.Test;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.File;
-import java.nio.file.Path;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class IntegrationTestPluginITests {

buildSrc/src/test/java/io/spring/gradle/convention/JacocoPluginITests.java

@@ -1,14 +1,14 @@
 package io.spring.gradle.convention;
 
+import java.io.File;
+import java.nio.file.Path;
+
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
 import org.junit.Test;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.File;
-import java.nio.file.Path;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class JacocoPluginITests{

buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITests.java

@@ -1,17 +1,16 @@
 package io.spring.gradle.convention;
 
+import java.io.File;
+import java.nio.file.Path;
+
 import io.spring.gradle.TestKit;
 import org.apache.commons.io.FileUtils;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.File;
-import java.nio.file.Path;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class JavadocApiPluginITests {

buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java

@@ -19,13 +19,14 @@ package io.spring.gradle.convention;
 import java.io.File;
 
 import org.apache.commons.io.FileUtils;
-import static org.assertj.core.api.Assertions.assertThat;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.javadoc.Javadoc;
 import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Rob Winch
  */

buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITests.java

@@ -1,5 +1,9 @@
 package io.spring.gradle.convention;
 
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
 import io.spring.gradle.TestKit;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
@@ -8,10 +12,6 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ShowcaseITests {

buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITests.java

@@ -1,5 +1,10 @@
 package io.spring.gradle.convention;
 
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+
 import io.spring.gradle.TestKit;
 import org.apache.commons.io.IOUtils;
 import org.gradle.testkit.runner.BuildResult;
@@ -8,11 +13,6 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.LinkedHashMap;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class SpringMavenPluginITests {

buildSrc/src/test/java/io/spring/gradle/convention/TestsConfigurationPluginITests.java

@@ -1,5 +1,7 @@
 package io.spring.gradle.convention;
 
+import java.nio.file.Path;
+
 import io.spring.gradle.TestKit;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
@@ -7,8 +9,6 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.nio.file.Path;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestsConfigurationPluginITests {

buildSrc/src/test/java/io/spring/gradle/convention/UtilsTests.java

@@ -1,15 +1,15 @@
 package io.spring.gradle.convention;
 
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
 import org.gradle.api.Project;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
 @ExtendWith(MockitoExtension.class)
 public class UtilsTests {
 	@Mock

buildSrc/src/test/java/io/spring/gradle/convention/sagan/SaganApiTests.java

@@ -16,18 +16,19 @@
 
 package io.spring.gradle.convention.sagan;
 
+import java.nio.charset.Charset;
+import java.util.concurrent.TimeUnit;
+
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
 import org.springframework.gradle.sagan.Release;
 import org.springframework.gradle.sagan.SaganApi;
 
-import java.nio.charset.Charset;
-import java.util.concurrent.TimeUnit;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 

buildSrc/src/test/java/org/springframework/gradle/antora/CheckAntoraVersionPluginTests.java

@@ -1,5 +1,9 @@
 package org.springframework.gradle.antora;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
+
 import org.apache.commons.io.IOUtils;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
@@ -7,10 +11,6 @@ import org.gradle.api.Task;
 import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.jupiter.api.Test;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.nio.charset.StandardCharsets;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIOException;

buildSrc/src/test/java/org/springframework/security/convention/versions/DependencyExcludesTests.java

@@ -16,17 +16,19 @@
 
 package org.springframework.security.convention.versions;
 
+import java.util.Collections;
+
 import com.github.benmanes.gradle.versions.updates.resolutionstrategy.ComponentSelectionWithCurrent;
 import org.gradle.api.Action;
 import org.gradle.api.artifacts.ComponentSelection;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collections;
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 public class DependencyExcludesTests {
 

buildSrc/src/test/resources/samples/integrationtest/withgroovy/src/integration-test/groovy/sample/TheTest.groovy

@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package sample;
+package sample
 
-import org.springframework.core.Ordered;
-import spock.lang.Specification;
+import org.springframework.core.Ordered
+import spock.lang.Specification
 
 class TheTest extends Specification {
 	def "has Ordered"() {

buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTests.java

@@ -1,6 +1,7 @@
 package sample;
 
 import org.junit.Test;
+
 import org.springframework.core.Ordered;
 
 public class TheTests {

buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTests.java

@@ -1,7 +1,7 @@
 package sample;
 
-import org.junit.Test;
 import jakarta.servlet.http.HttpServletRequest;
+import org.junit.Test;
 
 public class TheTests {
 	@Test

buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTests.java

@@ -1,9 +1,10 @@
 package sample;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 public class TheClassTests {
 	TheClass theClass = new TheClass();
 

buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTests.java

@@ -1,6 +1,6 @@
 package sample;
 
-import org.junit.*;
+import org.junit.Test;
 
 public class DependencyTests {
 	@Test

core/src/main/java/org/springframework/LdapDataEntry.java

@@ -1,8 +1,9 @@
 package org.springframework;
 
+import java.util.SortedSet;
+
 import javax.naming.Name;
 import javax.naming.directory.Attributes;
-import java.util.SortedSet;
 
 /**
  * Common data access methods for entries in an LDAP tree.

core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java

@@ -15,9 +15,9 @@
  */
 package org.springframework.ldap.authentication;
 
-import org.springframework.util.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.ldap.core.AuthenticationSource;
+import org.springframework.util.StringUtils;
 
 /**
  * Decorator on AuthenticationSource to have default authentication information be

core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java

@@ -16,6 +16,11 @@
 
 package org.springframework.ldap.config;
 
+import java.util.HashSet;
+import java.util.Set;
+
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -34,10 +39,6 @@ import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
-
-import java.util.HashSet;
-import java.util.Set;
 
 import static org.springframework.ldap.config.ParserUtils.getBoolean;
 import static org.springframework.ldap.config.ParserUtils.getInt;

core/src/main/java/org/springframework/ldap/config/DefaultRenamingStrategyParser.java

@@ -16,13 +16,14 @@
 
 package org.springframework.ldap.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.ldap.transaction.compensating.support.DefaultTempEntryRenamingStrategy;
-import org.w3c.dom.Element;
 
 import static org.springframework.ldap.config.ParserUtils.getString;
 

core/src/main/java/org/springframework/ldap/config/LdapTemplateParser.java

@@ -16,6 +16,8 @@
 
 package org.springframework.ldap.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -25,7 +27,6 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.query.SearchScope;
 import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
 
 import static org.springframework.ldap.config.ParserUtils.getBoolean;
 import static org.springframework.ldap.config.ParserUtils.getInt;

core/src/main/java/org/springframework/ldap/config/ParserUtils.java

@@ -16,9 +16,10 @@
 
 package org.springframework.ldap.config;
 
-import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
+import org.springframework.util.StringUtils;
+
 /**
  * @author Mattias Hellborg Arthursson
  */

core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java

@@ -16,6 +16,8 @@
 
 package org.springframework.ldap.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -30,7 +32,6 @@ import org.springframework.ldap.transaction.compensating.support.DifferentSubtre
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
-import org.w3c.dom.Element;
 
 import static org.springframework.ldap.config.ParserUtils.getString;
 

core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java

@@ -16,17 +16,18 @@
 
 package org.springframework.ldap.control;
 
-import org.springframework.ldap.UncategorizedLdapException;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.Control;
 import javax.naming.ldap.LdapContext;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
+
+import org.springframework.ldap.UncategorizedLdapException;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * Convenient base class useful when implementing a standard DirContextProcessor which has

core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java

@@ -16,15 +16,16 @@
 
 package org.springframework.ldap.control;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ldap.core.DirContextProcessor;
-
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.Control;
 import javax.naming.ldap.LdapContext;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.ldap.core.DirContextProcessor;
+
 /**
  * Abstract superclass with responsibility to apply a single RequestControl on an
  * LdapContext, preserving any existing controls. Subclasses should implement

core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java

@@ -15,9 +15,10 @@
  */
 package org.springframework.ldap.control;
 
-import javax.naming.ldap.PagedResultsControl;
 import java.util.Arrays;
 
+import javax.naming.ldap.PagedResultsControl;
+
 /**
  * Wrapper class for the cookie returned when using the {@link PagedResultsControl}.
  *

core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java

@@ -16,16 +16,17 @@
 
 package org.springframework.ldap.control;
 
-import org.springframework.ldap.UncategorizedLdapException;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.Control;
 import javax.naming.ldap.LdapContext;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
+
+import org.springframework.ldap.UncategorizedLdapException;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * DirContextProcessor implementation for managing the paged results control. Note that

core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java

@@ -16,12 +16,12 @@
 
 package org.springframework.ldap.core;
 
-import org.springframework.ldap.support.LdapUtils;
-
 import javax.naming.NameClassPair;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.SearchResult;
 
+import org.springframework.ldap.support.LdapUtils;
+
 /**
  * A CollectingNameClassPairCallbackHandler to wrap an {@link AttributesMapper}. That is,
  * the found object is extracted from the {@link Attributes} of each {@link SearchResult},

core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java

@@ -15,11 +15,12 @@
  */
 package org.springframework.ldap.core;
 
-import javax.naming.NameClassPair;
-import javax.naming.NamingException;
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.naming.NameClassPair;
+import javax.naming.NamingException;
+
 /**
  * A NameClassPairCallbackHandler to collect all results in an internal List.
  *

core/src/main/java/org/springframework/ldap/core/ContextMapper.java

@@ -16,14 +16,14 @@
 
 package org.springframework.ldap.core;
 
-import org.springframework.ldap.core.support.AbstractContextMapper;
-import org.springframework.ldap.core.support.DefaultDirObjectFactory;
-
 import javax.naming.Binding;
 import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.SearchResult;
 
+import org.springframework.ldap.core.support.AbstractContextMapper;
+import org.springframework.ldap.core.support.DefaultDirObjectFactory;
+
 /**
  * An interface used by LdapTemplate to map LDAP Contexts to beans. When a
  * DirObjectFactory is set on the ContextSource, the objects returned from

core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java

@@ -15,12 +15,12 @@
  */
 package org.springframework.ldap.core;
 
-import org.springframework.util.Assert;
-
 import javax.naming.Binding;
 import javax.naming.NameClassPair;
 import javax.naming.NamingException;
 
+import org.springframework.util.Assert;
+
 /**
  * A CollectingNameClassPairCallbackHandler to wrap a ContextMapper. That is, the found
  * object is extracted from each {@link Binding}, and then passed to the specified

core/src/main/java/org/springframework/ldap/core/ContextSource.java

@@ -16,10 +16,10 @@
 
 package org.springframework.ldap.core;
 
-import org.springframework.ldap.NamingException;
-
 import javax.naming.directory.DirContext;
 
+import org.springframework.ldap.NamingException;
+
 /**
  * A <code>ContextSource</code> is responsible for configuring and creating
  * <code>DirContext</code> instances. It is typically used from {@link LdapTemplate} to

core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java

@@ -15,12 +15,12 @@
  */
 package org.springframework.ldap.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ldap.NoSuchAttributeException;
-import org.springframework.ldap.support.LdapUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.naming.Binding;
 import javax.naming.Context;
@@ -38,12 +38,14 @@ import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapName;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.ldap.NoSuchAttributeException;
+import org.springframework.ldap.support.LdapUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Adapter that implements the interesting methods of the DirContext interface. In

core/src/main/java/org/springframework/ldap/core/DirContextOperations.java

@@ -16,11 +16,11 @@
 
 package org.springframework.ldap.core;
 
-import org.springframework.LdapDataEntry;
-
 import javax.naming.Name;
 import javax.naming.directory.DirContext;
 
+import org.springframework.LdapDataEntry;
+
 /**
  * Interface for DirContextAdapter.
  *

core/src/main/java/org/springframework/ldap/core/DistinguishedName.java

@@ -15,20 +15,6 @@
  */
 package org.springframework.ldap.core;
 
-import org.springframework.ldap.UncategorizedLdapException;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ldap.BadLdapGrammarException;
-import org.springframework.ldap.support.LdapUtils;
-import org.springframework.ldap.support.ListComparator;
-import org.springframework.util.Assert;
-
-import javax.naming.CompositeName;
-import javax.naming.InvalidNameException;
-import javax.naming.Name;
-import javax.naming.ldap.Rdn;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -37,6 +23,22 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
+import javax.naming.CompositeName;
+import javax.naming.InvalidNameException;
+import javax.naming.Name;
+import javax.naming.ldap.Rdn;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.ldap.BadLdapGrammarException;
+import org.springframework.ldap.UncategorizedLdapException;
+import org.springframework.ldap.support.LdapUtils;
+import org.springframework.ldap.support.ListComparator;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
 /**
  * Default implementation of a {@link Name} corresponding to an LDAP path. A Distinguished
  * Name manipulation implementation is included in JDK1.5 (LdapName), but not in prior

core/src/main/java/org/springframework/ldap/core/IncrementalAttributesMapper.java

@@ -16,9 +16,10 @@
 
 package org.springframework.ldap.core;
 
+import java.util.List;
+
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
-import java.util.List;
 
 /**
  * Utility that helps with reading all attribute values from Active Directory using

core/src/main/java/org/springframework/ldap/core/IterableNamingEnumeration.java

@@ -1,8 +1,9 @@
 package org.springframework.ldap.core;
 
+import java.util.Iterator;
+
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import java.util.Iterator;
 
 /**
  * @author Mattias Hellborg Arthursson

core/src/main/java/org/springframework/ldap/core/LdapAttribute.java

@@ -15,11 +15,12 @@
  */
 package org.springframework.ldap.core;
 
-import javax.naming.directory.BasicAttribute;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.naming.directory.BasicAttribute;
+
 /**
  * Extends {@link javax.naming.directory.BasicAttribute} to add support for options as
  * defined in RFC2849.

core/src/main/java/org/springframework/ldap/core/LdapAttributes.java

@@ -15,11 +15,7 @@
  */
 package org.springframework.ldap.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.ldap.support.LdapEncoder;
-import org.springframework.ldap.support.LdapUtils;
+import java.net.URI;
 
 import javax.naming.Name;
 import javax.naming.NamingEnumeration;
@@ -27,7 +23,12 @@ import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.BasicAttributes;
 import javax.naming.ldap.LdapName;
-import java.net.URI;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.ldap.support.LdapEncoder;
+import org.springframework.ldap.support.LdapUtils;
 
 /**
  * Extends {@link javax.naming.directory.BasicAttributes} to add specialized support for

core/src/main/java/org/springframework/ldap/core/LdapEntryIdentification.java

@@ -15,12 +15,12 @@
  */
 package org.springframework.ldap.core;
 
-import org.springframework.ldap.support.LdapUtils;
-import org.springframework.util.Assert;
-
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.LdapName;
 
+import org.springframework.ldap.support.LdapUtils;
+import org.springframework.util.Assert;
+
 /**
  * Wrapper class to handle the full identification of an LDAP entry. An LDAP entry is
  * identified by its Distinguished Name, in Spring LDAP represented by the

core/src/main/java/org/springframework/ldap/core/LdapOperations.java

@@ -16,6 +16,16 @@
 
 package org.springframework.ldap.core;
 
+import java.util.List;
+import java.util.stream.Stream;
+
+import javax.naming.Binding;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.ldap.ContextNotEmptyException;
 import org.springframework.ldap.NamingException;
@@ -25,15 +35,6 @@ import org.springframework.ldap.odm.core.ObjectDirectoryMapper;
 import org.springframework.ldap.query.LdapQuery;
 import org.springframework.ldap.support.LdapUtils;
 
-import javax.naming.Binding;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.ModificationItem;
-import javax.naming.directory.SearchControls;
-import java.util.List;
-import java.util.stream.Stream;
-
 /**
  * Interface that specifies a basic set of LDAP operations. Implemented by LdapTemplate,
  * but it might be a useful option to use this interface in order to enhance testability.

core/src/main/java/org/springframework/ldap/core/LdapRdn.java

@@ -16,9 +16,6 @@
 
 package org.springframework.ldap.core;
 
-import org.springframework.ldap.BadLdapGrammarException;
-import org.springframework.util.ObjectUtils;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,6 +26,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.springframework.ldap.BadLdapGrammarException;
+import org.springframework.util.ObjectUtils;
+
 /**
  * Datatype for a LDAP name, a part of a path.
  *

core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java

@@ -15,16 +15,17 @@
  */
 package org.springframework.ldap.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ldap.support.LdapEncoder;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.ldap.support.LdapEncoder;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
 /**
  * Represents part of an LdapRdn. As specified in RFC2253 an LdapRdn may be composed of
  * several attributes, separated by "+". An LdapRdnComponent represents one of

core/src/main/java/org/springframework/ldap/core/LdapTemplate.java

@@ -15,23 +15,13 @@
  */
 package org.springframework.ldap.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.ldap.AuthenticationException;
-import org.springframework.ldap.NamingException;
-import org.springframework.ldap.UncategorizedLdapException;
-import org.springframework.ldap.filter.Filter;
-import org.springframework.ldap.odm.core.ObjectDirectoryMapper;
-import org.springframework.ldap.odm.core.OdmException;
-import org.springframework.ldap.odm.core.impl.DefaultObjectDirectoryMapper;
-import org.springframework.ldap.query.LdapQuery;
-import org.springframework.ldap.query.LdapQueryBuilder;
-import org.springframework.ldap.support.LdapUtils;
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
+import java.util.List;
+import java.util.Objects;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 import javax.naming.Binding;
 import javax.naming.Name;
@@ -47,13 +37,24 @@ import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapName;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.function.Function;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.dao.IncorrectResultSizeDataAccessException;
+import org.springframework.ldap.AuthenticationException;
+import org.springframework.ldap.NamingException;
+import org.springframework.ldap.UncategorizedLdapException;
+import org.springframework.ldap.filter.Filter;
+import org.springframework.ldap.odm.core.ObjectDirectoryMapper;
+import org.springframework.ldap.odm.core.OdmException;
+import org.springframework.ldap.odm.core.impl.DefaultObjectDirectoryMapper;
+import org.springframework.ldap.query.LdapQuery;
+import org.springframework.ldap.query.LdapQueryBuilder;
+import org.springframework.ldap.support.LdapUtils;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Executes core LDAP functionality and helps to avoid common errors, relieving the user

core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java

@@ -16,10 +16,12 @@
 
 package org.springframework.ldap.core;
 
-import org.springframework.ldap.InvalidNameException;
-import org.springframework.ldap.support.LdapUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
 
 import javax.naming.Name;
 import javax.naming.NamingEnumeration;
@@ -27,12 +29,11 @@ import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.LdapName;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
+
+import org.springframework.ldap.InvalidNameException;
+import org.springframework.ldap.support.LdapUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Used internally to make DirContextAdapter properly handle Names as values.

core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java

@@ -16,13 +16,14 @@
 
 package org.springframework.ldap.core;
 
-import org.springframework.util.Assert;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import java.util.HashMap;
-import java.util.Map;
+
+import org.springframework.util.Assert;
 
 /**
  * Used internally to help DirContextAdapter properly handle Names as values.

core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java

@@ -15,9 +15,11 @@
  */
 package org.springframework.ldap.core.support;
 
-import org.springframework.ldap.UncategorizedLdapException;
-import org.springframework.ldap.core.DirContextProxy;
-import org.springframework.ldap.support.LdapUtils;
+import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Hashtable;
 
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
@@ -26,11 +28,10 @@ import javax.naming.ldap.StartTlsRequest;
 import javax.naming.ldap.StartTlsResponse;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSocketFactory;
-import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Hashtable;
+
+import org.springframework.ldap.UncategorizedLdapException;
+import org.springframework.ldap.core.DirContextProxy;
+import org.springframework.ldap.support.LdapUtils;
 
 /**
  * Abstract superclass for {@link DirContextAuthenticationStrategy} implementations that

core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java

@@ -16,14 +16,15 @@
 
 package org.springframework.ldap.core.support;
 
-import org.springframework.ldap.core.DirContextProcessor;
-
-import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+
+import org.springframework.ldap.core.DirContextProcessor;
+
 /**
  * Manages a sequence of {@link DirContextProcessor} instances. Applies
  * {@link #preProcess(DirContext)} and {@link #postProcess(DirContext)} respectively in

core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java

@@ -16,6 +16,10 @@
 
 package org.springframework.ldap.core.support;
 
+import java.util.Collection;
+
+import javax.naming.ldap.LdapName;
+
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.ApplicationContext;
@@ -25,9 +29,6 @@ import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.support.LdapUtils;
 import org.springframework.util.StringUtils;
 
-import javax.naming.ldap.LdapName;
-import java.util.Collection;
-
 /**
  * This <code>BeanPostProcessor</code> checks each bean if it implements
  * {@link BaseLdapNameAware} or {@link BaseLdapPathAware}. If it does, the default context

core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java

@@ -15,11 +15,11 @@
  */
 package org.springframework.ldap.core.support;
 
+import javax.naming.ldap.LdapName;
+
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.DistinguishedName;
 
-import javax.naming.ldap.LdapName;
-
 /**
  * Implementations of this interface are capable of providing a base LDAP path. The base
  * LDAP path is the root path to which all LDAP operations performed on a particular

core/src/main/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControls.java

@@ -15,14 +15,14 @@
  */
 package org.springframework.ldap.core.support;
 
-import org.springframework.ldap.core.ContextMapperCallbackHandler;
-import org.springframework.ldap.core.ObjectRetrievalException;
-
 import javax.naming.Binding;
 import javax.naming.NameClassPair;
 import javax.naming.NamingException;
 import javax.naming.ldap.HasControls;
 
+import org.springframework.ldap.core.ContextMapperCallbackHandler;
+import org.springframework.ldap.core.ObjectRetrievalException;
+
 /**
  * Currently only per request controls can be inspected via the post process method on a
  * context processor. If a request control gives a different value for each search result,

core/src/main/java/org/springframework/ldap/core/support/ContextMapperWithControls.java

@@ -15,11 +15,11 @@
  */
 package org.springframework.ldap.core.support;
 
-import org.springframework.ldap.core.ContextMapper;
-
 import javax.naming.NamingException;
 import javax.naming.ldap.HasControls;
 
+import org.springframework.ldap.core.ContextMapper;
+
 /**
  * Extension of the {@link org.springframework.ldap.core.ContextMapper} interface that
  * allows controls to be passed to the mapper implementation. Uses Java 5 covariant return

core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java

@@ -16,20 +16,22 @@
 
 package org.springframework.ldap.core.support;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ldap.core.DirContextAdapter;
-import org.springframework.ldap.support.LdapUtils;
-import org.springframework.util.StringUtils;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Hashtable;
 
 import javax.naming.CompositeName;
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.directory.Attributes;
 import javax.naming.spi.DirObjectFactory;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Hashtable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.support.LdapUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Default implementation of the DirObjectFactory interface. Creates a

core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java

@@ -16,19 +16,6 @@
 
 package org.springframework.ldap.core.support;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ldap.core.IncrementalAttributesMapper;
-import org.springframework.ldap.core.LdapOperations;
-import org.springframework.ldap.support.LdapUtils;
-
-import javax.naming.Name;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -39,6 +26,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.ldap.core.IncrementalAttributesMapper;
+import org.springframework.ldap.core.LdapOperations;
+import org.springframework.ldap.support.LdapUtils;
+
 /**
  * Utility class that helps with reading all attribute values from Active Directory using
  * <em>Incremental Retrieval of Multi-valued Properties</em>.

core/src/main/java/org/springframework/ldap/core/support/DelegatingBaseLdapPathContextSourceSupport.java

@@ -16,11 +16,11 @@
 
 package org.springframework.ldap.core.support;
 
+import javax.naming.ldap.LdapName;
+
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.DistinguishedName;
 
-import javax.naming.ldap.LdapName;
-
 /**
  * Support class to provide {@link BaseLdapPathSource} functionality to ContextSource
  * instances that act as proxies.

core/src/main/java/org/springframework/ldap/core/support/DigestMd5DirContextAuthenticationStrategy.java

@@ -15,9 +15,10 @@
  */
 package org.springframework.ldap.core.support;
 
+import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.directory.DirContext;
-import java.util.Hashtable;
 
 /**
  * Authentication strategy for LDAP DIGEST-MD5 SASL mechanism.

core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java

@@ -15,12 +15,13 @@
  */
 package org.springframework.ldap.core.support;
 
-import org.springframework.ldap.core.AuthenticationSource;
-import org.springframework.ldap.core.ContextSource;
+import java.util.Hashtable;
 
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
-import java.util.Hashtable;
+
+import org.springframework.ldap.core.AuthenticationSource;
+import org.springframework.ldap.core.ContextSource;
 
 /**
  * A strategy to use when authenticating LDAP connections on creation. When authenticating

core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java

@@ -16,10 +16,11 @@
 
 package org.springframework.ldap.core.support;
 
+import java.util.Hashtable;
+
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.InitialLdapContext;
-import java.util.Hashtable;
 
 /**
  * ContextSource implementation which creates an <code>InitialLdapContext</code> instance.

core/src/main/java/org/springframework/ldap/core/support/LookupAttemptingCallback.java

@@ -16,15 +16,15 @@
 
 package org.springframework.ldap.core.support;
 
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+
 import org.springframework.ldap.core.AuthenticatedLdapEntryContextCallback;
 import org.springframework.ldap.core.AuthenticatedLdapEntryContextMapper;
 import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.LdapEntryIdentification;
 import org.springframework.ldap.support.LdapUtils;
 
-import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
-
 /**
  * Attempts to perform an LDAP operation in the authenticated context, because Active
  * Directory might allow bind with incorrect password (specifically empty password), and

core/src/main/java/org/springframework/ldap/core/support/RangeOption.java

@@ -16,8 +16,8 @@
 
 package org.springframework.ldap.core.support;
 
-import java.util.regex.Pattern;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Attribute name Range Option used for <em>Incremental Retrieval of Multi-valued

core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java

@@ -15,9 +15,10 @@
  */
 package org.springframework.ldap.core.support;
 
+import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.directory.DirContext;
-import java.util.Hashtable;
 
 /**
  * The default {@link DirContextAuthenticationStrategy} implementation, setting the

core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java

@@ -15,20 +15,22 @@
  */
 package org.springframework.ldap.core.support;
 
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import javax.naming.directory.DirContext;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.DirContextProxy;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.support.LdapUtils;
 
-import javax.naming.directory.DirContext;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
 /**
  * A {@link ContextSource} to be used as a decorator around a target ContextSource to make
  * sure the target is never actually closed. Useful when working with e.g. paged results,

core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java

@@ -15,12 +15,12 @@
  */
 package org.springframework.ldap.filter;
 
-import org.springframework.util.StringUtils;
-import org.springframework.ldap.support.LdapEncoder;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.springframework.ldap.support.LdapEncoder;
+import org.springframework.util.StringUtils;
+
 /**
  * This filter automatically converts all whitespace to wildcards (*). The following code:
  *

core/src/main/java/org/springframework/ldap/odm/core/impl/AttributeMetaData.java

@@ -16,13 +16,6 @@
 
 package org.springframework.ldap.odm.core.impl;
 
-import org.springframework.ldap.UncategorizedLdapException;
-import org.springframework.ldap.odm.annotations.Attribute;
-import org.springframework.ldap.odm.annotations.DnAttribute;
-import org.springframework.ldap.odm.annotations.Id;
-import org.springframework.ldap.odm.annotations.Transient;
-
-import javax.naming.Name;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
@@ -36,6 +29,14 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import javax.naming.Name;
+
+import org.springframework.ldap.UncategorizedLdapException;
+import org.springframework.ldap.odm.annotations.Attribute;
+import org.springframework.ldap.odm.annotations.DnAttribute;
+import org.springframework.ldap.odm.annotations.Id;
+import org.springframework.ldap.odm.annotations.Transient;
+
 /*
  * Extract attribute meta-data from the @Attribute annotation, the @Id annotation
  * and via reflection.

core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java

@@ -36,6 +36,7 @@ import javax.naming.directory.Attributes;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.LdapDataEntry;
 import org.springframework.core.SpringVersion;
 import org.springframework.ldap.filter.AndFilter;

core/src/main/java/org/springframework/ldap/odm/core/impl/ObjectMetaData.java

@@ -16,14 +16,6 @@
 
 package org.springframework.ldap.odm.core.impl;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.ldap.odm.annotations.Entry;
-import org.springframework.ldap.odm.annotations.Id;
-import org.springframework.ldap.support.LdapUtils;
-import org.springframework.util.StringUtils;
-
-import javax.naming.Name;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Comparator;
@@ -34,6 +26,16 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
+import javax.naming.Name;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.ldap.odm.annotations.Entry;
+import org.springframework.ldap.odm.annotations.Id;
+import org.springframework.ldap.support.LdapUtils;
+import org.springframework.util.StringUtils;
+
 /*
  * An internal class to process the meta-data and reflection data for an entry.
  *

core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConversionServiceConverterManager.java

@@ -16,14 +16,14 @@
 
 package org.springframework.ldap.odm.typeconversion.impl;
 
+import javax.naming.Name;
+
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.ldap.odm.typeconversion.ConverterManager;
 import org.springframework.ldap.support.LdapUtils;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
-import javax.naming.Name;
-
 /**
  * @author Mattias Hellborg Arthursson
  * @since 2.0

core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java

@@ -16,14 +16,15 @@
 
 package org.springframework.ldap.odm.typeconversion.impl;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.FactoryBeanNotInitializedException;
-
 import java.util.HashSet;
 import java.util.Set;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.FactoryBeanNotInitializedException;
+
 /**
  * A utility class to allow {@link ConverterManagerImpl} instances to be easily configured
  * via <code>spring.xml</code>.

core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java

@@ -16,12 +16,12 @@
 
 package org.springframework.ldap.odm.typeconversion.impl;
 
-import org.springframework.ldap.odm.typeconversion.ConverterException;
-import org.springframework.ldap.odm.typeconversion.ConverterManager;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.ldap.odm.typeconversion.ConverterException;
+import org.springframework.ldap.odm.typeconversion.ConverterManager;
+
 /**
  * An implementation of
  * {@link org.springframework.ldap.odm.typeconversion.ConverterManager}.

core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java

@@ -16,10 +16,10 @@
 
 package org.springframework.ldap.odm.typeconversion.impl.converters;
 
-import org.springframework.ldap.odm.typeconversion.impl.Converter;
-
 import java.lang.reflect.Constructor;
 
+import org.springframework.ldap.odm.typeconversion.impl.Converter;
+
 /**
  * A Converter from a {@link java.lang.String} to any class which has a single argument
  * public constructor taking a {@link java.lang.String}.

core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java

@@ -15,9 +15,7 @@
  */
 package org.springframework.ldap.pool;
 
-import org.apache.commons.pool.KeyedObjectPool;
-import org.springframework.ldap.pool.factory.PoolingContextSource;
-import org.springframework.util.Assert;
+import java.util.Hashtable;
 
 import javax.naming.Binding;
 import javax.naming.Context;
@@ -26,7 +24,11 @@ import javax.naming.NameClassPair;
 import javax.naming.NameParser;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import java.util.Hashtable;
+
+import org.apache.commons.pool.KeyedObjectPool;
+
+import org.springframework.ldap.pool.factory.PoolingContextSource;
+import org.springframework.util.Assert;
 
 /**
  * Used by {@link PoolingContextSource} to wrap a {@link Context}, delegating most methods

core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java

@@ -15,11 +15,6 @@
  */
 package org.springframework.ldap.pool;
 
-import org.apache.commons.pool.KeyedObjectPool;
-import org.springframework.ldap.core.DirContextProxy;
-import org.springframework.ldap.pool.factory.PoolingContextSource;
-import org.springframework.util.Assert;
-
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NamingEnumeration;
@@ -30,6 +25,12 @@ import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
+import org.apache.commons.pool.KeyedObjectPool;
+
+import org.springframework.ldap.core.DirContextProxy;
+import org.springframework.ldap.pool.factory.PoolingContextSource;
+import org.springframework.util.Assert;
+
 /**
  * Used by {@link PoolingContextSource} to wrap a {@link DirContext}, delegating most
  * methods to the underlying context. This class extends {@link DelegatingContext} which

core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java

@@ -15,10 +15,6 @@
  */
 package org.springframework.ldap.pool;
 
-import org.apache.commons.pool.KeyedObjectPool;
-import org.springframework.ldap.pool.factory.PoolingContextSource;
-import org.springframework.util.Assert;
-
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.Control;
@@ -26,6 +22,11 @@ import javax.naming.ldap.ExtendedRequest;
 import javax.naming.ldap.ExtendedResponse;
 import javax.naming.ldap.LdapContext;
 
+import org.apache.commons.pool.KeyedObjectPool;
+
+import org.springframework.ldap.pool.factory.PoolingContextSource;
+import org.springframework.util.Assert;
+
 /**
  * Used by {@link PoolingContextSource} to wrap a {@link LdapContext}, delegating most
  * methods to the underlying context. This class extends {@link DelegatingDirContext}

core/src/main/java/org/springframework/ldap/pool/DirContextType.java

@@ -16,10 +16,10 @@
 
 package org.springframework.ldap.pool;
 
-import org.springframework.ldap.core.ContextSource;
-
 import javax.naming.directory.DirContext;
 
+import org.springframework.ldap.core.ContextSource;
+
 /**
  * An enum representing the two types of {@link DirContext}s that can be returned by a
  * {@link ContextSource}.