From a44295f25f9fa92efc6cc82ec308116092824b96 Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Mon, 26 Sep 2022 13:41:57 +0200 Subject: [PATCH] Clean up imports Signed-off-by: Martin Kemp --- .../dlic/auth/ldap/backend/LDAPAuthenticationBackend.java | 2 +- .../dlic/auth/ldap/backend/LDAPAuthorizationBackend.java | 2 +- .../amazon/dlic/auth/ldap2/LDAPAuthenticationBackend2.java | 2 +- .../com/amazon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java | 4 ++-- .../java/com/amazon/dlic/auth/ldap2/LDAPUserSearcher.java | 2 -- .../dlic/auth/ldap2/LdapBackendTestNewStyleConfig2.java | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthenticationBackend.java b/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthenticationBackend.java index 45a9fba84c..05fa70c821 100755 --- a/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthenticationBackend.java +++ b/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthenticationBackend.java @@ -28,9 +28,9 @@ import org.ldaptive.Connection; import org.ldaptive.ConnectionConfig; import org.ldaptive.LdapEntry; +import org.ldaptive.ReturnAttributes; import org.ldaptive.SearchFilter; import org.ldaptive.SearchScope; -import org.ldaptive.ReturnAttributes; import com.amazon.dlic.auth.ldap.LdapUser; import com.amazon.dlic.auth.ldap.util.ConfigConstants; diff --git a/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthorizationBackend.java b/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthorizationBackend.java index 87cd18bc1b..7146d0f678 100755 --- a/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthorizationBackend.java +++ b/src/main/java/com/amazon/dlic/auth/ldap/backend/LDAPAuthorizationBackend.java @@ -53,6 +53,7 @@ import org.ldaptive.LdapEntry; import org.ldaptive.LdapException; import org.ldaptive.Response; +import org.ldaptive.ReturnAttributes; import org.ldaptive.SearchFilter; import org.ldaptive.SearchScope; import org.ldaptive.control.RequestControl; @@ -65,7 +66,6 @@ import org.ldaptive.ssl.CredentialConfigFactory; import org.ldaptive.ssl.SslConfig; import org.ldaptive.ssl.ThreadLocalTLSSocketFactory; -import org.ldaptive.ReturnAttributes; import com.amazon.dlic.auth.ldap.LdapUser; import com.amazon.dlic.auth.ldap.util.ConfigConstants; diff --git a/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthenticationBackend2.java b/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthenticationBackend2.java index 1cedaaa394..fecaab3467 100755 --- a/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthenticationBackend2.java +++ b/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthenticationBackend2.java @@ -30,8 +30,8 @@ import org.ldaptive.LdapEntry; import org.ldaptive.LdapException; import org.ldaptive.Response; -import org.ldaptive.pool.ConnectionPool; import org.ldaptive.ReturnAttributes; +import org.ldaptive.pool.ConnectionPool; import com.amazon.dlic.auth.ldap.LdapUser; import com.amazon.dlic.auth.ldap.util.ConfigConstants; diff --git a/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java b/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java index fe014dd06c..eb3efb5d10 100755 --- a/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java +++ b/src/main/java/com/amazon/dlic/auth/ldap2/LDAPAuthorizationBackend2.java @@ -15,6 +15,7 @@ import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -23,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.Arrays; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; @@ -36,10 +36,10 @@ import org.ldaptive.LdapAttribute; import org.ldaptive.LdapEntry; import org.ldaptive.LdapException; +import org.ldaptive.ReturnAttributes; import org.ldaptive.SearchFilter; import org.ldaptive.SearchScope; import org.ldaptive.pool.ConnectionPool; -import org.ldaptive.ReturnAttributes; import com.amazon.dlic.auth.ldap.LdapUser; import com.amazon.dlic.auth.ldap.util.ConfigConstants; diff --git a/src/main/java/com/amazon/dlic/auth/ldap2/LDAPUserSearcher.java b/src/main/java/com/amazon/dlic/auth/ldap2/LDAPUserSearcher.java index 9688304f9b..ccd60f450d 100644 --- a/src/main/java/com/amazon/dlic/auth/ldap2/LDAPUserSearcher.java +++ b/src/main/java/com/amazon/dlic/auth/ldap2/LDAPUserSearcher.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.Arrays; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; @@ -26,7 +25,6 @@ import org.ldaptive.LdapEntry; import org.ldaptive.SearchFilter; import org.ldaptive.SearchScope; -import org.ldaptive.ReturnAttributes; import com.amazon.dlic.auth.ldap.util.ConfigConstants; import com.amazon.dlic.auth.ldap.util.LdapHelper; diff --git a/src/test/java/com/amazon/dlic/auth/ldap2/LdapBackendTestNewStyleConfig2.java b/src/test/java/com/amazon/dlic/auth/ldap2/LdapBackendTestNewStyleConfig2.java index ec32a299b3..7389f46d06 100644 --- a/src/test/java/com/amazon/dlic/auth/ldap2/LdapBackendTestNewStyleConfig2.java +++ b/src/test/java/com/amazon/dlic/auth/ldap2/LdapBackendTestNewStyleConfig2.java @@ -14,8 +14,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.TreeSet; import java.util.Arrays; +import java.util.TreeSet; import org.apache.commons.lang3.exception.ExceptionUtils; import org.junit.AfterClass;