From c07584be487be176a16dc81b4a831ec7d24c6734 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Tue, 11 Apr 2023 16:26:29 -0600 Subject: [PATCH] Update Import Order Closes gh-749 --- .../AbstractSpringJavaPlugin.groovy | 16 +++--- .../gradle/convention/DeployDocsPlugin.groovy | 2 - .../IncludeCheckRemotePlugin.groovy | 1 - .../gradle/convention/JavadocApiPlugin.groovy | 26 +++++----- .../gradle/convention/MavenBomPlugin.groovy | 1 - .../convention/SchemaDeployPlugin.groovy | 2 - .../gradle/convention/SchemaPlugin.groovy | 2 - .../gradle/convention/SchemaZipPlugin.groovy | 4 +- .../gradle/convention/SortedProperties.groovy | 10 +--- .../convention/SpringModulePlugin.groovy | 7 ++- .../src/main/java/lock/GlobalLockTask.java | 4 +- .../gradle/antora/CheckAntoraVersionTask.java | 8 +-- .../maven/PublishAllJavaComponentsPlugin.java | 2 - .../gradle/maven/PublishLocalPlugin.java | 4 +- .../maven/SpringNexusPublishPlugin.java | 6 +-- .../gradle/maven/SpringSigningPlugin.java | 5 +- .../gradle/sagan/SaganApi.java | 11 +++-- .../gradle/sagan/SaganPlugin.java | 4 +- .../convention/versions/GitHubApi.java | 14 +++--- .../TransitiveDependencyLookupUtils.java | 15 +++--- .../versions/UpdateDependenciesExtension.java | 9 ++-- .../versions/UpdateDependenciesPlugin.java | 30 +++++++----- buildSrc/src/main/java/trang/RncToXsd.java | 21 ++++---- .../test/java/io/spring/gradle/TestKit.java | 8 ++- .../IncludeCheckRemotePluginTests.java | 4 +- .../convention/IntegrationPluginTests.java | 2 - .../IntegrationTestPluginITests.java | 6 +-- .../gradle/convention/JacocoPluginITests.java | 6 +-- .../convention/JavadocApiPluginITests.java | 7 ++- .../convention/JavadocApiPluginTests.java | 3 +- .../gradle/convention/ShowcaseITests.java | 8 +-- .../convention/SpringMavenPluginITests.java | 10 ++-- .../TestsConfigurationPluginITests.java | 4 +- .../spring/gradle/convention/UtilsTests.java | 6 +-- .../convention/sagan/SaganApiTests.java | 7 +-- .../antora/CheckAntoraVersionPluginTests.java | 8 +-- .../versions/DependencyExcludesTests.java | 8 +-- .../groovy/sample/TheTest.groovy | 6 +-- .../java/sample/TheTests.java | 1 + .../java/sample/TheTests.java | 2 +- .../src/test/java/sample/TheClassTests.java | 5 +- .../src/test/java/sample/DependencyTests.java | 2 +- .../org/springframework/LdapDataEntry.java | 3 +- ...ltValuesAuthenticationSourceDecorator.java | 2 +- .../ldap/config/ContextSourceParser.java | 9 ++-- .../config/DefaultRenamingStrategyParser.java | 3 +- .../ldap/config/LdapTemplateParser.java | 3 +- .../ldap/config/ParserUtils.java | 3 +- .../ldap/config/TransactionManagerParser.java | 3 +- ...AndResponseControlDirContextProcessor.java | 13 ++--- ...ractRequestControlDirContextProcessor.java | 9 ++-- .../ldap/control/PagedResultsCookie.java | 3 +- .../control/PagedResultsRequestControl.java | 11 +++-- .../core/AttributesMapperCallbackHandler.java | 4 +- ...ollectingNameClassPairCallbackHandler.java | 5 +- .../ldap/core/ContextMapper.java | 6 +-- .../core/ContextMapperCallbackHandler.java | 4 +- .../ldap/core/ContextSource.java | 4 +- .../ldap/core/DirContextAdapter.java | 26 +++++----- .../ldap/core/DirContextOperations.java | 4 +- .../ldap/core/DistinguishedName.java | 30 ++++++------ .../core/IncrementalAttributesMapper.java | 3 +- .../ldap/core/IterableNamingEnumeration.java | 3 +- .../ldap/core/LdapAttribute.java | 3 +- .../ldap/core/LdapAttributes.java | 13 ++--- .../ldap/core/LdapEntryIdentification.java | 6 +-- .../ldap/core/LdapOperations.java | 19 +++---- .../springframework/ldap/core/LdapRdn.java | 6 +-- .../ldap/core/LdapRdnComponent.java | 13 ++--- .../ldap/core/LdapTemplate.java | 49 ++++++++++--------- .../ldap/core/NameAwareAttribute.java | 21 ++++---- .../ldap/core/NameAwareAttributes.java | 7 +-- ...ctTlsDirContextAuthenticationStrategy.java | 17 ++++--- .../support/AggregateDirContextProcessor.java | 9 ++-- .../BaseLdapPathBeanPostProcessor.java | 7 +-- .../ldap/core/support/BaseLdapPathSource.java | 4 +- ...textMapperCallbackHandlerWithControls.java | 6 +-- .../support/ContextMapperWithControls.java | 4 +- .../core/support/DefaultDirObjectFactory.java | 18 ++++--- .../DefaultIncrementalAttributesMapper.java | 28 ++++++----- ...atingBaseLdapPathContextSourceSupport.java | 4 +- ...stMd5DirContextAuthenticationStrategy.java | 3 +- .../DirContextAuthenticationStrategy.java | 7 +-- .../ldap/core/support/LdapContextSource.java | 3 +- .../support/LookupAttemptingCallback.java | 6 +-- .../ldap/core/support/RangeOption.java | 2 +- ...impleDirContextAuthenticationStrategy.java | 3 +- .../core/support/SingleContextSource.java | 14 +++--- .../filter/WhitespaceWildcardsFilter.java | 6 +-- .../ldap/odm/core/impl/AttributeMetaData.java | 15 +++--- .../impl/DefaultObjectDirectoryMapper.java | 1 + .../ldap/odm/core/impl/ObjectMetaData.java | 18 ++++--- .../ConversionServiceConverterManager.java | 4 +- .../impl/ConverterManagerFactoryBean.java | 11 +++-- .../impl/ConverterManagerImpl.java | 6 +-- .../impl/converters/FromStringConverter.java | 4 +- .../ldap/pool/DelegatingContext.java | 10 ++-- .../ldap/pool/DelegatingDirContext.java | 11 +++-- .../ldap/pool/DelegatingLdapContext.java | 9 ++-- .../ldap/pool/DirContextType.java | 4 +- .../pool/MutableDelegatingLdapContext.java | 7 +-- .../DirContextPoolableObjectFactory.java | 28 ++++++----- .../pool/factory/PoolingContextSource.java | 10 ++-- .../DefaultDirContextValidator.java | 11 +++-- .../ldap/pool2/DelegatingContext.java | 14 ++++-- .../ldap/pool2/DelegatingDirContext.java | 18 ++++--- .../ldap/pool2/DelegatingLdapContext.java | 10 ++-- .../ldap/pool2/DirContextType.java | 4 +- .../pool2/MutableDelegatingLdapContext.java | 7 +-- .../DirContextPoolableObjectFactory.java | 32 ++++++------ .../factory/MutablePooledContextSource.java | 10 ++-- .../pool2/factory/PooledContextSource.java | 14 +++--- .../DefaultDirContextValidator.java | 11 +++-- .../pool2/validation/DirContextValidator.java | 4 +- .../ldap/query/DefaultContainerCriteria.java | 7 +-- .../springframework/ldap/query/LdapQuery.java | 4 +- .../ldap/query/LdapQueryBuilder.java | 7 +-- .../ldap/support/LdapNameBuilder.java | 4 +- .../ldap/support/LdapUtils.java | 22 +++++---- .../compensating/BindOperationExecutor.java | 11 +++-- ...mpensatingTransactionOperationFactory.java | 5 +- .../compensating/LdapTransactionUtils.java | 4 +- .../ModifyAttributesOperationExecutor.java | 11 +++-- .../ModifyAttributesOperationRecorder.java | 19 +++---- .../compensating/NullOperationExecutor.java | 1 + .../compensating/RebindOperationExecutor.java | 11 +++-- .../compensating/RenameOperationExecutor.java | 5 +- .../compensating/RenameOperationRecorder.java | 5 +- .../compensating/UnbindOperationExecutor.java | 5 +- ...ntextSourceTransactionManagerDelegate.java | 7 +-- .../TransactionAwareContextSourceProxy.java | 7 +-- ...ctionAwareDirContextInvocationHandler.java | 12 +++-- .../DefaultTempEntryRenamingStrategy.java | 6 +-- ...erentSubtreeTempEntryRenamingStrategy.java | 7 +-- ...ompensatingTransactionManagerDelegate.java | 1 + .../support/CompensatingTransactionUtils.java | 6 +-- ...mpensatingTransactionOperationManager.java | 5 +- .../ldap/NamingExceptionTests.java | 7 +-- ...uesAuthenticationSourceDecoratorTests.java | 1 + .../config/DummyAuthenticationStrategy.java | 5 +- .../LdapTemplateNamespaceHandlerTests.java | 22 +++++---- .../ldap/control/PagedResultTests.java | 9 ++-- .../PagedResultsDirContextProcessorTests.java | 13 ++--- ...equestControlDirContextProcessorTests.java | 10 ++-- .../SortControlDirContextProcessorTests.java | 13 ++--- ...tingNameClassPairCallbackHandlerTests.java | 8 +-- .../ContextMapperCallbackHandlerTests.java | 6 +-- .../ldap/core/DirContextAdapterBugTests.java | 7 +-- .../ldap/core/DirContextAdapterTests.java | 12 +++-- .../ldap/core/DistinguishedNameTests.java | 10 ++-- .../ldap/core/LdapRdnTests.java | 1 + .../ldap/core/LdapTemplateListTests.java | 12 +++-- .../ldap/core/LdapTemplateLookupTests.java | 13 ++--- .../ldap/core/LdapTemplateOdmTests.java | 1 + .../ldap/core/LdapTemplateRenameTests.java | 11 +++-- .../ldap/core/NameAwareAttributeTests.java | 7 +-- .../support/AbstractContextSourceTests.java | 4 +- .../AggregateDirContextProcessorTests.java | 5 +- .../BaseLdapPathBeanPostProcessorTests.java | 5 +- ...apperCallbackHandlerWithControlsTests.java | 9 ++-- ...meClassPairResultCallbackHandlerTests.java | 4 +- .../support/DefaultDirObjectFactoryTests.java | 14 +++--- ...faultIncrementalAttributesMapperTests.java | 6 +-- .../core/support/LdapContextSourceTests.java | 12 +++-- ...DirContextAuthenticationStrategyTests.java | 7 +-- .../support/SingleContextSourceTests.java | 17 ++++--- .../core/support/ldap294/Ldap294Tests.java | 1 + .../odm/core/impl/BaseUnitTestPerson.java | 9 +++- .../DefaultObjectDirectoryMapperTests.java | 7 +-- ...onWithIndexedAndUnindexedDnAttributes.java | 4 +- ...UnitTestPersonWithIndexedDnAttributes.java | 4 +- .../UnitTestPersonWithInvalidFieldType.java | 4 +- .../ldap/pool/AbstractPoolTestCase.java | 11 +++-- .../ldap/pool/DelegatingContextTests.java | 6 +-- .../ldap/pool/DelegatingDirContextTests.java | 6 +-- .../ldap/pool/DelegatingLdapContextTests.java | 6 +-- .../DirContextPoolableObjectFactoryTests.java | 13 ++--- .../MutablePoolingContextSourceTests.java | 5 +- .../factory/PoolingContextSourceTests.java | 7 +-- .../DefaultDirContextValidatorTests.java | 9 ++-- .../ldap/pool2/AbstractPoolTestCase.java | 11 +++-- .../ldap/pool2/DelegatingContextTests.java | 8 +-- .../ldap/pool2/DelegatingDirContextTests.java | 6 +-- .../pool2/DelegatingLdapContextTests.java | 6 +-- .../DirContextPooledObjectFactoryTests.java | 23 ++++----- .../MutablePooledContextSourceTests.java | 5 +- .../ldap/pool2/factory/PoolConfigTests.java | 1 + .../factory/PooledContextSourceTests.java | 13 ++--- .../ldap/query/LdapQueryBuilderTests.java | 1 + .../ldap/support/LdapEncoderTests.java | 1 + .../ldap/support/LdapUtilsTests.java | 12 +++-- .../BindOperationExecutorTests.java | 11 +++-- .../BindOperationRecorderTests.java | 8 +-- ...atingTransactionOperationFactoryTests.java | 5 +- .../LdapTransactionUtilsTests.java | 11 +++-- ...odifyAttributesOperationExecutorTests.java | 11 +++-- ...odifyAttributesOperationRecorderTests.java | 15 +++--- .../RebindOperationExecutorTests.java | 11 +++-- .../RebindOperationRecorderTests.java | 7 +-- .../RenameOperationExecutorTests.java | 5 +- .../RenameOperationRecorderTests.java | 1 + .../UnbindOperationExecutorTests.java | 5 +- .../UnbindOperationRecorderTests.java | 5 +- .../CompensatingTransactionUtilsTests.java | 8 +-- .../ContextSourceTransactionManagerTests.java | 10 ++-- ...ansactionAwareContextSourceProxyTests.java | 11 +++-- ...AwareDirContextInvocationHandlerTests.java | 11 +++-- ...DefaultTempEntryRenamingStrategyTests.java | 7 +-- ...SubtreeTempEntryRenamingStrategyTests.java | 7 +-- .../ldap/util/ListComparatorTests.java | 9 ++-- ...atingTransactionOperationManagerTests.java | 5 +- .../ldap-namespace-config-multiurls.xml | 3 +- .../ldap/ldif/parser/LdifParser.java | 18 ++++--- .../ldap/ldif/parser/Parser.java | 5 +- .../DefaultAttributeValidationPolicy.java | 18 ++++--- .../ldap/ldif/support/SeparatorPolicy.java | 1 + .../ldap/schema/BasicSchemaSpecification.java | 6 +-- ...DefaultAttributeValidationPolicyTests.java | 23 ++++----- .../ldap/ldif/Ldap233LdifParserTests.java | 11 +++-- .../ldap/ldif/LdifParserTests.java | 9 ++-- .../ldap/odm/core/OdmManager.java | 5 +- .../ldap/odm/core/impl/OdmManagerImpl.java | 11 +++-- .../core/impl/OdmManagerImplFactoryBean.java | 4 +- .../ldap/odm/tools/SchemaReader.java | 7 +-- .../ldap/odm/tools/SchemaToJava.java | 35 ++++++------- .../ldap/odm/tools/SchemaViewer.java | 17 ++++--- .../ldap/odm/test/ConverterManagerTests.java | 5 +- .../ldap/odm/test/JDependTests.java | 4 +- .../ldap/odm/test/OrganizationalUnit.java | 11 +++-- .../springframework/ldap/odm/test/Person.java | 13 ++--- .../ldap/odm/test/PlainPerson.java | 9 ++-- .../ldap/odm/test/SchemaToJavaTests.java | 24 ++++----- .../samples/odm/dao/OdmPersonDaoImpl.java | 11 +++-- .../ldap/samples/plain/dao/PersonDao.java | 4 +- .../ldap/samples/plain/domain/Person.java | 5 +- .../samples/plain/web/DefaultController.java | 10 ++-- .../samples/utils/HtmlRowLdapTreeVisitor.java | 4 +- .../ldap/samples/utils/LdapTree.java | 4 +- .../ldap/samples/utils/LdapTreeBuilder.java | 4 +- .../dao/PersonDaoSampleIntegrationTests.java | 5 +- .../LdapTreeBuilderIntegrationTests.java | 12 +++-- .../ldap/samples/plain/dao/PersonDao.java | 4 +- .../ldap/samples/plain/dao/PersonDaoImpl.java | 13 ++--- .../samples/utils/HtmlRowLdapTreeVisitor.java | 4 +- .../ldap/samples/utils/LdapTree.java | 4 +- .../ldap/samples/utils/LdapTreeBuilder.java | 4 +- .../dao/PersonDaoSampleIntegrationTests.java | 5 +- .../LdapTreeBuilderIntegrationTests.java | 12 +++-- ...ualListViewControlDirContextProcessor.java | 7 +-- ...stViewControlDirContextProcessorTests.java | 10 ++-- ...stractEc2InstanceLaunchingFactoryBean.java | 5 +- .../test/AttributeCheckAttributesMapper.java | 8 +-- .../test/AttributeCheckContextMapper.java | 4 +- ...SourceEc2InstanceLaunchingFactoryBean.java | 1 - .../ldap/test/DummyDirContext.java | 3 +- .../ldap/test/EmbeddedLdapServer.java | 4 +- .../ldap/test/LdapTestUtils.java | 36 +++++++------- .../ldap/test/LdifPopulator.java | 9 ++-- .../ldap/test/unboundid/LdapTestUtils.java | 5 +- .../EmbeddedLdapServerFactoryBeanTests.java | 6 +-- .../ad/IncrementalAttributeMapperITests.java | 14 +++--- .../ldap/itest/ad/SchemaToJavaAdITests.java | 21 ++++---- ...SourceEc2InstanceLaunchingFactoryBean.java | 4 -- .../ldap/itest/control/PagedSearchITests.java | 14 +++--- .../core/LdapTemplateSearchResultITests.java | 10 ++-- .../DigestMd5AuthenticationITests.java | 5 +- .../ldap/itest/LdapGroupDao.java | 4 +- .../core/support/DummyBaseLdapNameAware.java | 4 +- .../springframework/ldap/itest/odm/Group.java | 7 +-- .../LdapConditionallyFilteredTestRunner.java | 1 + .../AbstractLdapTemplateIntegrationTests.java | 16 +++--- .../itest/DefaultLdapClientRenameITests.java | 1 - .../ldap/itest/InvalidBackslashITests.java | 12 +++-- .../LdapTemplateAttributesMapperITests.java | 16 +++--- .../LdapTemplateAuthenticationITests.java | 7 +-- .../itest/LdapTemplateBindUnbindITests.java | 9 ++-- .../LdapTemplateContextExecutorTests.java | 1 + .../LdapTemplateContextMapperITests.java | 5 +- .../ldap/itest/LdapTemplateListITests.java | 10 ++-- .../ldap/itest/LdapTemplateLookupITests.java | 9 ++-- .../LdapTemplateLookupMultiRdnITests.java | 1 + .../ldap/itest/LdapTemplateModifyITests.java | 18 ++++--- .../itest/LdapTemplateNoBaseSuffixITests.java | 7 +-- .../ldap/itest/LdapTemplatePooledITests.java | 1 + .../LdapTemplateRecursiveDeleteITests.java | 7 +-- .../ldap/itest/LdapTemplateRenameITests.java | 5 +- .../itest/LdapTemplateSearchResultITests.java | 14 +++--- ...lateSearchResultNamespaceConfigITests.java | 12 +++-- .../control/SupportedControlsITests.java | 10 ++-- .../core/DistinguishedNameEditorITests.java | 1 + .../itest/core/DnParsePerformanceITests.java | 1 + .../BaseLdapPathBeanPostprocessorITests.java | 1 + ...eanPostprocessorNamespaceConfigITests.java | 1 + .../LdapContextSourceIntegrationTests.java | 14 +++--- ...textSourceMultiServerIntegrationTests.java | 5 +- .../HardcodedFilterIntegrationTests.java | 1 + .../itest/integration/JiraLdap247ITests.java | 1 + .../ldap/itest/ldap321/Ldap321Tests.java | 5 +- ...rceTransactionManagerIntegrationTests.java | 16 +++--- ...sactionManagerLdap179IntegrationTests.java | 5 +- ...urceTransactionManagerNamespaceITests.java | 16 +++--- ...rceTransactionManagerIntegrationTests.java | 11 +++-- ...ctionManagerNamespaceIntegrationTests.java | 11 +++-- ...sactionManagerSubtreeIntegrationTests.java | 1 + ...ateTransactionManagerIntegrationTests.java | 14 +++--- ...sactionManagerLdap179IntegrationTests.java | 5 +- ...nateTransactionManagerNamespaceITests.java | 14 +++--- ...dapTemplateOdmGroupManipulationITests.java | 10 ++-- ...dapTemplateOdmWithDnAnnotationsITests.java | 9 ++-- ...pTemplateOdmWithNoDnAnnotationsITests.java | 9 ++-- 310 files changed, 1429 insertions(+), 1183 deletions(-) diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy index 546f507f..a927e4fa 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy index bf1add50..050ece5a 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/DeployDocsPlugin.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy index 5ba6e350..c6a7a020 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy index ef864b03..aea52507 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocApiPlugin.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomPlugin.groovy index fe94e81a..3b51b526 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/MavenBomPlugin.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy index 4b9c038d..531eb6ca 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaPlugin.groovy index 769ae80d..fe5c6d53 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaPlugin.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy index 72de4b3f..1081687c 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy +++ b/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 { diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy index 5b950d83..ccb4d90a 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SortedProperties.groovy +++ b/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. diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy index 9d8c7b69..a7bb2eb6 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy +++ b/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 diff --git a/buildSrc/src/main/java/lock/GlobalLockTask.java b/buildSrc/src/main/java/lock/GlobalLockTask.java index 20a8f8f1..e361e3e9 100644 --- a/buildSrc/src/main/java/lock/GlobalLockTask.java +++ b/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 */ diff --git a/buildSrc/src/main/java/org/springframework/gradle/antora/CheckAntoraVersionTask.java b/buildSrc/src/main/java/org/springframework/gradle/antora/CheckAntoraVersionTask.java index 01225d79..be62ed93 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/antora/CheckAntoraVersionTask.java +++ b/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 diff --git a/buildSrc/src/main/java/org/springframework/gradle/maven/PublishAllJavaComponentsPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/maven/PublishAllJavaComponentsPlugin.java index 408d83e7..d8983604 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/maven/PublishAllJavaComponentsPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/springframework/gradle/maven/PublishLocalPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/maven/PublishLocalPlugin.java index 54f9e497..0e09936f 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/maven/PublishLocalPlugin.java +++ b/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 { @Override public void apply(Project project) { diff --git a/buildSrc/src/main/java/org/springframework/gradle/maven/SpringNexusPublishPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/maven/SpringNexusPublishPlugin.java index 3002824c..5570fa2c 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/maven/SpringNexusPublishPlugin.java +++ b/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 { @Override public void apply(Project project) { diff --git a/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java index c953f10f..d34225da 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java +++ b/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 { @Override public void apply(Project project) { diff --git a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganApi.java b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganApi.java index 24eeb311..b2a413f8 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganApi.java +++ b/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 */ diff --git a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganPlugin.java index 388a2d15..c5ff7d70 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/sagan/SaganPlugin.java +++ b/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 { @Override diff --git a/buildSrc/src/main/java/org/springframework/security/convention/versions/GitHubApi.java b/buildSrc/src/main/java/org/springframework/security/convention/versions/GitHubApi.java index 74738e2c..e2aeb80e 100644 --- a/buildSrc/src/main/java/org/springframework/security/convention/versions/GitHubApi.java +++ b/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; diff --git a/buildSrc/src/main/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtils.java b/buildSrc/src/main/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtils.java index 66eb8b5f..cc59509f 100644 --- a/buildSrc/src/main/java/org/springframework/security/convention/versions/TransitiveDependencyLookupUtils.java +++ b/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"; diff --git a/buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesExtension.java b/buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesExtension.java index 129d5711..34bb31d5 100644 --- a/buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesExtension.java +++ b/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> files; diff --git a/buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesPlugin.java index 4d9af9ef..5361d551 100644 --- a/buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateDependenciesPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/trang/RncToXsd.java b/buildSrc/src/main/java/trang/RncToXsd.java index 03185d5d..f177081a 100644 --- a/buildSrc/src/main/java/trang/RncToXsd.java +++ b/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. */ diff --git a/buildSrc/src/test/java/io/spring/gradle/TestKit.java b/buildSrc/src/test/java/io/spring/gradle/TestKit.java index 2bc0b35e..e7e0f0af 100644 --- a/buildSrc/src/test/java/io/spring/gradle/TestKit.java +++ b/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; diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java b/buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java index e679be6e..6bcc5fe8 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTests.java +++ b/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 { diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java b/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java index 2aa26a8a..b1e8ed9d 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationPluginTests.java +++ b/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; /** diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationTestPluginITests.java b/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationTestPluginITests.java index 186fc1b2..dc364046 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/IntegrationTestPluginITests.java +++ b/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 { diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/JacocoPluginITests.java b/buildSrc/src/test/java/io/spring/gradle/convention/JacocoPluginITests.java index 59ec16ea..2893d2db 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/JacocoPluginITests.java +++ b/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{ diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITests.java b/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITests.java index cb75429a..b2ad457b 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITests.java +++ b/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 { diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java b/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java index 0c33e1a6..532b0f5b 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginTests.java +++ b/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 */ diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITests.java b/buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITests.java index c7c24821..f696719d 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/ShowcaseITests.java +++ b/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 { diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITests.java b/buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITests.java index 967661ca..0c7685fa 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITests.java +++ b/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 { diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/TestsConfigurationPluginITests.java b/buildSrc/src/test/java/io/spring/gradle/convention/TestsConfigurationPluginITests.java index 0fb82f2b..7ba8559d 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/TestsConfigurationPluginITests.java +++ b/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 { diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/UtilsTests.java b/buildSrc/src/test/java/io/spring/gradle/convention/UtilsTests.java index d3092c88..19a0909a 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/UtilsTests.java +++ b/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 diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/sagan/SaganApiTests.java b/buildSrc/src/test/java/io/spring/gradle/convention/sagan/SaganApiTests.java index f4e8c11c..61168e90 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/sagan/SaganApiTests.java +++ b/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; diff --git a/buildSrc/src/test/java/org/springframework/gradle/antora/CheckAntoraVersionPluginTests.java b/buildSrc/src/test/java/org/springframework/gradle/antora/CheckAntoraVersionPluginTests.java index 81f55025..487a62c6 100644 --- a/buildSrc/src/test/java/org/springframework/gradle/antora/CheckAntoraVersionPluginTests.java +++ b/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; diff --git a/buildSrc/src/test/java/org/springframework/security/convention/versions/DependencyExcludesTests.java b/buildSrc/src/test/java/org/springframework/security/convention/versions/DependencyExcludesTests.java index 4b1aa905..da515af7 100644 --- a/buildSrc/src/test/java/org/springframework/security/convention/versions/DependencyExcludesTests.java +++ b/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 { diff --git a/buildSrc/src/test/resources/samples/integrationtest/withgroovy/src/integration-test/groovy/sample/TheTest.groovy b/buildSrc/src/test/resources/samples/integrationtest/withgroovy/src/integration-test/groovy/sample/TheTest.groovy index d3a9898b..36f17864 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withgroovy/src/integration-test/groovy/sample/TheTest.groovy +++ b/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"() { diff --git a/buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTests.java b/buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTests.java index 8dadf377..d26bd29b 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withjava/src/integration-test/java/sample/TheTests.java +++ b/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 { diff --git a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTests.java b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTests.java index 1eff489f..23edef2b 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTests.java +++ b/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 diff --git a/buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTests.java b/buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTests.java index c387dd40..50729b17 100644 --- a/buildSrc/src/test/resources/samples/jacoco/java/src/test/java/sample/TheClassTests.java +++ b/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(); diff --git a/buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTests.java b/buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTests.java index 9d5ef882..a2296999 100644 --- a/buildSrc/src/test/resources/samples/testsconfiguration/web/src/test/java/sample/DependencyTests.java +++ b/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 diff --git a/core/src/main/java/org/springframework/LdapDataEntry.java b/core/src/main/java/org/springframework/LdapDataEntry.java index ee2d600c..cddd8ab5 100644 --- a/core/src/main/java/org/springframework/LdapDataEntry.java +++ b/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. diff --git a/core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java b/core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java index 095420b6..c153c453 100644 --- a/core/src/main/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecorator.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java b/core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java index 032f2f04..08331476 100644 --- a/core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java +++ b/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; diff --git a/core/src/main/java/org/springframework/ldap/config/DefaultRenamingStrategyParser.java b/core/src/main/java/org/springframework/ldap/config/DefaultRenamingStrategyParser.java index 714ac943..5be60836 100644 --- a/core/src/main/java/org/springframework/ldap/config/DefaultRenamingStrategyParser.java +++ b/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; diff --git a/core/src/main/java/org/springframework/ldap/config/LdapTemplateParser.java b/core/src/main/java/org/springframework/ldap/config/LdapTemplateParser.java index e411c4e7..7bfbbd5e 100644 --- a/core/src/main/java/org/springframework/ldap/config/LdapTemplateParser.java +++ b/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; diff --git a/core/src/main/java/org/springframework/ldap/config/ParserUtils.java b/core/src/main/java/org/springframework/ldap/config/ParserUtils.java index e7441bbd..d7f22d20 100644 --- a/core/src/main/java/org/springframework/ldap/config/ParserUtils.java +++ b/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 */ diff --git a/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java b/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java index 193e6199..aad9c001 100644 --- a/core/src/main/java/org/springframework/ldap/config/TransactionManagerParser.java +++ b/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; diff --git a/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java index 0524e36a..4a0d620b 100644 --- a/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java index c7bfbcdf..6c1ddafc 100644 --- a/core/src/main/java/org/springframework/ldap/control/AbstractRequestControlDirContextProcessor.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java b/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java index 7de7c5c5..ff3ce679 100644 --- a/core/src/main/java/org/springframework/ldap/control/PagedResultsCookie.java +++ b/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}. * diff --git a/core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java b/core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java index c9a4ba48..3ec365f4 100644 --- a/core/src/main/java/org/springframework/ldap/control/PagedResultsRequestControl.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java index c8ae92ba..2d8c4e29 100644 --- a/core/src/main/java/org/springframework/ldap/core/AttributesMapperCallbackHandler.java +++ b/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}, diff --git a/core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java index f7732812..71eecbd7 100644 --- a/core/src/main/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandler.java +++ b/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. * diff --git a/core/src/main/java/org/springframework/ldap/core/ContextMapper.java b/core/src/main/java/org/springframework/ldap/core/ContextMapper.java index 7f6b6031..2c775cfc 100644 --- a/core/src/main/java/org/springframework/ldap/core/ContextMapper.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java b/core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java index 42993499..170e6a9c 100644 --- a/core/src/main/java/org/springframework/ldap/core/ContextMapperCallbackHandler.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/ContextSource.java b/core/src/main/java/org/springframework/ldap/core/ContextSource.java index 2862dd9e..e7756773 100644 --- a/core/src/main/java/org/springframework/ldap/core/ContextSource.java +++ b/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 ContextSource is responsible for configuring and creating * DirContext instances. It is typically used from {@link LdapTemplate} to diff --git a/core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java b/core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java index dba07083..394355ca 100644 --- a/core/src/main/java/org/springframework/ldap/core/DirContextAdapter.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/DirContextOperations.java b/core/src/main/java/org/springframework/ldap/core/DirContextOperations.java index b308b55a..e10293b0 100644 --- a/core/src/main/java/org/springframework/ldap/core/DirContextOperations.java +++ b/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. * diff --git a/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java b/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java index 6d48a88f..0344397f 100644 --- a/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/IncrementalAttributesMapper.java b/core/src/main/java/org/springframework/ldap/core/IncrementalAttributesMapper.java index aafde0d8..1ef7b7d4 100644 --- a/core/src/main/java/org/springframework/ldap/core/IncrementalAttributesMapper.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/IterableNamingEnumeration.java b/core/src/main/java/org/springframework/ldap/core/IterableNamingEnumeration.java index ac405e97..fd1ea43b 100644 --- a/core/src/main/java/org/springframework/ldap/core/IterableNamingEnumeration.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/LdapAttribute.java b/core/src/main/java/org/springframework/ldap/core/LdapAttribute.java index 8fac5369..24fb397f 100644 --- a/core/src/main/java/org/springframework/ldap/core/LdapAttribute.java +++ b/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. diff --git a/core/src/main/java/org/springframework/ldap/core/LdapAttributes.java b/core/src/main/java/org/springframework/ldap/core/LdapAttributes.java index c787c5e6..687b0f37 100644 --- a/core/src/main/java/org/springframework/ldap/core/LdapAttributes.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentification.java b/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentification.java index cef0e7c6..44c49441 100644 --- a/core/src/main/java/org/springframework/ldap/core/LdapEntryIdentification.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/LdapOperations.java b/core/src/main/java/org/springframework/ldap/core/LdapOperations.java index 8eab4cb7..34dd9250 100644 --- a/core/src/main/java/org/springframework/ldap/core/LdapOperations.java +++ b/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. diff --git a/core/src/main/java/org/springframework/ldap/core/LdapRdn.java b/core/src/main/java/org/springframework/ldap/core/LdapRdn.java index 29c03194..17ab533d 100644 --- a/core/src/main/java/org/springframework/ldap/core/LdapRdn.java +++ b/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. * diff --git a/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java b/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java index 01fd4674..e74aef20 100644 --- a/core/src/main/java/org/springframework/ldap/core/LdapRdnComponent.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java index f7b586cf..f926bb38 100644 --- a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java b/core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java index 6a93c822..8cc6fa31 100644 --- a/core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java +++ b/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. diff --git a/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java b/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java index ffa0fe4e..616ddd07 100644 --- a/core/src/main/java/org/springframework/ldap/core/NameAwareAttributes.java +++ b/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. diff --git a/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java index b0b08325..5a6a4fd4 100755 --- a/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java index 71e16e8e..9d865fb9 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/AggregateDirContextProcessor.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java index 750084f9..749c1c69 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessor.java +++ b/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 BeanPostProcessor checks each bean if it implements * {@link BaseLdapNameAware} or {@link BaseLdapPathAware}. If it does, the default context diff --git a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java b/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java index 247bde6a..fcb3a9fb 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/BaseLdapPathSource.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControls.java b/core/src/main/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControls.java index 3acb931a..750da403 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControls.java +++ b/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, diff --git a/core/src/main/java/org/springframework/ldap/core/support/ContextMapperWithControls.java b/core/src/main/java/org/springframework/ldap/core/support/ContextMapperWithControls.java index 6246461c..fc30c682 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/ContextMapperWithControls.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java b/core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java index b6184966..66620d1d 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java b/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java index fec8b12f..d8261288 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java +++ b/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 * Incremental Retrieval of Multi-valued Properties. diff --git a/core/src/main/java/org/springframework/ldap/core/support/DelegatingBaseLdapPathContextSourceSupport.java b/core/src/main/java/org/springframework/ldap/core/support/DelegatingBaseLdapPathContextSourceSupport.java index fae19755..99b15742 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/DelegatingBaseLdapPathContextSourceSupport.java +++ b/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. diff --git a/core/src/main/java/org/springframework/ldap/core/support/DigestMd5DirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/DigestMd5DirContextAuthenticationStrategy.java index 2340ebd6..600840e1 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/DigestMd5DirContextAuthenticationStrategy.java +++ b/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. diff --git a/core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java index 219ee6bb..accdf024 100755 --- a/core/src/main/java/org/springframework/ldap/core/support/DirContextAuthenticationStrategy.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java index 746ba0d2..69dda51c 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/LdapContextSource.java +++ b/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 InitialLdapContext instance. diff --git a/core/src/main/java/org/springframework/ldap/core/support/LookupAttemptingCallback.java b/core/src/main/java/org/springframework/ldap/core/support/LookupAttemptingCallback.java index 10b60a49..fb280832 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/LookupAttemptingCallback.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/support/RangeOption.java b/core/src/main/java/org/springframework/ldap/core/support/RangeOption.java index b8fbff26..5df2e03e 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/RangeOption.java +++ b/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 Incremental Retrieval of Multi-valued diff --git a/core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java index 56c86510..609df4ff 100755 --- a/core/src/main/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategy.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java index 90ddc7d2..02136a95 100644 --- a/core/src/main/java/org/springframework/ldap/core/support/SingleContextSource.java +++ b/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, diff --git a/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java b/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java index 27acc7cb..4ee095b1 100644 --- a/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java +++ b/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: * diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/AttributeMetaData.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/AttributeMetaData.java index 54e6305b..469fc8b9 100755 --- a/core/src/main/java/org/springframework/ldap/odm/core/impl/AttributeMetaData.java +++ b/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. diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java index 7651f448..1ed6cef3 100644 --- a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java +++ b/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; diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/ObjectMetaData.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/ObjectMetaData.java index 2694642e..1307a4ef 100755 --- a/core/src/main/java/org/springframework/ldap/odm/core/impl/ObjectMetaData.java +++ b/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. * diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConversionServiceConverterManager.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConversionServiceConverterManager.java index b66949e8..7761d975 100644 --- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConversionServiceConverterManager.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java index 50c971a4..ad4bd40c 100755 --- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java +++ b/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 spring.xml. diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java index 0b396554..05f9ce69 100755 --- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java +++ b/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}. diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java index bdb9bfe0..f45ef767 100755 --- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java +++ b/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}. diff --git a/core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java b/core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java index 05a52f5e..ec7bb251 100644 --- a/core/src/main/java/org/springframework/ldap/pool/DelegatingContext.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java b/core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java index 4b3a5a23..f781bf1a 100644 --- a/core/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java +++ b/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 diff --git a/core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java b/core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java index 0ee5617d..3cf8bdbe 100644 --- a/core/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java +++ b/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} diff --git a/core/src/main/java/org/springframework/ldap/pool/DirContextType.java b/core/src/main/java/org/springframework/ldap/pool/DirContextType.java index 202ac718..da665e65 100644 --- a/core/src/main/java/org/springframework/ldap/pool/DirContextType.java +++ b/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}. diff --git a/core/src/main/java/org/springframework/ldap/pool/MutableDelegatingLdapContext.java b/core/src/main/java/org/springframework/ldap/pool/MutableDelegatingLdapContext.java index 8d16584d..a9bf43fd 100644 --- a/core/src/main/java/org/springframework/ldap/pool/MutableDelegatingLdapContext.java +++ b/core/src/main/java/org/springframework/ldap/pool/MutableDelegatingLdapContext.java @@ -16,13 +16,14 @@ package org.springframework.ldap.pool; -import org.apache.commons.pool.KeyedObjectPool; -import org.springframework.ldap.pool.factory.MutablePoolingContextSource; - import javax.naming.NamingException; import javax.naming.ldap.Control; import javax.naming.ldap.LdapContext; +import org.apache.commons.pool.KeyedObjectPool; + +import org.springframework.ldap.pool.factory.MutablePoolingContextSource; + /** * Used by {@link MutablePoolingContextSource} to wrap a {@link LdapContext}, delegating * most methods to the underlying context. This class extends diff --git a/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java b/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java index f071ecbe..7fd29f9b 100644 --- a/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java +++ b/core/src/main/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactory.java @@ -15,19 +15,6 @@ */ package org.springframework.ldap.pool.factory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.commons.pool.BaseKeyedPoolableObjectFactory; -import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.core.DirContextProxy; -import org.springframework.ldap.pool.DirContextType; -import org.springframework.ldap.pool.FailureAwareContext; -import org.springframework.ldap.pool.validation.DirContextValidator; -import org.springframework.ldap.support.LdapUtils; -import org.springframework.util.Assert; - -import javax.naming.CommunicationException; -import javax.naming.directory.DirContext; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -36,6 +23,21 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; +import javax.naming.CommunicationException; +import javax.naming.directory.DirContext; + +import org.apache.commons.pool.BaseKeyedPoolableObjectFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.core.DirContextProxy; +import org.springframework.ldap.pool.DirContextType; +import org.springframework.ldap.pool.FailureAwareContext; +import org.springframework.ldap.pool.validation.DirContextValidator; +import org.springframework.ldap.support.LdapUtils; +import org.springframework.util.Assert; + /** * Factory that creates {@link DirContext} instances for pooling via a configured * {@link ContextSource}. The {@link DirContext}s are keyed based on if they are read only diff --git a/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java b/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java index f8160fc2..d6c5e100 100644 --- a/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java +++ b/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java @@ -16,9 +16,15 @@ package org.springframework.ldap.pool.factory; +import java.util.Collection; + +import javax.naming.directory.DirContext; +import javax.naming.ldap.LdapContext; + import org.apache.commons.pool.impl.GenericKeyedObjectPool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.DisposableBean; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.ldap.core.ContextSource; @@ -28,10 +34,6 @@ import org.springframework.ldap.pool.DelegatingLdapContext; import org.springframework.ldap.pool.DirContextType; import org.springframework.ldap.pool.validation.DirContextValidator; -import javax.naming.directory.DirContext; -import javax.naming.ldap.LdapContext; -import java.util.Collection; - /** * A {@link ContextSource} implementation that wraps an object pool and another * {@link ContextSource}. {@link DirContext}s are retrieved from the pool which maintains diff --git a/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java index 6d11eac9..f2ed5b99 100644 --- a/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java +++ b/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java @@ -16,17 +16,18 @@ package org.springframework.ldap.pool.validation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.ldap.pool.DirContextType; -import org.springframework.util.Assert; - import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.ldap.pool.DirContextType; +import org.springframework.util.Assert; + /** * Default {@link DirContext} validator that executes * {@link DirContext#search(String, String, SearchControls)}. The name, filter and diff --git a/core/src/main/java/org/springframework/ldap/pool2/DelegatingContext.java b/core/src/main/java/org/springframework/ldap/pool2/DelegatingContext.java index 676fc68d..f3ea7afb 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/DelegatingContext.java +++ b/core/src/main/java/org/springframework/ldap/pool2/DelegatingContext.java @@ -15,13 +15,21 @@ */ package org.springframework.ldap.pool2; +import java.util.Hashtable; + +import javax.naming.Binding; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NameClassPair; +import javax.naming.NameParser; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; + import org.apache.commons.pool2.KeyedObjectPool; + import org.springframework.ldap.pool2.factory.PooledContextSource; import org.springframework.util.Assert; -import javax.naming.*; -import java.util.Hashtable; - /** * Used by {@link PooledContextSource} to wrap a {@link Context}, delegating most methods * to the underlying context, retains a reference to the pool the context was checked out diff --git a/core/src/main/java/org/springframework/ldap/pool2/DelegatingDirContext.java b/core/src/main/java/org/springframework/ldap/pool2/DelegatingDirContext.java index bcbe702e..96f1fc0f 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/DelegatingDirContext.java +++ b/core/src/main/java/org/springframework/ldap/pool2/DelegatingDirContext.java @@ -15,17 +15,21 @@ */ package org.springframework.ldap.pool2; -import org.apache.commons.pool2.KeyedObjectPool; -import org.springframework.ldap.core.DirContextProxy; -import org.springframework.ldap.pool2.DirContextType; -import org.springframework.ldap.pool2.factory.PooledContextSource; -import org.springframework.util.Assert; - import javax.naming.Context; import javax.naming.Name; import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import javax.naming.directory.*; +import javax.naming.directory.Attributes; +import javax.naming.directory.DirContext; +import javax.naming.directory.ModificationItem; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; + +import org.apache.commons.pool2.KeyedObjectPool; + +import org.springframework.ldap.core.DirContextProxy; +import org.springframework.ldap.pool2.factory.PooledContextSource; +import org.springframework.util.Assert; /** * Used by {@link PooledContextSource} to wrap a {@link DirContext}, delegating most diff --git a/core/src/main/java/org/springframework/ldap/pool2/DelegatingLdapContext.java b/core/src/main/java/org/springframework/ldap/pool2/DelegatingLdapContext.java index 889836cb..f134569c 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/DelegatingLdapContext.java +++ b/core/src/main/java/org/springframework/ldap/pool2/DelegatingLdapContext.java @@ -15,11 +15,6 @@ */ package org.springframework.ldap.pool2; -import org.apache.commons.pool2.KeyedObjectPool; -import org.springframework.ldap.pool2.DirContextType; -import org.springframework.ldap.pool2.factory.PooledContextSource; -import org.springframework.util.Assert; - import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.ldap.Control; @@ -27,6 +22,11 @@ import javax.naming.ldap.ExtendedRequest; import javax.naming.ldap.ExtendedResponse; import javax.naming.ldap.LdapContext; +import org.apache.commons.pool2.KeyedObjectPool; + +import org.springframework.ldap.pool2.factory.PooledContextSource; +import org.springframework.util.Assert; + /** * Used by {@link PooledContextSource} to wrap a {@link LdapContext}, delegating most * methods to the underlying context. This class extends {@link DelegatingDirContext} diff --git a/core/src/main/java/org/springframework/ldap/pool2/DirContextType.java b/core/src/main/java/org/springframework/ldap/pool2/DirContextType.java index 4a4d0b86..4f7d04cb 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/DirContextType.java +++ b/core/src/main/java/org/springframework/ldap/pool2/DirContextType.java @@ -16,10 +16,10 @@ package org.springframework.ldap.pool2; -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}. diff --git a/core/src/main/java/org/springframework/ldap/pool2/MutableDelegatingLdapContext.java b/core/src/main/java/org/springframework/ldap/pool2/MutableDelegatingLdapContext.java index b436d619..c5a0b60c 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/MutableDelegatingLdapContext.java +++ b/core/src/main/java/org/springframework/ldap/pool2/MutableDelegatingLdapContext.java @@ -16,13 +16,14 @@ package org.springframework.ldap.pool2; -import org.apache.commons.pool2.KeyedObjectPool; -import org.springframework.ldap.pool2.factory.MutablePooledContextSource; - import javax.naming.NamingException; import javax.naming.ldap.Control; import javax.naming.ldap.LdapContext; +import org.apache.commons.pool2.KeyedObjectPool; + +import org.springframework.ldap.pool2.factory.MutablePooledContextSource; + /** * Used by {@link MutablePooledContextSource} to wrap a {@link LdapContext}, delegating * most methods to the underlying context. This class extends diff --git a/core/src/main/java/org/springframework/ldap/pool2/factory/DirContextPoolableObjectFactory.java b/core/src/main/java/org/springframework/ldap/pool2/factory/DirContextPoolableObjectFactory.java index dffddf44..69569598 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/factory/DirContextPoolableObjectFactory.java +++ b/core/src/main/java/org/springframework/ldap/pool2/factory/DirContextPoolableObjectFactory.java @@ -15,21 +15,6 @@ */ package org.springframework.ldap.pool2.factory; -import org.apache.commons.pool2.BaseKeyedPooledObjectFactory; -import org.apache.commons.pool2.PooledObject; -import org.apache.commons.pool2.impl.DefaultPooledObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.core.DirContextProxy; -import org.springframework.ldap.pool2.DirContextType; -import org.springframework.ldap.pool2.FailureAwareContext; -import org.springframework.ldap.pool2.validation.DirContextValidator; -import org.springframework.ldap.support.LdapUtils; -import org.springframework.util.Assert; - -import javax.naming.CommunicationException; -import javax.naming.directory.DirContext; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -38,6 +23,23 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; +import javax.naming.CommunicationException; +import javax.naming.directory.DirContext; + +import org.apache.commons.pool2.BaseKeyedPooledObjectFactory; +import org.apache.commons.pool2.PooledObject; +import org.apache.commons.pool2.impl.DefaultPooledObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.core.DirContextProxy; +import org.springframework.ldap.pool2.DirContextType; +import org.springframework.ldap.pool2.FailureAwareContext; +import org.springframework.ldap.pool2.validation.DirContextValidator; +import org.springframework.ldap.support.LdapUtils; +import org.springframework.util.Assert; + /** * Factory that creates {@link DirContext} instances for pooling via a configured * {@link ContextSource}. The {@link DirContext}s are keyed based on if they are read only diff --git a/core/src/main/java/org/springframework/ldap/pool2/factory/MutablePooledContextSource.java b/core/src/main/java/org/springframework/ldap/pool2/factory/MutablePooledContextSource.java index caa69770..9d8be11b 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/factory/MutablePooledContextSource.java +++ b/core/src/main/java/org/springframework/ldap/pool2/factory/MutablePooledContextSource.java @@ -16,14 +16,14 @@ package org.springframework.ldap.pool2.factory; -import org.springframework.dao.DataAccessResourceFailureException; -import org.springframework.ldap.pool2.DirContextType; -import org.springframework.ldap.pool2.DelegatingDirContext; -import org.springframework.ldap.pool2.MutableDelegatingLdapContext; - import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; +import org.springframework.dao.DataAccessResourceFailureException; +import org.springframework.ldap.pool2.DelegatingDirContext; +import org.springframework.ldap.pool2.DirContextType; +import org.springframework.ldap.pool2.MutableDelegatingLdapContext; + /** * A {@link PooledContextSource} subclass that creates * {@link MutableDelegatingLdapContext} instances. This enables the Spring LDAP pooling to diff --git a/core/src/main/java/org/springframework/ldap/pool2/factory/PooledContextSource.java b/core/src/main/java/org/springframework/ldap/pool2/factory/PooledContextSource.java index c9868ce2..bce15b1d 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/factory/PooledContextSource.java +++ b/core/src/main/java/org/springframework/ldap/pool2/factory/PooledContextSource.java @@ -16,22 +16,24 @@ package org.springframework.ldap.pool2.factory; +import java.util.Collection; + +import javax.naming.directory.DirContext; +import javax.naming.ldap.LdapContext; + import org.apache.commons.pool2.impl.GenericKeyedObjectPool; import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.DisposableBean; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.core.support.DelegatingBaseLdapPathContextSourceSupport; -import org.springframework.ldap.pool2.DirContextType; -import org.springframework.ldap.pool2.validation.DirContextValidator; import org.springframework.ldap.pool2.DelegatingDirContext; import org.springframework.ldap.pool2.DelegatingLdapContext; - -import javax.naming.directory.DirContext; -import javax.naming.ldap.LdapContext; -import java.util.Collection; +import org.springframework.ldap.pool2.DirContextType; +import org.springframework.ldap.pool2.validation.DirContextValidator; /** * A {@link ContextSource} implementation that wraps an object pool and another diff --git a/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java index 15bde89d..59222186 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java +++ b/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java @@ -16,17 +16,18 @@ package org.springframework.ldap.pool2.validation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.ldap.pool2.DirContextType; -import org.springframework.util.Assert; - import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.ldap.pool2.DirContextType; +import org.springframework.util.Assert; + /** * Default {@link DirContext} validator that executes * {@link DirContext#search(String, String, SearchControls)}. The name, filter and diff --git a/core/src/main/java/org/springframework/ldap/pool2/validation/DirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool2/validation/DirContextValidator.java index 0f1e1405..21c2403e 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/validation/DirContextValidator.java +++ b/core/src/main/java/org/springframework/ldap/pool2/validation/DirContextValidator.java @@ -16,11 +16,11 @@ package org.springframework.ldap.pool2.validation; +import javax.naming.directory.DirContext; + import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.pool2.DirContextType; -import javax.naming.directory.DirContext; - /** * A validator for {@link DirContext}s. * diff --git a/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java b/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java index 27be629f..d882e89a 100644 --- a/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java +++ b/core/src/main/java/org/springframework/ldap/query/DefaultContainerCriteria.java @@ -16,12 +16,13 @@ package org.springframework.ldap.query; -import org.springframework.ldap.filter.Filter; - -import javax.naming.Name; import java.util.LinkedHashSet; import java.util.Set; +import javax.naming.Name; + +import org.springframework.ldap.filter.Filter; + import static org.springframework.ldap.query.CriteriaContainerType.AND; import static org.springframework.ldap.query.CriteriaContainerType.OR; diff --git a/core/src/main/java/org/springframework/ldap/query/LdapQuery.java b/core/src/main/java/org/springframework/ldap/query/LdapQuery.java index 25b992c9..d6e079bf 100644 --- a/core/src/main/java/org/springframework/ldap/query/LdapQuery.java +++ b/core/src/main/java/org/springframework/ldap/query/LdapQuery.java @@ -16,10 +16,10 @@ package org.springframework.ldap.query; -import org.springframework.ldap.filter.Filter; - import javax.naming.Name; +import org.springframework.ldap.filter.Filter; + /** * Holds all information regarding a Ldap query to be performed. Contains information * regarding search base, search scope, time and count limits, and search filter. diff --git a/core/src/main/java/org/springframework/ldap/query/LdapQueryBuilder.java b/core/src/main/java/org/springframework/ldap/query/LdapQueryBuilder.java index a1552709..461a5092 100644 --- a/core/src/main/java/org/springframework/ldap/query/LdapQueryBuilder.java +++ b/core/src/main/java/org/springframework/ldap/query/LdapQueryBuilder.java @@ -16,15 +16,16 @@ package org.springframework.ldap.query; +import java.text.MessageFormat; + +import javax.naming.Name; + import org.springframework.ldap.filter.Filter; import org.springframework.ldap.filter.HardcodedFilter; import org.springframework.ldap.support.LdapEncoder; import org.springframework.ldap.support.LdapUtils; import org.springframework.util.Assert; -import javax.naming.Name; -import java.text.MessageFormat; - /** * Builder of LdapQueries. Start with a call to {@link #query()}, proceed with specifying * the basic search configuration (e.g. search base, time limit, etc.), finally specify diff --git a/core/src/main/java/org/springframework/ldap/support/LdapNameBuilder.java b/core/src/main/java/org/springframework/ldap/support/LdapNameBuilder.java index e4968814..aa66f521 100644 --- a/core/src/main/java/org/springframework/ldap/support/LdapNameBuilder.java +++ b/core/src/main/java/org/springframework/ldap/support/LdapNameBuilder.java @@ -16,13 +16,13 @@ package org.springframework.ldap.support; -import org.springframework.util.Assert; - import javax.naming.InvalidNameException; import javax.naming.Name; import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; +import org.springframework.util.Assert; + /** * Helper class for building {@link javax.naming.ldap.LdapName} instances. * diff --git a/core/src/main/java/org/springframework/ldap/support/LdapUtils.java b/core/src/main/java/org/springframework/ldap/support/LdapUtils.java index adedab99..39e4670f 100644 --- a/core/src/main/java/org/springframework/ldap/support/LdapUtils.java +++ b/core/src/main/java/org/springframework/ldap/support/LdapUtils.java @@ -16,11 +16,11 @@ package org.springframework.ldap.support; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.ldap.NamingException; -import org.springframework.ldap.NoSuchAttributeException; -import org.springframework.util.Assert; +import java.math.BigInteger; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.NoSuchElementException; import javax.naming.CompositeName; import javax.naming.InvalidNameException; @@ -32,11 +32,13 @@ import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; -import java.math.BigInteger; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.NoSuchElementException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.ldap.NamingException; +import org.springframework.ldap.NoSuchAttributeException; +import org.springframework.util.Assert; /** * Generic utility methods for working with LDAP. Mainly for internal use within the diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java index 09683458..6a008d7c 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/BindOperationExecutor.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.transaction.compensating; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.ldap.core.LdapOperations; -import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; - import javax.naming.Name; import javax.naming.directory.Attributes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.ldap.core.LdapOperations; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; + /** * A {@link CompensatingTransactionOperationExecutor} to manage a bind operation. Performs * a bind in {@link #performOperation()}, a corresponding unbind in {@link #rollback()}, diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java index 58e9b82f..b0990e5c 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactory.java @@ -15,8 +15,11 @@ */ package org.springframework.ldap.transaction.compensating; +import javax.naming.directory.DirContext; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.ldap.core.LdapOperations; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.core.support.SingleContextSource; @@ -24,8 +27,6 @@ import org.springframework.transaction.compensating.CompensatingTransactionOpera import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; import org.springframework.util.ObjectUtils; -import javax.naming.directory.DirContext; - /** * {@link CompensatingTransactionOperationRecorder} implementation for LDAP operations. * diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java index 2600c9fb..73683356 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtils.java @@ -15,12 +15,12 @@ */ package org.springframework.ldap.transaction.compensating; +import javax.naming.Name; + import org.springframework.ldap.support.LdapUtils; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -import javax.naming.Name; - /** * Utility methods for working with LDAP transactions. * diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java index 42d0f0af..0360e07c 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutor.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.transaction.compensating; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.ldap.core.LdapOperations; -import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; - import javax.naming.Name; import javax.naming.directory.ModificationItem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.ldap.core.LdapOperations; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; + /** * A {@link CompensatingTransactionOperationExecutor} to manage a * modifyAttributes operation. Performs a modifyAttributes in diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java index 4b4304f5..ae6c529b 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorder.java @@ -16,13 +16,8 @@ package org.springframework.ldap.transaction.compensating; -import org.springframework.ldap.core.AttributesMapper; -import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.core.support.DefaultIncrementalAttributesMapper; -import org.springframework.ldap.core.IncrementalAttributesMapper; -import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; -import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; -import org.springframework.util.Assert; +import java.util.HashSet; +import java.util.Set; import javax.naming.Name; import javax.naming.directory.Attribute; @@ -30,8 +25,14 @@ import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttribute; import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; -import java.util.HashSet; -import java.util.Set; + +import org.springframework.ldap.core.AttributesMapper; +import org.springframework.ldap.core.IncrementalAttributesMapper; +import org.springframework.ldap.core.LdapOperations; +import org.springframework.ldap.core.support.DefaultIncrementalAttributesMapper; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; +import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; +import org.springframework.util.Assert; /** * A {@link CompensatingTransactionOperationRecorder} keeping track of modifyAttributes diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java index 9cf1f9ea..4b7ab2a1 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/NullOperationExecutor.java @@ -17,6 +17,7 @@ package org.springframework.ldap.transaction.compensating; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; /** diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java index d7ab4b02..cc45d78c 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutor.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.transaction.compensating; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.ldap.core.LdapOperations; -import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; - import javax.naming.Name; import javax.naming.directory.Attributes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.ldap.core.LdapOperations; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; + /** * A {@link CompensatingTransactionOperationExecutor} to manage a rebind operation. The * methods in this class do not behave as expected, since it might be impossible to diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java index 2dd81274..91107564 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutor.java @@ -15,13 +15,14 @@ */ package org.springframework.ldap.transaction.compensating; +import javax.naming.Name; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.ldap.core.LdapOperations; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; -import javax.naming.Name; - /** * A {@link CompensatingTransactionOperationExecutor} to manage a rename operation. * Performs a rename operation in {@link #performOperation()}, a negating rename in diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java index 75bd210d..c3771e09 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorder.java @@ -15,15 +15,16 @@ */ package org.springframework.ldap.transaction.compensating; +import javax.naming.Name; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.ldap.core.LdapOperations; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; import org.springframework.util.Assert; -import javax.naming.Name; - /** * A {@link CompensatingTransactionOperationRecorder} for keeping track of rename * operations. Creates {@link RenameOperationExecutor} objects for rolling back. diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java index 9654427b..cbd7c366 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutor.java @@ -15,13 +15,14 @@ */ package org.springframework.ldap.transaction.compensating; +import javax.naming.Name; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.ldap.core.LdapOperations; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; -import javax.naming.Name; - /** * A {@link CompensatingTransactionOperationExecutor} to manage an unbind operation. The * methods in this class do not behave as expected, since it might be impossible to diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java index 9107016d..76a97002 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerDelegate.java @@ -16,8 +16,12 @@ package org.springframework.ldap.transaction.compensating.manager; +import javax.naming.NamingException; +import javax.naming.directory.DirContext; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.core.support.AbstractContextSource; import org.springframework.ldap.transaction.compensating.LdapCompensatingTransactionOperationFactory; @@ -28,9 +32,6 @@ import org.springframework.transaction.compensating.support.CompensatingTransact import org.springframework.transaction.compensating.support.DefaultCompensatingTransactionOperationManager; import org.springframework.util.Assert; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; - /** * This delegate performs all the work for the {@link ContextSourceTransactionManager}. * The work is delegated in order to be able to perform the exact same work for the LDAP diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java index 8059493d..df445d5e 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxy.java @@ -15,15 +15,16 @@ */ package org.springframework.ldap.transaction.compensating.manager; +import java.lang.reflect.Proxy; + +import javax.naming.directory.DirContext; + import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.core.DirContextProxy; import org.springframework.ldap.core.support.DelegatingBaseLdapPathContextSourceSupport; import org.springframework.ldap.support.LdapUtils; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.naming.directory.DirContext; -import java.lang.reflect.Proxy; - /** * A proxy for ContextSource to make sure that the returned DirContext objects are aware * of the surrounding transactions. This makes sure that the DirContext is not closed diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java index 0ee72ec7..e1f4d1b8 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandler.java @@ -15,19 +15,21 @@ */ package org.springframework.ldap.transaction.compensating.manager; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import javax.naming.directory.DirContext; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.ldap.NamingException; import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.transaction.compensating.LdapTransactionUtils; import org.springframework.transaction.compensating.support.CompensatingTransactionUtils; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.naming.directory.DirContext; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - /** * Proxy implementation for DirContext, making sure that the instance is not closed during * a transaction, and that all modifying operations are recorded, storing compensating diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java index bc1e881b..af33ac89 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategy.java @@ -15,14 +15,14 @@ */ package org.springframework.ldap.transaction.compensating.support; -import org.springframework.ldap.support.LdapUtils; -import org.springframework.ldap.transaction.compensating.TempEntryRenamingStrategy; - import javax.naming.InvalidNameException; import javax.naming.Name; import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; +import org.springframework.ldap.support.LdapUtils; +import org.springframework.ldap.transaction.compensating.TempEntryRenamingStrategy; + /** * Default implementation of {@link TempEntryRenamingStrategy}. This implementation simply * adds "_temp" to the leftmost (least significant part) of the name. For example: diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java index 59ec98aa..34f005fe 100644 --- a/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java +++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategy.java @@ -16,13 +16,14 @@ package org.springframework.ldap.transaction.compensating.support; -import org.springframework.ldap.support.LdapUtils; -import org.springframework.ldap.transaction.compensating.TempEntryRenamingStrategy; +import java.util.concurrent.atomic.AtomicInteger; import javax.naming.InvalidNameException; import javax.naming.Name; import javax.naming.ldap.LdapName; -import java.util.concurrent.atomic.AtomicInteger; + +import org.springframework.ldap.support.LdapUtils; +import org.springframework.ldap.transaction.compensating.TempEntryRenamingStrategy; /** * A {@link TempEntryRenamingStrategy} that moves the entry to a different subtree than diff --git a/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java b/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java index 30c03de4..0b5f5bab 100644 --- a/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java +++ b/core/src/main/java/org/springframework/transaction/compensating/support/AbstractCompensatingTransactionManagerDelegate.java @@ -17,6 +17,7 @@ package org.springframework.transaction.compensating.support; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.transaction.CannotCreateTransactionException; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; diff --git a/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java index 16389c17..2bd1e4e9 100644 --- a/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java +++ b/core/src/main/java/org/springframework/transaction/compensating/support/CompensatingTransactionUtils.java @@ -16,12 +16,12 @@ package org.springframework.transaction.compensating.support; -import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; -import org.springframework.transaction.support.TransactionSynchronizationManager; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; +import org.springframework.transaction.support.TransactionSynchronizationManager; + /** * Common methods for use with compensating transactions. * diff --git a/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java b/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java index 14face0b..2b4c9f0c 100644 --- a/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java +++ b/core/src/main/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManager.java @@ -15,16 +15,17 @@ */ package org.springframework.transaction.compensating.support; +import java.util.Stack; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.transaction.TransactionSystemException; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; import org.springframework.transaction.compensating.CompensatingTransactionOperationFactory; import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; -import java.util.Stack; - /** * Default implementation of {@link CompensatingTransactionOperationManager}. Manages a * stack of {@link CompensatingTransactionOperationExecutor} objects and performs rollback diff --git a/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java b/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java index 8fc70795..ac1a7f69 100644 --- a/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java +++ b/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java @@ -15,15 +15,16 @@ */ package org.springframework.ldap; -import org.junit.Test; - -import javax.naming.directory.InitialDirContext; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import javax.naming.directory.InitialDirContext; + +import org.junit.Test; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java b/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java index db6662d8..b386272c 100644 --- a/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java +++ b/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java @@ -17,6 +17,7 @@ package org.springframework.ldap.authentication; import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.core.AuthenticationSource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationStrategy.java b/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationStrategy.java index 588c44aa..1fc61174 100644 --- a/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationStrategy.java +++ b/core/src/test/java/org/springframework/ldap/config/DummyAuthenticationStrategy.java @@ -16,11 +16,12 @@ package org.springframework.ldap.config; -import org.springframework.ldap.core.support.DirContextAuthenticationStrategy; +import java.util.Hashtable; import javax.naming.NamingException; import javax.naming.directory.DirContext; -import java.util.Hashtable; + +import org.springframework.ldap.core.support.DirContextAuthenticationStrategy; /** * @author Mattias Hellborg Arthursson diff --git a/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java b/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java index ebad5ec4..7d4545e6 100644 --- a/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java +++ b/core/src/test/java/org/springframework/ldap/config/LdapTemplateNamespaceHandlerTests.java @@ -16,9 +16,20 @@ package org.springframework.ldap.config; +import java.lang.management.ManagementFactory; +import java.lang.reflect.Field; +import java.util.Set; + +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.naming.CannotProceedException; +import javax.naming.CommunicationException; +import javax.naming.directory.SearchControls; + import org.apache.commons.pool.impl.GenericKeyedObjectPool; import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig; import org.junit.Test; + import org.springframework.beans.BeansException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.ldap.core.AuthenticationSource; @@ -39,17 +50,8 @@ import org.springframework.ldap.transaction.compensating.support.DifferentSubtre import org.springframework.transaction.PlatformTransactionManager; import org.springframework.util.ReflectionUtils; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.naming.CannotProceedException; -import javax.naming.CommunicationException; -import javax.naming.directory.SearchControls; -import java.lang.management.ManagementFactory; -import java.lang.reflect.Field; -import java.util.Set; - -import static org.junit.Assert.assertArrayEquals; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertArrayEquals; /** * @author Mattias Hellborg Arthursson diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java b/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java index c0276884..5679c548 100644 --- a/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java +++ b/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java @@ -15,13 +15,14 @@ */ package org.springframework.ldap.control; -import com.gargoylesoftware.base.testing.EqualsTester; -import org.junit.Test; - -import javax.naming.ldap.PagedResultsControl; import java.util.LinkedList; import java.util.List; +import javax.naming.ldap.PagedResultsControl; + +import com.gargoylesoftware.base.testing.EqualsTester; +import org.junit.Test; + /** * Unit tests for the PagedResult class. {@link PagedResultsControl} * diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java index 85231e9b..92480158 100644 --- a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java +++ b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java @@ -15,6 +15,13 @@ */ package org.springframework.ldap.control; +import java.io.IOException; + +import javax.naming.ldap.Control; +import javax.naming.ldap.LdapContext; +import javax.naming.ldap.PagedResultsControl; +import javax.naming.ldap.PagedResultsResponseControl; + import com.sun.jndi.ldap.Ber; import com.sun.jndi.ldap.BerDecoder; import com.sun.jndi.ldap.BerEncoder; @@ -23,12 +30,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import javax.naming.ldap.Control; -import javax.naming.ldap.LdapContext; -import javax.naming.ldap.PagedResultsControl; -import javax.naming.ldap.PagedResultsResponseControl; -import java.io.IOException; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java index 0d42b9bb..90ca4719 100644 --- a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java +++ b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java @@ -15,15 +15,15 @@ */ package org.springframework.ldap.control; -import javax.naming.ldap.SortControl; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.ldap.Control; import javax.naming.ldap.LdapContext; +import javax.naming.ldap.SortControl; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java index 3c3a30b0..3831a617 100644 --- a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java +++ b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java @@ -15,6 +15,13 @@ */ package org.springframework.ldap.control; +import java.io.IOException; + +import javax.naming.ldap.Control; +import javax.naming.ldap.LdapContext; +import javax.naming.ldap.SortControl; +import javax.naming.ldap.SortResponseControl; + import com.sun.jndi.ldap.Ber; import com.sun.jndi.ldap.BerDecoder; import com.sun.jndi.ldap.BerEncoder; @@ -22,12 +29,6 @@ import com.sun.jndi.ldap.ctl.DirSyncResponseControl; import org.junit.Before; import org.junit.Test; -import javax.naming.ldap.Control; -import javax.naming.ldap.LdapContext; -import javax.naming.ldap.SortControl; -import javax.naming.ldap.SortResponseControl; -import java.io.IOException; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java index 624dc1f2..79f73d99 100644 --- a/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java +++ b/core/src/test/java/org/springframework/ldap/core/CollectingNameClassPairCallbackHandlerTests.java @@ -16,15 +16,15 @@ package org.springframework.ldap.core; -import org.junit.Before; -import org.junit.Test; +import java.util.List; import javax.naming.NameClassPair; import javax.naming.NamingException; -import java.util.List; + +import org.junit.Before; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertSame; public class CollectingNameClassPairCallbackHandlerTests { diff --git a/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java index 470d4bc5..f8ec2be9 100644 --- a/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java +++ b/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java @@ -15,12 +15,12 @@ */ package org.springframework.ldap.core; -import org.junit.Before; -import org.junit.Test; - import javax.naming.Binding; import javax.naming.NamingException; +import org.junit.Before; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java index 2f4c38bc..1dfce613 100644 --- a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java +++ b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java @@ -15,13 +15,14 @@ */ package org.springframework.ldap.core; -import org.junit.Test; -import org.springframework.ldap.support.LdapUtils; - import javax.naming.Name; import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttributes; +import org.junit.Test; + +import org.springframework.ldap.support.LdapUtils; + import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java index 7e6893f8..185e82a9 100644 --- a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java +++ b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTests.java @@ -16,9 +16,8 @@ package org.springframework.ldap.core; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.support.LdapUtils; +import java.util.Iterator; +import java.util.SortedSet; import javax.naming.CompositeName; import javax.naming.Name; @@ -30,8 +29,11 @@ import javax.naming.directory.BasicAttributes; import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; import javax.naming.ldap.LdapName; -import java.util.Iterator; -import java.util.SortedSet; + +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.support.LdapUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java index 72de452b..6bc526d3 100644 --- a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java +++ b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTests.java @@ -16,14 +16,16 @@ package org.springframework.ldap.core; -import com.gargoylesoftware.base.testing.EqualsTester; -import org.junit.Test; -import org.springframework.ldap.BadLdapGrammarException; +import java.util.Enumeration; import javax.naming.CompositeName; import javax.naming.InvalidNameException; import javax.naming.Name; -import java.util.Enumeration; + +import com.gargoylesoftware.base.testing.EqualsTester; +import org.junit.Test; + +import org.springframework.ldap.BadLdapGrammarException; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java b/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java index 5be3893a..30beaf0d 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java +++ b/core/src/test/java/org/springframework/ldap/core/LdapRdnTests.java @@ -18,6 +18,7 @@ package org.springframework.ldap.core; import com.gargoylesoftware.base.testing.EqualsTester; import org.junit.Test; + import org.springframework.ldap.BadLdapGrammarException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java index cf287383..d9ab1a8a 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java +++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateListTests.java @@ -16,10 +16,7 @@ package org.springframework.ldap.core; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.LimitExceededException; -import org.springframework.ldap.PartialResultException; +import java.util.List; import javax.naming.Binding; import javax.naming.Name; @@ -28,7 +25,12 @@ import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; -import java.util.List; + +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.LimitExceededException; +import org.springframework.ldap.PartialResultException; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java index 5b73911a..802f6510 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java +++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateLookupTests.java @@ -16,12 +16,6 @@ package org.springframework.ldap.core; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.util.Collections; import javax.naming.Name; @@ -33,10 +27,17 @@ import javax.naming.ldap.LdapName; import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.odm.core.ObjectDirectoryMapper; import org.springframework.ldap.support.LdapUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class LdapTemplateLookupTests { private static final String DEFAULT_BASE_STRING = "o=example.com"; diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java index d50422ed..21a0fc3d 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java +++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateOdmTests.java @@ -2,6 +2,7 @@ package org.springframework.ldap.core; import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.odm.core.ObjectDirectoryMapper; import static org.mockito.ArgumentMatchers.any; diff --git a/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java b/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java index 8ff3c30d..976bdd90 100644 --- a/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java +++ b/core/src/test/java/org/springframework/ldap/core/LdapTemplateRenameTests.java @@ -16,15 +16,16 @@ package org.springframework.ldap.core; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.NameAlreadyBoundException; -import org.springframework.ldap.UncategorizedLdapException; - import javax.naming.Name; import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.NameAlreadyBoundException; +import org.springframework.ldap.UncategorizedLdapException; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.doThrow; diff --git a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java index 04e2191d..b6bcb34b 100644 --- a/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java +++ b/core/src/test/java/org/springframework/ldap/core/NameAwareAttributeTests.java @@ -16,14 +16,15 @@ package org.springframework.ldap.core; -import org.junit.Test; -import org.springframework.ldap.support.LdapUtils; - import javax.naming.InvalidNameException; import javax.naming.Name; import javax.naming.NamingException; import javax.naming.ldap.LdapName; +import org.junit.Test; + +import org.springframework.ldap.support.LdapUtils; + import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertTrue; diff --git a/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java b/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java index 400a037c..d1988a47 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/AbstractContextSourceTests.java @@ -16,11 +16,11 @@ package org.springframework.ldap.core.support; -import org.junit.Test; - import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java index 92af7dcf..03e6fa6a 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java @@ -15,11 +15,12 @@ */ package org.springframework.ldap.core.support; +import javax.naming.NamingException; + import org.junit.Before; import org.junit.Test; -import org.springframework.ldap.core.DirContextProcessor; -import javax.naming.NamingException; +import org.springframework.ldap.core.DirContextProcessor; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java b/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java index 1e813c77..779c13ea 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java @@ -15,15 +15,16 @@ */ package org.springframework.ldap.core.support; +import java.util.HashMap; + import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.ApplicationContext; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.support.LdapUtils; -import java.util.HashMap; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java b/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java index b77b7c40..6e1e3f6d 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/ContextMapperCallbackHandlerWithControlsTests.java @@ -16,15 +16,16 @@ package org.springframework.ldap.core.support; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.core.ObjectRetrievalException; - import javax.naming.Binding; import javax.naming.NamingException; import javax.naming.ldap.Control; import javax.naming.ldap.HasControls; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.core.ObjectRetrievalException; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java index 514d4186..8c2ea608 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java @@ -15,11 +15,11 @@ */ package org.springframework.ldap.core.support; +import javax.naming.directory.SearchResult; + import org.junit.Before; import org.junit.Test; -import javax.naming.directory.SearchResult; - import static org.assertj.core.api.Assertions.assertThat; public class CountNameClassPairResultCallbackHandlerTests { diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java index 4de4334a..c4f28a3d 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java @@ -15,11 +15,7 @@ */ package org.springframework.ldap.core.support; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.core.DirContextAdapter; -import org.springframework.ldap.core.NameAwareAttributes; -import org.springframework.ldap.support.LdapUtils; +import java.util.Hashtable; import javax.naming.CompositeName; import javax.naming.Context; @@ -27,7 +23,13 @@ import javax.naming.InvalidNameException; import javax.naming.Name; import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttributes; -import java.util.Hashtable; + +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.core.DirContextAdapter; +import org.springframework.ldap.core.NameAwareAttributes; +import org.springframework.ldap.support.LdapUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java index 9b2991a1..56b27cb8 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapperTests.java @@ -16,14 +16,14 @@ package org.springframework.ldap.core.support; -import org.junit.Before; -import org.junit.Test; - import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttribute; import javax.naming.directory.BasicAttributes; +import org.junit.Before; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java b/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java index ac8962fb..dc17f781 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTests.java @@ -16,14 +16,16 @@ package org.springframework.ldap.core.support; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.support.LdapUtils; - -import javax.naming.Context; import java.util.HashMap; import java.util.Hashtable; +import javax.naming.Context; + +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.support.LdapUtils; + import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java b/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java index 5f1ac8f7..372757e1 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java @@ -15,11 +15,12 @@ */ package org.springframework.ldap.core.support; -import org.junit.Before; -import org.junit.Test; +import java.util.Hashtable; import javax.naming.Context; -import java.util.Hashtable; + +import org.junit.Before; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java b/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java index 0085d22a..06d88306 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/SingleContextSourceTests.java @@ -16,18 +16,19 @@ package org.springframework.ldap.core.support; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.core.ContextExecutor; -import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.core.LdapOperations; -import org.springframework.util.ReflectionUtils; +import java.lang.reflect.Field; +import java.lang.reflect.Proxy; import javax.naming.NamingException; import javax.naming.directory.DirContext; -import java.lang.reflect.Field; -import java.lang.reflect.Proxy; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.core.ContextExecutor; +import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.core.LdapOperations; +import org.springframework.util.ReflectionUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java b/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java index 803ccfa9..97ef962e 100644 --- a/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java +++ b/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java @@ -21,6 +21,7 @@ import javax.naming.NamingException; import javax.naming.directory.DirContext; import org.junit.Test; + import org.springframework.ldap.core.support.AbstractContextSource; /** diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java index a563659e..f121b514 100644 --- a/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java +++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java @@ -15,10 +15,15 @@ */ package org.springframework.ldap.odm.core.impl; -import org.springframework.ldap.odm.annotations.*; +import java.util.List; import javax.naming.Name; -import java.util.List; + +import org.springframework.ldap.odm.annotations.Attribute; +import org.springframework.ldap.odm.annotations.DnAttribute; +import org.springframework.ldap.odm.annotations.Entry; +import org.springframework.ldap.odm.annotations.Id; +import org.springframework.ldap.odm.annotations.Transient; /** * @author Rob Winch diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java index 1346c643..fab008d4 100644 --- a/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java +++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapperTests.java @@ -1,8 +1,5 @@ package org.springframework.ldap.odm.core.impl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.ldap.query.LdapQueryBuilder.query; - import java.lang.reflect.Field; import java.util.Arrays; @@ -14,11 +11,15 @@ import org.junit.runner.RunWith; import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.core.SpringVersion; import org.springframework.ldap.support.LdapUtils; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.ldap.query.LdapQueryBuilder.query; + /** * @author Mattias Hellborg Arthursson */ diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedAndUnindexedDnAttributes.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedAndUnindexedDnAttributes.java index d8c92d62..7c9eb6fc 100644 --- a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedAndUnindexedDnAttributes.java +++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedAndUnindexedDnAttributes.java @@ -16,12 +16,12 @@ package org.springframework.ldap.odm.core.impl; +import javax.naming.Name; + import org.springframework.ldap.odm.annotations.DnAttribute; import org.springframework.ldap.odm.annotations.Entry; import org.springframework.ldap.odm.annotations.Id; -import javax.naming.Name; - /** * @author Mattias Hellborg Arthursson */ diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java index 374db477..4e82f0b8 100644 --- a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java +++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithIndexedDnAttributes.java @@ -16,12 +16,12 @@ package org.springframework.ldap.odm.core.impl; +import javax.naming.Name; + import org.springframework.ldap.odm.annotations.DnAttribute; import org.springframework.ldap.odm.annotations.Entry; import org.springframework.ldap.odm.annotations.Id; -import javax.naming.Name; - /** * @author Mattias Hellborg Arthursson */ diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithInvalidFieldType.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithInvalidFieldType.java index 4f5ef9d5..bf016153 100644 --- a/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithInvalidFieldType.java +++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/UnitTestPersonWithInvalidFieldType.java @@ -16,12 +16,12 @@ package org.springframework.ldap.odm.core.impl; +import javax.naming.Name; + import org.springframework.ldap.odm.annotations.Attribute; import org.springframework.ldap.odm.annotations.Entry; import org.springframework.ldap.odm.annotations.Id; -import javax.naming.Name; - /** * @author Mattias Hellborg Arthursson */ diff --git a/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java b/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java index 5b36ac43..a7db16bc 100644 --- a/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java +++ b/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java @@ -15,15 +15,16 @@ */ package org.springframework.ldap.pool; -import org.apache.commons.pool.KeyedObjectPool; -import org.junit.Before; -import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.pool.validation.DirContextValidator; - import javax.naming.Context; import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; +import org.apache.commons.pool.KeyedObjectPool; +import org.junit.Before; + +import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.pool.validation.DirContextValidator; + import static org.mockito.Mockito.mock; /** diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java index ce27a8c2..a2fe4551 100644 --- a/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java +++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java @@ -15,13 +15,13 @@ */ package org.springframework.ldap.pool; -import org.apache.commons.pool.KeyedObjectPool; -import org.junit.Test; - import javax.naming.Context; import javax.naming.Name; import javax.naming.NamingException; +import org.apache.commons.pool.KeyedObjectPool; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.doThrow; diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java index ebe00ad3..ca3a1ddc 100644 --- a/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java +++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java @@ -15,15 +15,15 @@ */ package org.springframework.ldap.pool; -import org.apache.commons.pool.KeyedObjectPool; -import org.junit.Test; - import javax.naming.Context; import javax.naming.Name; import javax.naming.NamingException; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; +import org.apache.commons.pool.KeyedObjectPool; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java index 2b65338c..714ac3c8 100644 --- a/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java +++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java @@ -15,13 +15,13 @@ */ package org.springframework.ldap.pool; -import org.apache.commons.pool.KeyedObjectPool; -import org.junit.Test; - import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; +import org.apache.commons.pool.KeyedObjectPool; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java index 68735ab2..3d3d4ca2 100644 --- a/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java +++ b/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java @@ -15,20 +15,21 @@ */ package org.springframework.ldap.pool.factory; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Proxy; + +import javax.naming.directory.DirContext; + import org.junit.Test; import org.mockito.Mockito; + import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.pool.AbstractPoolTestCase; import org.springframework.ldap.pool.DirContextType; import org.springframework.ldap.pool.validation.DirContextValidator; import org.springframework.util.ReflectionUtils; -import javax.naming.directory.DirContext; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.doThrow; diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java index 6714e5bb..c38d02d1 100644 --- a/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java +++ b/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java @@ -15,12 +15,13 @@ */ package org.springframework.ldap.pool.factory; +import javax.naming.directory.DirContext; + import org.junit.Test; + import org.springframework.ldap.pool.AbstractPoolTestCase; import org.springframework.ldap.pool.MutableDelegatingLdapContext; -import javax.naming.directory.DirContext; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java index 56113956..1a3ec4fd 100644 --- a/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java +++ b/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java @@ -15,16 +15,17 @@ */ package org.springframework.ldap.pool.factory; +import javax.naming.directory.DirContext; +import javax.naming.ldap.LdapContext; + import org.apache.commons.pool.impl.GenericKeyedObjectPool; import org.junit.Test; + import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.pool.AbstractPoolTestCase; import org.springframework.ldap.pool.validation.DirContextValidator; -import javax.naming.directory.DirContext; -import javax.naming.ldap.LdapContext; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java index 53c4fbbc..c64c3870 100644 --- a/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java +++ b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java @@ -15,15 +15,16 @@ */ package org.springframework.ldap.pool.validation; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.pool.DirContextType; - import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.pool.DirContextType; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java b/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java index ba8bb012..8154168a 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java +++ b/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java @@ -15,15 +15,16 @@ */ package org.springframework.ldap.pool2; -import org.apache.commons.pool2.KeyedObjectPool; -import org.junit.Before; -import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.pool2.validation.DirContextValidator; - import javax.naming.Context; import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; +import org.apache.commons.pool2.KeyedObjectPool; +import org.junit.Before; + +import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.pool2.validation.DirContextValidator; + import static org.mockito.Mockito.mock; /** diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java index aef1f014..46528782 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java +++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java @@ -15,17 +15,17 @@ */ package org.springframework.ldap.pool2; -import org.apache.commons.pool2.KeyedObjectPool; -import org.junit.Test; - import javax.naming.Context; import javax.naming.Name; import javax.naming.NamingException; +import org.apache.commons.pool2.KeyedObjectPool; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java index 751fc064..41b05bc9 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java +++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java @@ -15,15 +15,15 @@ */ package org.springframework.ldap.pool2; -import org.apache.commons.pool2.KeyedObjectPool; -import org.junit.Test; - import javax.naming.Context; import javax.naming.Name; import javax.naming.NamingException; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; +import org.apache.commons.pool2.KeyedObjectPool; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java index d5414bab..95c8b48c 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java +++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java @@ -15,13 +15,13 @@ */ package org.springframework.ldap.pool2; -import org.apache.commons.pool2.KeyedObjectPool; -import org.junit.Test; - import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; +import org.apache.commons.pool2.KeyedObjectPool; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java index a131adac..dab65937 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java +++ b/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java @@ -15,21 +15,22 @@ */ package org.springframework.ldap.pool2.factory; -import org.apache.commons.pool2.PooledObject; -import org.apache.commons.pool2.impl.DefaultPooledObject; -import org.junit.Test; -import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.pool2.DirContextType; -import org.springframework.ldap.pool2.validation.DirContextValidator; -import org.springframework.ldap.pool2.AbstractPoolTestCase; -import org.springframework.util.ReflectionUtils; - -import javax.naming.directory.DirContext; - import java.lang.reflect.Field; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; +import javax.naming.directory.DirContext; + +import org.apache.commons.pool2.PooledObject; +import org.apache.commons.pool2.impl.DefaultPooledObject; +import org.junit.Test; + +import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.pool2.AbstractPoolTestCase; +import org.springframework.ldap.pool2.DirContextType; +import org.springframework.ldap.pool2.validation.DirContextValidator; +import org.springframework.util.ReflectionUtils; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.doThrow; diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java index b504c65b..0b63b924 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java +++ b/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java @@ -15,12 +15,13 @@ */ package org.springframework.ldap.pool2.factory; +import javax.naming.directory.DirContext; + import org.junit.Test; + import org.springframework.ldap.pool2.AbstractPoolTestCase; import org.springframework.ldap.pool2.MutableDelegatingLdapContext; -import javax.naming.directory.DirContext; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java index ee692c99..8f0c5093 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java +++ b/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java @@ -17,6 +17,7 @@ package org.springframework.ldap.pool2.factory; import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig; import org.junit.Test; + import org.springframework.ldap.pool2.AbstractPoolTestCase; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java index 255ed20c..baf76172 100644 --- a/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java +++ b/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java @@ -15,15 +15,16 @@ */ package org.springframework.ldap.pool2.factory; -import org.junit.Test; -import org.springframework.dao.DataAccessResourceFailureException; -import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.pool2.validation.DirContextValidator; -import org.springframework.ldap.pool2.AbstractPoolTestCase; - import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; +import org.junit.Test; + +import org.springframework.dao.DataAccessResourceFailureException; +import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.pool2.AbstractPoolTestCase; +import org.springframework.ldap.pool2.validation.DirContextValidator; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java b/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java index 86e7f799..571a10e0 100644 --- a/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java +++ b/core/src/test/java/org/springframework/ldap/query/LdapQueryBuilderTests.java @@ -1,6 +1,7 @@ package org.springframework.ldap.query; import org.junit.Test; + import org.springframework.ldap.support.LdapUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java b/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java index a31f133f..abcd2e6f 100644 --- a/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java +++ b/core/src/test/java/org/springframework/ldap/support/LdapEncoderTests.java @@ -17,6 +17,7 @@ package org.springframework.ldap.support; import org.junit.Test; + import org.springframework.ldap.BadLdapGrammarException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java b/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java index 616d3ee3..34802a32 100644 --- a/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java +++ b/core/src/test/java/org/springframework/ldap/support/LdapUtilsTests.java @@ -16,17 +16,19 @@ package org.springframework.ldap.support; -import org.apache.commons.lang.ArrayUtils; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.NoSuchAttributeException; +import java.util.LinkedList; import javax.naming.CompositeName; import javax.naming.InvalidNameException; import javax.naming.directory.BasicAttribute; import javax.naming.directory.BasicAttributes; import javax.naming.ldap.LdapName; -import java.util.LinkedList; + +import org.apache.commons.lang.ArrayUtils; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.NoSuchAttributeException; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java index f73a266a..bf33b677 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.transaction.compensating; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.support.LdapUtils; - import javax.naming.directory.BasicAttributes; import javax.naming.ldap.LdapName; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.core.LdapOperations; +import org.springframework.ldap.support.LdapUtils; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java index 3f33074d..771c3d13 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java @@ -15,18 +15,18 @@ */ package org.springframework.ldap.transaction.compensating; +import javax.naming.directory.BasicAttributes; +import javax.naming.ldap.LdapName; + import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.core.LdapOperations; import org.springframework.ldap.support.LdapUtils; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; -import javax.naming.directory.BasicAttributes; -import javax.naming.ldap.LdapName; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; public class BindOperationRecorderTests { diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java index 8398143d..07c4794f 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java @@ -15,13 +15,14 @@ */ package org.springframework.ldap.transaction.compensating; +import javax.naming.directory.DirContext; + import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.core.LdapOperations; import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; -import javax.naming.directory.DirContext; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java index 233e31b0..ba42ccbf 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.transaction.compensating; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.support.LdapUtils; -import org.springframework.transaction.support.TransactionSynchronizationManager; - import javax.naming.NamingException; import javax.naming.directory.DirContext; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.support.LdapUtils; +import org.springframework.transaction.support.TransactionSynchronizationManager; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java index 9f3c7d29..7df8cad2 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.transaction.compensating; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.support.LdapUtils; - import javax.naming.Name; import javax.naming.directory.ModificationItem; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.core.LdapOperations; +import org.springframework.ldap.support.LdapUtils; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java index c9ad8965..3649328b 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationRecorderTests.java @@ -16,13 +16,6 @@ package org.springframework.ldap.transaction.compensating; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.core.IncrementalAttributesMapper; -import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.support.LdapUtils; -import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; - import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; @@ -32,6 +25,14 @@ import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; import javax.naming.ldap.LdapName; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.core.IncrementalAttributesMapper; +import org.springframework.ldap.core.LdapOperations; +import org.springframework.ldap.support.LdapUtils; +import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java index 987eb056..dfa5424e 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.transaction.compensating; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.support.LdapUtils; - import javax.naming.directory.BasicAttributes; import javax.naming.ldap.LdapName; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.core.LdapOperations; +import org.springframework.ldap.support.LdapUtils; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java index d4fcf7b0..f2104329 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java @@ -15,15 +15,16 @@ */ package org.springframework.ldap.transaction.compensating; +import javax.naming.directory.BasicAttributes; +import javax.naming.ldap.LdapName; + import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.core.LdapOperations; import org.springframework.ldap.support.LdapUtils; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; -import javax.naming.directory.BasicAttributes; -import javax.naming.ldap.LdapName; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java index db805610..61c73f0e 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationExecutorTests.java @@ -16,13 +16,14 @@ package org.springframework.ldap.transaction.compensating; +import javax.naming.ldap.LdapName; + import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.core.LdapOperations; import org.springframework.ldap.support.LdapUtils; -import javax.naming.ldap.LdapName; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java index 2b356450..fcb91304 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java @@ -17,6 +17,7 @@ package org.springframework.ldap.transaction.compensating; import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.core.LdapOperations; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java index 42b9e982..6f9e9a8e 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java @@ -15,13 +15,14 @@ */ package org.springframework.ldap.transaction.compensating; +import javax.naming.ldap.LdapName; + import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.core.LdapOperations; import org.springframework.ldap.support.LdapUtils; -import javax.naming.ldap.LdapName; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java index b0fb0d28..2e0b37e8 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.transaction.compensating; +import javax.naming.ldap.LdapName; + import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.core.LdapOperations; import org.springframework.ldap.support.LdapUtils; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; -import javax.naming.ldap.LdapName; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java index bc1c1d43..fb8b10be 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java @@ -15,17 +15,19 @@ */ package org.springframework.ldap.transaction.compensating.manager; +import java.lang.reflect.Method; + +import javax.naming.directory.DirContext; + import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.core.ContextSource; import org.springframework.transaction.compensating.CompensatingTransactionOperationManager; import org.springframework.transaction.compensating.support.CompensatingTransactionHolderSupport; import org.springframework.transaction.compensating.support.CompensatingTransactionUtils; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.naming.directory.DirContext; -import java.lang.reflect.Method; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java index bf8fabfd..f227bc05 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java @@ -15,8 +15,14 @@ */ package org.springframework.ldap.transaction.compensating.manager; +import java.sql.Connection; + +import javax.naming.directory.DirContext; +import javax.sql.DataSource; + import org.junit.Before; import org.junit.Test; + import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.ldap.UncategorizedLdapException; import org.springframework.ldap.core.ContextSource; @@ -32,10 +38,6 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.transaction.support.DefaultTransactionStatus; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.naming.directory.DirContext; -import javax.sql.DataSource; -import java.sql.Connection; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java index 4ba18ab5..97bb9628 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.transaction.compensating.manager; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.core.DirContextProxy; - import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.core.DirContextProxy; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java index aa9e00ec..2fe32120 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.transaction.compensating.manager; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.core.ContextSource; -import org.springframework.transaction.support.TransactionSynchronizationManager; - import javax.naming.NamingException; import javax.naming.directory.DirContext; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.core.ContextSource; +import org.springframework.transaction.support.TransactionSynchronizationManager; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java index a22e3262..2e58cb16 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java @@ -15,12 +15,13 @@ */ package org.springframework.ldap.transaction.compensating.support; -import org.junit.Test; -import org.springframework.ldap.support.LdapUtils; - import javax.naming.Name; import javax.naming.ldap.LdapName; +import org.junit.Test; + +import org.springframework.ldap.support.LdapUtils; + import static org.assertj.core.api.Assertions.assertThat; public class DefaultTempEntryRenamingStrategyTests { diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java index 7c3b5cd6..8beaf05c 100644 --- a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java +++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java @@ -15,12 +15,13 @@ */ package org.springframework.ldap.transaction.compensating.support; -import org.junit.Test; -import org.springframework.ldap.support.LdapUtils; - import javax.naming.Name; import javax.naming.ldap.LdapName; +import org.junit.Test; + +import org.springframework.ldap.support.LdapUtils; + import static org.assertj.core.api.Assertions.assertThat; public class DifferentSubtreeTempEntryRenamingStrategyTests { diff --git a/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java b/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java index 60da0247..3666f935 100644 --- a/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java +++ b/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java @@ -15,13 +15,14 @@ */ package org.springframework.ldap.util; -import org.junit.Before; -import org.junit.Test; -import org.springframework.ldap.support.ListComparator; - import java.util.Arrays; import java.util.List; +import org.junit.Before; +import org.junit.Test; + +import org.springframework.ldap.support.ListComparator; + import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java index b91b892a..76c49bf2 100644 --- a/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java +++ b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java @@ -15,15 +15,16 @@ */ package org.springframework.transaction.compensating.support; +import java.util.Stack; + import org.junit.Before; import org.junit.Test; + import org.springframework.transaction.TransactionSystemException; import org.springframework.transaction.compensating.CompensatingTransactionOperationExecutor; import org.springframework.transaction.compensating.CompensatingTransactionOperationFactory; import org.springframework.transaction.compensating.CompensatingTransactionOperationRecorder; -import java.util.Stack; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/core/src/test/resources/ldap-namespace-config-multiurls.xml b/core/src/test/resources/ldap-namespace-config-multiurls.xml index 037188df..b13904e8 100644 --- a/core/src/test/resources/ldap-namespace-config-multiurls.xml +++ b/core/src/test/resources/ldap-namespace-config-multiurls.xml @@ -2,9 +2,8 @@ + http://www.springframework.org/schema/ldap https://www.springframework.org/schema/ldap/spring-ldap.xsd"> diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java index 0ada312a..d3dfb964 100644 --- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java +++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTests.java @@ -16,22 +16,23 @@ package org.springframework.ldap.ldif; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; -import org.springframework.ldap.core.LdapAttribute; -import org.springframework.ldap.ldif.support.DefaultAttributeValidationPolicy; -import org.springframework.ldap.support.LdapEncoder; -import org.springframework.util.StringUtils; - import java.net.URI; import java.util.Arrays; import java.util.Collection; import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.ldap.core.LdapAttribute; +import org.springframework.ldap.ldif.support.DefaultAttributeValidationPolicy; +import org.springframework.ldap.support.LdapEncoder; +import org.springframework.util.StringUtils; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java index acfcf8f5..7dbcb74f 100644 --- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java +++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/Ldap233LdifParserTests.java @@ -16,14 +16,15 @@ package org.springframework.ldap.ldif; -import org.apache.commons.io.FileUtils; -import org.junit.Test; -import org.springframework.ldap.ldif.parser.LdifParser; -import org.springframework.ldap.schema.BasicSchemaSpecification; - import java.io.File; import java.io.IOException; +import org.apache.commons.io.FileUtils; +import org.junit.Test; + +import org.springframework.ldap.ldif.parser.LdifParser; +import org.springframework.ldap.schema.BasicSchemaSpecification; + import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java index 7dd87747..4a4ca952 100644 --- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java +++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/LdifParserTests.java @@ -16,18 +16,19 @@ package org.springframework.ldap.ldif; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.io.IOException; + import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.core.io.ClassPathResource; import org.springframework.ldap.core.LdapAttributes; import org.springframework.ldap.ldif.parser.LdifParser; import org.springframework.ldap.schema.BasicSchemaSpecification; -import java.io.IOException; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java b/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java index 2bd82ae9..dc0ee76e 100755 --- a/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java +++ b/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java @@ -16,11 +16,12 @@ package org.springframework.ldap.odm.core; -import org.springframework.ldap.query.LdapQuery; +import java.util.List; import javax.naming.Name; import javax.naming.directory.SearchControls; -import java.util.List; + +import org.springframework.ldap.query.LdapQuery; /** * The OdmManager interface provides generic CRUD (create/read/update/delete) and diff --git a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java index 57c0504f..40d41d57 100755 --- a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java +++ b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java @@ -16,6 +16,12 @@ package org.springframework.ldap.odm.core.impl; +import java.util.List; +import java.util.Set; + +import javax.naming.Name; +import javax.naming.directory.SearchControls; + import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.core.LdapOperations; import org.springframework.ldap.core.LdapTemplate; @@ -26,11 +32,6 @@ import org.springframework.ldap.odm.typeconversion.ConverterManager; import org.springframework.ldap.query.LdapQuery; import org.springframework.util.StringUtils; -import javax.naming.Name; -import javax.naming.directory.SearchControls; -import java.util.List; -import java.util.Set; - /** * An implementation of {@link org.springframework.ldap.odm.core.OdmManager} which uses * {@link org.springframework.ldap.odm.typeconversion.ConverterManager} to convert between diff --git a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java index 9d68f483..36819d01 100755 --- a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java +++ b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java @@ -16,6 +16,8 @@ package org.springframework.ldap.odm.core.impl; +import java.util.Set; + import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.FactoryBeanNotInitializedException; import org.springframework.ldap.core.ContextSource; @@ -23,8 +25,6 @@ import org.springframework.ldap.core.LdapOperations; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.odm.typeconversion.ConverterManager; -import java.util.Set; - /** * A Spring Factory bean which creates {@link OdmManagerImpl} instances. *

diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaReader.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaReader.java index a4ad4e46..938afc5b 100755 --- a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaReader.java +++ b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaReader.java @@ -16,15 +16,16 @@ package org.springframework.ldap.odm.tools; -import org.springframework.ldap.odm.tools.SyntaxToJavaClass.ClassInfo; +import java.util.HashSet; +import java.util.Set; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; -import java.util.HashSet; -import java.util.Set; + +import org.springframework.ldap.odm.tools.SyntaxToJavaClass.ClassInfo; // Processes LDAP Schema /* package */ final class SchemaReader { diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java index b7917678..11c00a0f 100755 --- a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java +++ b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java @@ -16,23 +16,6 @@ package org.springframework.ldap.odm.tools; -import freemarker.template.Configuration; -import freemarker.template.DefaultObjectWrapper; -import freemarker.template.Template; -import freemarker.template.TemplateException; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.naming.Context; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; -import javax.naming.directory.InitialDirContext; import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; @@ -49,6 +32,24 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.naming.Context; +import javax.naming.NamingException; +import javax.naming.directory.DirContext; +import javax.naming.directory.InitialDirContext; + +import freemarker.template.Configuration; +import freemarker.template.DefaultObjectWrapper; +import freemarker.template.Template; +import freemarker.template.TemplateException; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * This tool creates a Java class representation of a set of LDAP object classes for use * with {@link org.springframework.ldap.odm.core.OdmManager}. diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java index 3da87d0d..326a2663 100755 --- a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java +++ b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java @@ -1,11 +1,7 @@ package org.springframework.ldap.odm.tools; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; +import java.io.PrintStream; +import java.util.Hashtable; import javax.naming.AuthenticationException; import javax.naming.CommunicationException; @@ -18,8 +14,13 @@ import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; -import java.io.PrintStream; -import java.util.Hashtable; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; /** * A simple utility to list LDAP directory schema. diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java index 78655690..fae540c1 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/ConverterManagerTests.java @@ -1,13 +1,12 @@ package org.springframework.ldap.odm.test; -import static org.junit.Assert.assertEquals; - import java.net.URI; import java.util.BitSet; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.ldap.odm.test.utils.ExecuteRunnable; import org.springframework.ldap.odm.test.utils.RunnableTests; import org.springframework.ldap.odm.typeconversion.ConverterException; @@ -16,6 +15,8 @@ import org.springframework.ldap.odm.typeconversion.impl.ConverterManagerImpl; import org.springframework.ldap.odm.typeconversion.impl.converters.FromStringConverter; import org.springframework.ldap.odm.typeconversion.impl.converters.ToStringConverter; +import static org.junit.Assert.assertEquals; + public final class ConverterManagerTests { private ConverterManagerImpl converterManager; diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java index a1280a1d..14d334ef 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/JDependTests.java @@ -16,12 +16,12 @@ package org.springframework.ldap.odm.test; +import java.io.IOException; + import jdepend.framework.JDepend; import org.junit.Before; import org.junit.Test; -import java.io.IOException; - import static org.junit.Assert.assertEquals; public class JDependTests { diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java b/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java index 1c79a9c3..51355167 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/OrganizationalUnit.java @@ -16,16 +16,17 @@ package org.springframework.ldap.odm.test; -import org.springframework.ldap.odm.annotations.Attribute; -import org.springframework.ldap.odm.annotations.Entry; -import org.springframework.ldap.odm.annotations.Id; - -import javax.naming.Name; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; +import javax.naming.Name; + +import org.springframework.ldap.odm.annotations.Attribute; +import org.springframework.ldap.odm.annotations.Entry; +import org.springframework.ldap.odm.annotations.Id; + /** * Automatically generated to represent the LDAP object classes "organizationalunit", * "top". diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/Person.java b/odm/src/test/java/org/springframework/ldap/odm/test/Person.java index fc6f02d5..c2acd4c9 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/Person.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/Person.java @@ -16,18 +16,19 @@ package org.springframework.ldap.odm.test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; + +import javax.naming.Name; + import org.springframework.ldap.odm.annotations.Attribute; import org.springframework.ldap.odm.annotations.Attribute.Type; import org.springframework.ldap.odm.annotations.Entry; import org.springframework.ldap.odm.annotations.Id; import org.springframework.ldap.odm.annotations.Transient; -import javax.naming.Name; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; - // Simple LDAP entry for testing @Entry(objectClasses = { "inetOrgPerson", "organizationalPerson", "person", "top" }) public final class Person { diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java b/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java index e63dddfb..a15da814 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/PlainPerson.java @@ -16,14 +16,15 @@ package org.springframework.ldap.odm.test; +import java.util.ArrayList; +import java.util.List; + +import javax.naming.Name; + import org.springframework.ldap.odm.annotations.Attribute; import org.springframework.ldap.odm.annotations.Entry; import org.springframework.ldap.odm.annotations.Id; -import javax.naming.Name; -import java.util.ArrayList; -import java.util.List; - // Simple LDAP entry for testing @Entry(objectClasses = { "person", "top" }) public final class PlainPerson { diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java index b70b5602..3eac2e5a 100755 --- a/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java +++ b/odm/src/test/java/org/springframework/ldap/odm/test/SchemaToJavaTests.java @@ -16,14 +16,25 @@ package org.springframework.ldap.odm.test; +import java.io.File; +import java.lang.reflect.Method; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Iterator; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.naming.ldap.LdapName; + import org.apache.commons.io.FileUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.core.io.ClassPathResource; import org.springframework.ldap.core.support.LdapContextSource; import org.springframework.ldap.odm.core.impl.OdmManagerImpl; @@ -37,15 +48,6 @@ import org.springframework.ldap.odm.typeconversion.impl.converters.ToStringConve import org.springframework.ldap.support.LdapUtils; import org.springframework.ldap.test.LdapTestUtils; -import javax.naming.ldap.LdapName; -import java.io.File; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.Iterator; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import static org.junit.Assert.assertEquals; // Tests the generation of entry Java classes from LDAP schema diff --git a/samples/odm/src/main/java/org/springframework/ldap/samples/odm/dao/OdmPersonDaoImpl.java b/samples/odm/src/main/java/org/springframework/ldap/samples/odm/dao/OdmPersonDaoImpl.java index a971c041..4cef801a 100644 --- a/samples/odm/src/main/java/org/springframework/ldap/samples/odm/dao/OdmPersonDaoImpl.java +++ b/samples/odm/src/main/java/org/springframework/ldap/samples/odm/dao/OdmPersonDaoImpl.java @@ -15,17 +15,18 @@ */ package org.springframework.ldap.samples.odm.dao; +import java.util.List; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import javax.naming.ldap.LdapName; + import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.samples.plain.dao.PersonDao; import org.springframework.ldap.samples.plain.domain.Person; import org.springframework.ldap.support.LdapNameBuilder; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.ldap.LdapName; -import java.util.List; - import static org.springframework.ldap.query.LdapQueryBuilder.query; /** diff --git a/samples/odm/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDao.java b/samples/odm/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDao.java index ed637a57..1393b261 100644 --- a/samples/odm/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDao.java +++ b/samples/odm/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDao.java @@ -15,10 +15,10 @@ */ package org.springframework.ldap.samples.plain.dao; -import org.springframework.ldap.samples.plain.domain.Person; - import java.util.List; +import org.springframework.ldap.samples.plain.domain.Person; + /** * Data Access Object interface for the Person entity. diff --git a/samples/odm/src/main/java/org/springframework/ldap/samples/plain/domain/Person.java b/samples/odm/src/main/java/org/springframework/ldap/samples/plain/domain/Person.java index 932a0d63..53eacce2 100644 --- a/samples/odm/src/main/java/org/springframework/ldap/samples/plain/domain/Person.java +++ b/samples/odm/src/main/java/org/springframework/ldap/samples/plain/domain/Person.java @@ -15,18 +15,19 @@ */ package org.springframework.ldap.samples.plain.domain; +import javax.naming.Name; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; + import org.springframework.ldap.odm.annotations.Attribute; import org.springframework.ldap.odm.annotations.DnAttribute; import org.springframework.ldap.odm.annotations.Entry; import org.springframework.ldap.odm.annotations.Id; import org.springframework.ldap.odm.annotations.Transient; -import javax.naming.Name; - /** * Simple class representing a single person. * diff --git a/samples/odm/src/main/java/org/springframework/ldap/samples/plain/web/DefaultController.java b/samples/odm/src/main/java/org/springframework/ldap/samples/plain/web/DefaultController.java index 64c7e9e0..0fda6b06 100644 --- a/samples/odm/src/main/java/org/springframework/ldap/samples/plain/web/DefaultController.java +++ b/samples/odm/src/main/java/org/springframework/ldap/samples/plain/web/DefaultController.java @@ -1,6 +1,12 @@ package org.springframework.ldap.samples.plain.web; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + +import javax.naming.Name; + import org.apache.commons.lang.StringUtils; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.samples.plain.dao.PersonDao; @@ -14,10 +20,6 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.naming.Name; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; - /** * Default controller. * diff --git a/samples/odm/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java b/samples/odm/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java index 958c8001..1ec62bb6 100644 --- a/samples/odm/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java +++ b/samples/odm/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java @@ -16,11 +16,11 @@ package org.springframework.ldap.samples.utils; -import org.springframework.ldap.core.DirContextOperations; - import java.util.LinkedList; import java.util.List; +import org.springframework.ldap.core.DirContextOperations; + public class HtmlRowLdapTreeVisitor implements LdapTreeVisitor { private List rows = new LinkedList(); diff --git a/samples/odm/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java b/samples/odm/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java index 5de7cff4..d1fc0359 100644 --- a/samples/odm/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java +++ b/samples/odm/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java @@ -16,11 +16,11 @@ package org.springframework.ldap.samples.utils; -import org.springframework.ldap.core.DirContextOperations; - import java.util.LinkedList; import java.util.List; +import org.springframework.ldap.core.DirContextOperations; + public class LdapTree { private final DirContextOperations node; diff --git a/samples/odm/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java b/samples/odm/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java index 7d594bda..4a9105bf 100644 --- a/samples/odm/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java +++ b/samples/odm/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java @@ -16,13 +16,13 @@ package org.springframework.ldap.samples.utils; +import javax.naming.Name; + import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.core.support.AbstractContextMapper; import org.springframework.ldap.support.LdapUtils; -import javax.naming.Name; - public class LdapTreeBuilder { private LdapTemplate ldapTemplate; diff --git a/samples/odm/src/test/java/org/springframework/ldap/samples/odm/dao/PersonDaoSampleIntegrationTests.java b/samples/odm/src/test/java/org/springframework/ldap/samples/odm/dao/PersonDaoSampleIntegrationTests.java index 70e2e59e..dbb3c884 100644 --- a/samples/odm/src/test/java/org/springframework/ldap/samples/odm/dao/PersonDaoSampleIntegrationTests.java +++ b/samples/odm/src/test/java/org/springframework/ldap/samples/odm/dao/PersonDaoSampleIntegrationTests.java @@ -15,8 +15,11 @@ */ package org.springframework.ldap.samples.odm.dao; +import java.util.List; + import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.samples.plain.dao.PersonDao; @@ -24,8 +27,6 @@ import org.springframework.ldap.samples.plain.domain.Person; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/samples/odm/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java b/samples/odm/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java index 0e40dcb3..7e8b18b7 100644 --- a/samples/odm/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java +++ b/samples/odm/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java @@ -16,18 +16,20 @@ package org.springframework.ldap.samples.utils; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; + +import javax.naming.ldap.LdapName; + import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import javax.naming.ldap.LdapName; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; - import static org.assertj.core.api.Assertions.assertThat; @ContextConfiguration(locations = { "/config/testContext.xml" }) diff --git a/samples/plain/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDao.java b/samples/plain/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDao.java index ed637a57..1393b261 100644 --- a/samples/plain/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDao.java +++ b/samples/plain/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDao.java @@ -15,10 +15,10 @@ */ package org.springframework.ldap.samples.plain.dao; -import org.springframework.ldap.samples.plain.domain.Person; - import java.util.List; +import org.springframework.ldap.samples.plain.domain.Person; + /** * Data Access Object interface for the Person entity. diff --git a/samples/plain/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDaoImpl.java b/samples/plain/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDaoImpl.java index 6e8b6b57..a5fadbb0 100644 --- a/samples/plain/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDaoImpl.java +++ b/samples/plain/src/main/java/org/springframework/ldap/samples/plain/dao/PersonDaoImpl.java @@ -15,6 +15,13 @@ */ package org.springframework.ldap.samples.plain.dao; +import java.util.List; + +import javax.naming.Name; +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import javax.naming.ldap.LdapName; + import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; @@ -25,12 +32,6 @@ import org.springframework.ldap.samples.plain.domain.Person; import org.springframework.ldap.support.LdapNameBuilder; import org.springframework.ldap.support.LdapUtils; -import javax.naming.Name; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.ldap.LdapName; -import java.util.List; - import static org.springframework.ldap.query.LdapQueryBuilder.query; /** diff --git a/samples/plain/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java b/samples/plain/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java index 958c8001..1ec62bb6 100644 --- a/samples/plain/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java +++ b/samples/plain/src/main/java/org/springframework/ldap/samples/utils/HtmlRowLdapTreeVisitor.java @@ -16,11 +16,11 @@ package org.springframework.ldap.samples.utils; -import org.springframework.ldap.core.DirContextOperations; - import java.util.LinkedList; import java.util.List; +import org.springframework.ldap.core.DirContextOperations; + public class HtmlRowLdapTreeVisitor implements LdapTreeVisitor { private List rows = new LinkedList(); diff --git a/samples/plain/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java b/samples/plain/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java index 5de7cff4..d1fc0359 100644 --- a/samples/plain/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java +++ b/samples/plain/src/main/java/org/springframework/ldap/samples/utils/LdapTree.java @@ -16,11 +16,11 @@ package org.springframework.ldap.samples.utils; -import org.springframework.ldap.core.DirContextOperations; - import java.util.LinkedList; import java.util.List; +import org.springframework.ldap.core.DirContextOperations; + public class LdapTree { private final DirContextOperations node; diff --git a/samples/plain/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java b/samples/plain/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java index 7d594bda..4a9105bf 100644 --- a/samples/plain/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java +++ b/samples/plain/src/main/java/org/springframework/ldap/samples/utils/LdapTreeBuilder.java @@ -16,13 +16,13 @@ package org.springframework.ldap.samples.utils; +import javax.naming.Name; + import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.core.support.AbstractContextMapper; import org.springframework.ldap.support.LdapUtils; -import javax.naming.Name; - public class LdapTreeBuilder { private LdapTemplate ldapTemplate; diff --git a/samples/plain/src/test/java/org/springframework/ldap/samples/plain/dao/PersonDaoSampleIntegrationTests.java b/samples/plain/src/test/java/org/springframework/ldap/samples/plain/dao/PersonDaoSampleIntegrationTests.java index 9136a12f..47d9a1f7 100644 --- a/samples/plain/src/test/java/org/springframework/ldap/samples/plain/dao/PersonDaoSampleIntegrationTests.java +++ b/samples/plain/src/test/java/org/springframework/ldap/samples/plain/dao/PersonDaoSampleIntegrationTests.java @@ -15,16 +15,17 @@ */ package org.springframework.ldap.samples.plain.dao; +import java.util.List; + import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.samples.plain.domain.Person; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/samples/plain/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java b/samples/plain/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java index 0e40dcb3..7e8b18b7 100644 --- a/samples/plain/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java +++ b/samples/plain/src/test/java/org/springframework/ldap/samples/utils/LdapTreeBuilderIntegrationTests.java @@ -16,18 +16,20 @@ package org.springframework.ldap.samples.utils; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; + +import javax.naming.ldap.LdapName; + import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import javax.naming.ldap.LdapName; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; - import static org.assertj.core.api.Assertions.assertThat; @ContextConfiguration(locations = { "/config/testContext.xml" }) diff --git a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java index d0a9bd21..1de94694 100644 --- a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java +++ b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java @@ -16,12 +16,13 @@ package org.springframework.ldap.control; -import org.springframework.ldap.support.LdapUtils; -import org.springframework.util.ReflectionUtils; +import java.lang.reflect.Method; import javax.naming.NamingException; import javax.naming.ldap.Control; -import java.lang.reflect.Method; + +import org.springframework.ldap.support.LdapUtils; +import org.springframework.util.ReflectionUtils; /** * DirContextProcessor implementation for managing a virtual list view. diff --git a/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java b/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java index 5c197701..e03bf56d 100644 --- a/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java +++ b/sandbox/src/test/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessorTests.java @@ -15,6 +15,11 @@ */ package org.springframework.ldap.control; +import java.io.IOException; + +import javax.naming.ldap.Control; +import javax.naming.ldap.LdapContext; + import com.sun.jndi.ldap.Ber; import com.sun.jndi.ldap.BerDecoder; import com.sun.jndi.ldap.BerEncoder; @@ -23,11 +28,8 @@ import com.sun.jndi.ldap.ctl.VirtualListViewResponseControl; import junit.framework.AssertionFailedError; import org.junit.Before; import org.junit.Test; -import org.springframework.ldap.OperationNotSupportedException; -import javax.naming.ldap.Control; -import javax.naming.ldap.LdapContext; -import java.io.IOException; +import org.springframework.ldap.OperationNotSupportedException; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java index c379e831..3db9db5c 100644 --- a/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java +++ b/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java @@ -15,17 +15,18 @@ */ package org.springframework.ldap.test; +import java.util.Collections; + import com.xerox.amazonws.ec2.Jec2; import com.xerox.amazonws.ec2.LaunchConfiguration; import com.xerox.amazonws.ec2.ReservationDescription; import com.xerox.amazonws.ec2.ReservationDescription.Instance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.config.AbstractFactoryBean; import org.springframework.util.Assert; -import java.util.Collections; - /** * Abstract FactoryBean superclass to use for automatically launching an EC2 instance * before creating the actual target object. This approach is particularly useful for diff --git a/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java b/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java index 7f109ff1..10d15572 100644 --- a/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java +++ b/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java @@ -15,13 +15,15 @@ */ package org.springframework.ldap.test; -import junit.framework.Assert; -import org.springframework.ldap.core.AttributesMapper; +import java.util.Arrays; import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; -import java.util.Arrays; + +import junit.framework.Assert; + +import org.springframework.ldap.core.AttributesMapper; /** * Dummy AttributesMapper for testing purposes to check that the received Attributes are diff --git a/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java b/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java index 428c6ee7..49c05326 100644 --- a/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java +++ b/test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java @@ -15,13 +15,13 @@ */ package org.springframework.ldap.test; +import java.util.Arrays; + import junit.framework.Assert; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; -import java.util.Arrays; - /** * Dummy ContextMapper for testing purposes to check that the received Attributes are the * expected ones. diff --git a/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java index cb2323c6..1139a15b 100644 --- a/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java +++ b/test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java @@ -17,7 +17,6 @@ package org.springframework.ldap.test; import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.core.support.LdapContextSource; -import org.springframework.ldap.test.AbstractEc2InstanceLaunchingFactoryBean; import org.springframework.util.Assert; /** diff --git a/test-support/src/main/java/org/springframework/ldap/test/DummyDirContext.java b/test-support/src/main/java/org/springframework/ldap/test/DummyDirContext.java index b038180c..4c52e601 100644 --- a/test-support/src/main/java/org/springframework/ldap/test/DummyDirContext.java +++ b/test-support/src/main/java/org/springframework/ldap/test/DummyDirContext.java @@ -16,6 +16,8 @@ package org.springframework.ldap.test; +import java.util.Hashtable; + import javax.naming.Binding; import javax.naming.Context; import javax.naming.Name; @@ -28,7 +30,6 @@ import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import java.util.Hashtable; /** * @author Mattias Hellborg Arthursson diff --git a/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServer.java b/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServer.java index 8bebfa07..f8ca4ac4 100644 --- a/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServer.java +++ b/test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServer.java @@ -16,6 +16,8 @@ package org.springframework.ldap.test; +import java.io.File; + import org.apache.commons.io.FileUtils; import org.apache.directory.server.core.DefaultDirectoryService; import org.apache.directory.server.core.DirectoryService; @@ -25,8 +27,6 @@ import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.server.protocol.shared.transport.TcpTransport; import org.apache.directory.shared.ldap.name.LdapDN; -import java.io.File; - /** * Helper class for embedded Apache Directory Server. * diff --git a/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java b/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java index 9a01fffb..d43a338e 100644 --- a/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java +++ b/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java @@ -16,18 +16,11 @@ package org.springframework.ldap.test; -import org.apache.commons.io.IOUtils; -import org.apache.directory.server.core.DefaultDirectoryService; -import org.apache.directory.server.protocol.shared.store.LdifFileLoader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.core.io.Resource; -import org.springframework.ldap.UncategorizedLdapException; -import org.springframework.ldap.core.ContextSource; -import org.springframework.ldap.core.LdapAttributes; -import org.springframework.ldap.core.support.DefaultDirObjectFactory; -import org.springframework.ldap.ldif.parser.LdifParser; -import org.springframework.ldap.support.LdapUtils; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Set; import javax.naming.Binding; import javax.naming.ContextNotEmptyException; @@ -36,11 +29,20 @@ import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.ldap.LdapName; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Set; + +import org.apache.commons.io.IOUtils; +import org.apache.directory.server.core.DefaultDirectoryService; +import org.apache.directory.server.protocol.shared.store.LdifFileLoader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.core.io.Resource; +import org.springframework.ldap.UncategorizedLdapException; +import org.springframework.ldap.core.ContextSource; +import org.springframework.ldap.core.LdapAttributes; +import org.springframework.ldap.core.support.DefaultDirObjectFactory; +import org.springframework.ldap.ldif.parser.LdifParser; +import org.springframework.ldap.support.LdapUtils; /** * Utilities for starting, stopping and populating an in-process Apache Directory Server diff --git a/test-support/src/main/java/org/springframework/ldap/test/LdifPopulator.java b/test-support/src/main/java/org/springframework/ldap/test/LdifPopulator.java index 315f8fd2..8cd78c7e 100644 --- a/test-support/src/main/java/org/springframework/ldap/test/LdifPopulator.java +++ b/test-support/src/main/java/org/springframework/ldap/test/LdifPopulator.java @@ -16,8 +16,13 @@ package org.springframework.ldap.test; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.List; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; + import org.springframework.beans.factory.InitializingBean; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; @@ -25,10 +30,6 @@ import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.support.LdapUtils; import org.springframework.util.Assert; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.List; - /** * @author Mattias Hellborg Arthursson * @since 2.0 diff --git a/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdapTestUtils.java b/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdapTestUtils.java index 91b1d8fe..f462f04e 100644 --- a/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdapTestUtils.java +++ b/test-support/src/main/java/org/springframework/ldap/test/unboundid/LdapTestUtils.java @@ -29,6 +29,8 @@ import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.ldap.LdapName; +import com.unboundid.ldap.listener.InMemoryDirectoryServer; +import com.unboundid.ldap.sdk.LDAPException; import com.unboundid.ldif.LDIFReader; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; @@ -42,9 +44,6 @@ import org.springframework.ldap.core.support.DefaultDirObjectFactory; import org.springframework.ldap.ldif.parser.LdifParser; import org.springframework.ldap.support.LdapUtils; -import com.unboundid.ldap.listener.InMemoryDirectoryServer; -import com.unboundid.ldap.sdk.LDAPException; - /** * Utilities for starting, stopping and populating an in-process Apache Directory Server * to use for integration testing purposes. diff --git a/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java b/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java index 594d861e..22f920b8 100644 --- a/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java +++ b/test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java @@ -1,8 +1,5 @@ package org.springframework.ldap.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import java.util.List; import javax.naming.NamingException; @@ -15,6 +12,9 @@ import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.query.LdapQueryBuilder; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class EmbeddedLdapServerFactoryBeanTests { @Test diff --git a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java index 20ce9b50..ed6ae819 100644 --- a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java +++ b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/IncrementalAttributeMapperITests.java @@ -16,9 +16,17 @@ package org.springframework.ldap.itest.ad; +import java.io.UnsupportedEncodingException; +import java.util.List; + +import javax.naming.directory.BasicAttribute; +import javax.naming.directory.DirContext; +import javax.naming.directory.ModificationItem; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.SizeLimitExceededException; @@ -34,12 +42,6 @@ import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import java.io.UnsupportedEncodingException; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java index ca3e11fa..1affd867 100644 --- a/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java +++ b/test/integration-tests-ad/src/test/java/org/springframework/ldap/itest/ad/SchemaToJavaAdITests.java @@ -16,12 +16,21 @@ package org.springframework.ldap.itest.ad; +import java.io.File; +import java.lang.reflect.Method; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.HashMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.apache.commons.io.FileUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.core.io.ClassPathResource; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DistinguishedName; @@ -34,14 +43,6 @@ import org.springframework.ldap.odm.typeconversion.impl.ConverterManagerImpl; import org.springframework.ldap.odm.typeconversion.impl.converters.FromStringConverter; import org.springframework.ldap.odm.typeconversion.impl.converters.ToStringConverter; -import java.io.File; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.HashMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import static org.assertj.core.api.Assertions.assertThat; // Tests the generation of entry Java classes from LDAP schema diff --git a/test/integration-tests-openldap/src/main/java/org/springframework/ldap/DigestMd5ContextSourceEc2InstanceLaunchingFactoryBean.java b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/DigestMd5ContextSourceEc2InstanceLaunchingFactoryBean.java index 1dd0ac1a..2284a42c 100644 --- a/test/integration-tests-openldap/src/main/java/org/springframework/ldap/DigestMd5ContextSourceEc2InstanceLaunchingFactoryBean.java +++ b/test/integration-tests-openldap/src/main/java/org/springframework/ldap/DigestMd5ContextSourceEc2InstanceLaunchingFactoryBean.java @@ -15,10 +15,6 @@ */ package org.springframework.ldap; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLSession; - -import org.springframework.ldap.core.support.DefaultTlsDirContextAuthenticationStrategy; import org.springframework.ldap.core.support.DigestMd5DirContextAuthenticationStrategy; import org.springframework.ldap.core.support.LdapContextSource; import org.springframework.ldap.test.ContextSourceEc2InstanceLaunchingFactoryBean; diff --git a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java index 6b8b7412..42318ce9 100644 --- a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java +++ b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/control/PagedSearchITests.java @@ -16,9 +16,17 @@ package org.springframework.ldap.itest.control; +import java.io.IOException; +import java.util.List; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import javax.naming.directory.SearchControls; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.ldap.control.PagedResultsDirContextProcessor; @@ -32,12 +40,6 @@ import org.springframework.ldap.test.LdapTestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.directory.SearchControls; -import java.io.IOException; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java index cb246d26..aa5f4473 100644 --- a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java +++ b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/LdapTemplateSearchResultITests.java @@ -15,9 +15,15 @@ */ package org.springframework.ldap.itest.core; +import java.util.List; + +import javax.naming.Name; +import javax.naming.directory.SearchControls; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.ldap.core.ContextSource; @@ -31,10 +37,6 @@ import org.springframework.ldap.test.LdapTestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import javax.naming.Name; -import javax.naming.directory.SearchControls; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java index e96c3dea..7a7c9ebe 100644 --- a/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java +++ b/test/integration-tests-openldap/src/test/java/org/springframework/ldap/itest/core/support/DigestMd5AuthenticationITests.java @@ -15,9 +15,12 @@ */ package org.springframework.ldap.itest.core.support; +import javax.naming.directory.DirContext; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.io.ClassPathResource; @@ -28,8 +31,6 @@ import org.springframework.ldap.test.LdapTestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import javax.naming.directory.DirContext; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/LdapGroupDao.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/LdapGroupDao.java index a5f4a6d3..f6d6ec63 100644 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/LdapGroupDao.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/LdapGroupDao.java @@ -16,11 +16,11 @@ package org.springframework.ldap.itest; +import javax.naming.Name; + import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.core.support.BaseLdapPathAware; -import javax.naming.Name; - /** * @author Mattias Hellborg Arthursson */ diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapNameAware.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapNameAware.java index 8c0346e4..a18e8b23 100644 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapNameAware.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/core/support/DummyBaseLdapNameAware.java @@ -16,10 +16,10 @@ package org.springframework.ldap.itest.core.support; -import org.springframework.ldap.core.support.BaseLdapNameAware; - import javax.naming.ldap.LdapName; +import org.springframework.ldap.core.support.BaseLdapNameAware; + /** * @author Mattias Hellborg Arthursson */ diff --git a/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Group.java b/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Group.java index 7116aeb5..484f1cce 100644 --- a/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Group.java +++ b/test/integration-tests/src/main/java/org/springframework/ldap/itest/odm/Group.java @@ -16,14 +16,15 @@ package org.springframework.ldap.itest.odm; +import java.util.Set; + +import javax.naming.Name; + import org.springframework.ldap.odm.annotations.Attribute; import org.springframework.ldap.odm.annotations.DnAttribute; import org.springframework.ldap.odm.annotations.Entry; import org.springframework.ldap.odm.annotations.Id; -import javax.naming.Name; -import java.util.Set; - /** * @author Mattias Hellborg Arthursson */ diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java b/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java index 322bb6cb..61cfa069 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/LdapConditionallyFilteredTestRunner.java @@ -19,6 +19,7 @@ package org.springframework.ldap; import org.junit.experimental.categories.Categories; import org.junit.runner.manipulation.NoTestsRemainException; import org.junit.runners.model.InitializationError; + import org.springframework.ldap.itest.NoAdTests; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java index d1bdc511..81fd1346 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/AbstractLdapTemplateIntegrationTests.java @@ -16,10 +16,19 @@ package org.springframework.ldap.itest; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.List; + +import javax.naming.Name; +import javax.naming.NamingException; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.junit.Before; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; @@ -35,13 +44,6 @@ import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; import org.springframework.test.context.support.DirtiesContextTestExecutionListener; -import javax.naming.Name; -import javax.naming.NamingException; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.List; - @DirtiesContext @RunWith(LdapConditionallyFilteredTestRunner.class) @TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class }) diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java index f57b7488..f61deff1 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/DefaultLdapClientRenameITests.java @@ -27,7 +27,6 @@ import org.springframework.LdapDataEntry; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.DirContextAdapter; -import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.LdapClient; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java index 57c1a659..25268b04 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/InvalidBackslashITests.java @@ -16,10 +16,17 @@ package org.springframework.ldap.itest; +import java.util.List; + +import javax.naming.InvalidNameException; +import javax.naming.ldap.LdapName; +import javax.naming.ldap.Rdn; + import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DirContextOperations; @@ -28,11 +35,6 @@ import org.springframework.ldap.core.support.AbstractContextMapper; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; -import javax.naming.InvalidNameException; -import javax.naming.ldap.LdapName; -import javax.naming.ldap.Rdn; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java index dcbb5831..fe2fa77e 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAttributesMapperITests.java @@ -16,17 +16,19 @@ package org.springframework.ldap.itest; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.ldap.core.AttributesMapper; -import org.springframework.ldap.core.LdapTemplate; -import org.springframework.test.context.ContextConfiguration; +import java.util.LinkedList; +import java.util.List; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.Attributes; -import java.util.LinkedList; -import java.util.List; + +import org.junit.Test; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ldap.core.AttributesMapper; +import org.springframework.ldap.core.LdapTemplate; +import org.springframework.test.context.ContextConfiguration; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java index c626d621..e38e28c8 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateAuthenticationITests.java @@ -16,8 +16,12 @@ package org.springframework.ldap.itest; +import javax.naming.NamingException; +import javax.naming.directory.DirContext; + import org.junit.Test; import org.junit.experimental.categories.Category; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.ldap.AuthenticationException; @@ -32,9 +36,6 @@ import org.springframework.ldap.filter.AndFilter; import org.springframework.ldap.filter.EqualsFilter; import org.springframework.test.context.ContextConfiguration; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; - import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.ldap.query.LdapQueryBuilder.query; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java index f90d533b..67d0ce01 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateBindUnbindITests.java @@ -16,7 +16,12 @@ package org.springframework.ldap.itest; +import javax.naming.directory.Attributes; +import javax.naming.directory.BasicAttribute; +import javax.naming.directory.BasicAttributes; + import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.DirContextAdapter; @@ -24,10 +29,6 @@ import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java index e387f7d3..8f493dc0 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextExecutorTests.java @@ -19,6 +19,7 @@ import javax.naming.NamingException; import javax.naming.directory.DirContext; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.ContextExecutor; import org.springframework.ldap.core.DirContextAdapter; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java index 79a2affe..4091f0d6 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateContextMapperITests.java @@ -16,15 +16,16 @@ package org.springframework.ldap.itest; +import java.util.List; + import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.LdapTemplate; import org.springframework.test.context.ContextConfiguration; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java index c0da4c8a..f9a1d14c 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateListITests.java @@ -15,9 +15,15 @@ */ package org.springframework.ldap.itest; +import java.util.LinkedList; +import java.util.List; + +import javax.naming.ldap.LdapName; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.core.support.CountNameClassPairCallbackHandler; @@ -25,10 +31,6 @@ import org.springframework.ldap.support.LdapUtils; import org.springframework.ldap.test.AttributeCheckContextMapper; import org.springframework.test.context.ContextConfiguration; -import javax.naming.ldap.LdapName; -import java.util.LinkedList; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java index 512f85c4..c14d3227 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupITests.java @@ -16,7 +16,12 @@ package org.springframework.ldap.itest; +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import javax.naming.ldap.LdapName; + import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.AttributesMapper; import org.springframework.ldap.core.ContextMapper; @@ -25,10 +30,6 @@ import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import javax.naming.ldap.LdapName; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java index 72f0fa2f..72ef32c0 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateLookupMultiRdnITests.java @@ -18,6 +18,7 @@ package org.springframework.ldap.itest; import org.junit.Test; import org.junit.experimental.categories.Category; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java index 6f7c388d..86338505 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateModifyITests.java @@ -16,9 +16,19 @@ package org.springframework.ldap.itest; +import java.util.Arrays; +import java.util.List; + +import javax.naming.directory.Attributes; +import javax.naming.directory.BasicAttribute; +import javax.naming.directory.BasicAttributes; +import javax.naming.directory.DirContext; +import javax.naming.directory.ModificationItem; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.AttributeInUseException; import org.springframework.ldap.core.DirContextAdapter; @@ -27,14 +37,6 @@ import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import java.util.Arrays; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java index ee0fa818..94d60d52 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateNoBaseSuffixITests.java @@ -16,7 +16,11 @@ package org.springframework.ldap.itest; +import javax.naming.Name; +import javax.naming.ldap.LdapName; + import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.DirContextAdapter; @@ -25,9 +29,6 @@ import org.springframework.ldap.core.support.CountNameClassPairCallbackHandler; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; -import javax.naming.Name; -import javax.naming.ldap.LdapName; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java index 77265d07..0479e54c 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplatePooledITests.java @@ -18,6 +18,7 @@ package org.springframework.ldap.itest; import org.junit.After; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.ClassPathResource; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java index 89ef0c9a..b3d6b2f0 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRecursiveDeleteITests.java @@ -16,10 +16,14 @@ package org.springframework.ldap.itest; +import javax.naming.Name; +import javax.naming.ldap.LdapName; + import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.DirContextAdapter; @@ -27,9 +31,6 @@ import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; -import javax.naming.Name; -import javax.naming.ldap.LdapName; - import static junit.framework.Assert.fail; /** diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java index 38cbbb7b..ec72c861 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateRenameITests.java @@ -16,9 +16,12 @@ package org.springframework.ldap.itest; +import javax.naming.Name; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.NameNotFoundException; import org.springframework.ldap.core.DirContextAdapter; @@ -26,8 +29,6 @@ import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; -import javax.naming.Name; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java index 5c6ef3c0..ad306e2f 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultITests.java @@ -15,9 +15,17 @@ */ package org.springframework.ldap.itest; +import java.util.List; +import java.util.stream.Collectors; + +import javax.naming.Name; +import javax.naming.NamingException; +import javax.naming.directory.SearchControls; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; @@ -36,12 +44,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; -import javax.naming.Name; -import javax.naming.NamingException; -import javax.naming.directory.SearchControls; -import java.util.List; -import java.util.stream.Collectors; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.springframework.ldap.query.LdapQueryBuilder.query; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java index 72d7dc78..91c2b94e 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/LdapTemplateSearchResultNamespaceConfigITests.java @@ -15,9 +15,16 @@ */ package org.springframework.ldap.itest; +import java.util.List; +import java.util.stream.Collectors; + +import javax.naming.Name; +import javax.naming.directory.SearchControls; + import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; @@ -34,11 +41,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; -import javax.naming.Name; -import javax.naming.directory.SearchControls; -import java.util.List; -import java.util.stream.Collectors; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.springframework.ldap.query.LdapQueryBuilder.query; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java index 10079587..40020d4d 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/control/SupportedControlsITests.java @@ -16,8 +16,14 @@ package org.springframework.ldap.itest.control; +import java.util.Arrays; +import java.util.HashSet; + +import javax.naming.Name; + import org.junit.Test; import org.junit.experimental.categories.Category; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.ContextMapper; import org.springframework.ldap.core.DirContextAdapter; @@ -27,10 +33,6 @@ import org.springframework.ldap.itest.NoAdTests; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; -import javax.naming.Name; -import java.util.Arrays; -import java.util.HashSet; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java index afcb8d8e..df04b5c7 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DistinguishedNameEditorITests.java @@ -16,6 +16,7 @@ package org.springframework.ldap.itest.core; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.DistinguishedName; import org.springframework.test.context.ContextConfiguration; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java index 78be8aaf..8de18066 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/DnParsePerformanceITests.java @@ -17,6 +17,7 @@ package org.springframework.ldap.itest.core; import org.junit.Test; + import org.springframework.ldap.core.DistinguishedName; import org.springframework.util.StopWatch; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java index c741cde4..cda8ca27 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorITests.java @@ -17,6 +17,7 @@ package org.springframework.ldap.itest.core.support; import org.junit.Test; + import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java index 593570a6..3c0d9cc5 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/BaseLdapPathBeanPostprocessorNamespaceConfigITests.java @@ -17,6 +17,7 @@ package org.springframework.ldap.itest.core.support; import org.junit.Test; + import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.ldap.core.DistinguishedName; import org.springframework.ldap.support.LdapUtils; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java index 4efc0175..01f566be 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceIntegrationTests.java @@ -16,8 +16,16 @@ package org.springframework.ldap.itest.core.support; +import java.util.Hashtable; +import java.util.List; + +import javax.naming.Context; +import javax.naming.NamingException; +import javax.naming.directory.DirContext; + import org.junit.Test; import org.junit.experimental.categories.Category; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.dao.IncorrectResultSizeDataAccessException; @@ -32,12 +40,6 @@ import org.springframework.ldap.itest.NoAdTests; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; -import java.util.Hashtable; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java index 9e4a9efc..b694a3cb 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/core/support/LdapContextSourceMultiServerIntegrationTests.java @@ -15,14 +15,15 @@ */ package org.springframework.ldap.itest.core.support; +import javax.naming.NamingException; + import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.support.LdapContextSource; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import javax.naming.NamingException; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java index 126e8fe1..0dc10a28 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/filter/HardcodedFilterIntegrationTests.java @@ -16,6 +16,7 @@ package org.springframework.ldap.itest.filter; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.core.support.CountNameClassPairCallbackHandler; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java index 00fba763..0039bbcc 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/integration/JiraLdap247ITests.java @@ -17,6 +17,7 @@ package org.springframework.ldap.itest.integration; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.itest.LdapGroupDao; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java index 04fd24eb..25083412 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/ldap321/Ldap321Tests.java @@ -15,18 +15,19 @@ */ package org.springframework.ldap.itest.ldap321; -import static org.assertj.core.api.Assertions.*; - import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Rob Winch */ diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java index 976e47be..7b87e630 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerIntegrationTests.java @@ -15,11 +15,18 @@ */ package org.springframework.ldap.itest.manager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.sql.ResultSet; +import java.sql.SQLException; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; + import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.dao.EmptyResultDataAccessException; @@ -34,11 +41,6 @@ import org.springframework.ldap.itest.transaction.compensating.manager.DummyExce import org.springframework.test.context.ContextConfiguration; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import java.sql.ResultSet; -import java.sql.SQLException; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java index 0419d1b2..32e051f6 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerLdap179IntegrationTests.java @@ -16,11 +16,12 @@ package org.springframework.ldap.itest.manager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java index 4510e20e..ab97fa7b 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceAndDataSourceTransactionManagerNamespaceITests.java @@ -16,11 +16,18 @@ package org.springframework.ldap.itest.manager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.sql.ResultSet; +import java.sql.SQLException; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; + import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.dao.EmptyResultDataAccessException; @@ -35,11 +42,6 @@ import org.springframework.ldap.itest.transaction.compensating.manager.DummyExce import org.springframework.test.context.ContextConfiguration; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import java.sql.ResultSet; -import java.sql.SQLException; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java index 7defe997..12a6a6bb 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerIntegrationTests.java @@ -15,10 +15,14 @@ */ package org.springframework.ldap.itest.manager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import javax.naming.NamingException; +import javax.naming.directory.Attributes; + import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.ldap.NameNotFoundException; @@ -30,9 +34,6 @@ import org.springframework.ldap.itest.transaction.compensating.manager.DummyExce import org.springframework.test.context.ContextConfiguration; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java index e1f1d73d..ed32fb19 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerNamespaceIntegrationTests.java @@ -15,10 +15,14 @@ */ package org.springframework.ldap.itest.manager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import javax.naming.NamingException; +import javax.naming.directory.Attributes; + import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.ldap.NameNotFoundException; @@ -30,9 +34,6 @@ import org.springframework.ldap.itest.transaction.compensating.manager.DummyExce import org.springframework.test.context.ContextConfiguration; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java index 6a0a343e..789b7fd7 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/ContextSourceTransactionManagerSubtreeIntegrationTests.java @@ -18,6 +18,7 @@ package org.springframework.ldap.itest.manager; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.io.ClassPathResource; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java index 51cda96c..924e6e44 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerIntegrationTests.java @@ -15,8 +15,11 @@ */ package org.springframework.ldap.itest.manager.hibernate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.List; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; + import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -24,6 +27,9 @@ import org.hibernate.Transaction; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.ldap.NameNotFoundException; @@ -38,10 +44,6 @@ import org.springframework.orm.hibernate5.HibernateTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java index eeec7a5a..57fb3218 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerLdap179IntegrationTests.java @@ -16,10 +16,11 @@ package org.springframework.ldap.itest.manager.hibernate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.ldap.CommunicationException; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java index 705a47f6..33963cd8 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/manager/hibernate/ContextSourceAndHibernateTransactionManagerNamespaceITests.java @@ -15,8 +15,11 @@ */ package org.springframework.ldap.itest.manager.hibernate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.List; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; + import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -24,6 +27,9 @@ import org.hibernate.Transaction; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.ldap.NameNotFoundException; @@ -37,10 +43,6 @@ import org.springframework.orm.hibernate5.HibernateTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.naming.NamingException; -import javax.naming.directory.Attributes; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java index 77154c27..84088dac 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmGroupManipulationITests.java @@ -16,17 +16,19 @@ package org.springframework.ldap.itest.odm; +import java.util.HashSet; +import java.util.Set; + +import javax.naming.Name; + import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; -import javax.naming.Name; -import java.util.HashSet; -import java.util.Set; - import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.ldap.query.LdapQueryBuilder.query; diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java index 2c8e5e87..cfa5fd88 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithDnAnnotationsITests.java @@ -16,21 +16,22 @@ package org.springframework.ldap.itest.odm; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.springframework.ldap.query.LdapQueryBuilder.query; - import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.itest.AbstractLdapTemplateIntegrationTests; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.springframework.ldap.query.LdapQueryBuilder.query; + /** * @author Mattias Hellborg Arthursson */ diff --git a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java index d72b48db..9ac45009 100644 --- a/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java +++ b/test/integration-tests/src/test/java/org/springframework/ldap/itest/odm/LdapTemplateOdmWithNoDnAnnotationsITests.java @@ -16,15 +16,12 @@ package org.springframework.ldap.itest.odm; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.springframework.ldap.query.LdapQueryBuilder.query; - import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.ldap.core.LdapTemplate; @@ -34,6 +31,10 @@ import org.springframework.ldap.support.LdapNameBuilder; import org.springframework.ldap.support.LdapUtils; import org.springframework.test.context.ContextConfiguration; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.springframework.ldap.query.LdapQueryBuilder.query; + /** * @author Mattias Hellborg Arthursson */