Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Import Order

Browse Source 
Closes gh-749
This commit is contained in:
Josh Cummings
2023-04-11 16:26:29 -06:00
parent ec23b3ebf2
commit c07584be48
310 changed files with 1429 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java
View File

@@ -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

8
test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java
View File

@@ -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

4
test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java
View File

@@ -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.

1
test-support/src/main/java/org/springframework/ldap/test/ContextSourceEc2InstanceLaunchingFactoryBean.java
View File

@@ -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;
/**

3
test-support/src/main/java/org/springframework/ldap/test/DummyDirContext.java
View File

@@ -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

4
test-support/src/main/java/org/springframework/ldap/test/EmbeddedLdapServer.java
View File

@@ -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.
*

36
test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java
View File

@@ -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

9
test-support/src/main/java/org/springframework/ldap/test/LdifPopulator.java
View File

@@ -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

5
test-support/src/main/java/org/springframework/ldap/test/unboundid/LdapTestUtils.java
View File

@@ -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.

6
test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java
View File

@@ -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