Organize imports

Use "organize imports" from Eclipse to cleanup import statements so that they appear in a consistent and well defined order. Issue gh-8945
2026-05-22 21:33:16 +00:00 · 2020-08-05 11:35:47 -07:00
parent 5f64f53c3f
commit 37fa94fafc
1381 changed files with 5449 additions and 3969 deletions
@@ -16,6 +16,7 @@
 package org.springframework.security.crypto.argon2;

 import java.util.Base64;
+
 import org.bouncycastle.crypto.params.Argon2Parameters;
 import org.bouncycastle.util.Arrays;

@@ -20,6 +20,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.bouncycastle.crypto.generators.Argon2BytesGenerator;
 import org.bouncycastle.crypto.params.Argon2Parameters;
+
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;
 import org.springframework.security.crypto.keygen.KeyGenerators;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -15,8 +15,8 @@ package org.springframework.security.crypto.bcrypt;

 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
-import java.util.Arrays;
 import java.security.SecureRandom;
+import java.util.Arrays;

 /**
 * BCrypt implements OpenBSD-style Blowfish password hashing using the scheme described in
@@ -15,14 +15,15 @@
 */
 package org.springframework.security.crypto.bcrypt;

-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
 import java.security.SecureRandom;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.security.crypto.password.PasswordEncoder;
+
 /**
 * Implementation of PasswordEncoder that uses the BCrypt strong hashing function. Clients
 * can optionally supply a "version" ($2a, $2b, $2y) and a "strength" (a.k.a. log rounds
@@ -15,13 +15,6 @@
 */
 package org.springframework.security.crypto.encrypt;

-import static org.springframework.security.crypto.encrypt.CipherUtils.doFinal;
-import static org.springframework.security.crypto.encrypt.CipherUtils.initCipher;
-import static org.springframework.security.crypto.encrypt.CipherUtils.newCipher;
-import static org.springframework.security.crypto.encrypt.CipherUtils.newSecretKey;
-import static org.springframework.security.crypto.util.EncodingUtils.concatenate;
-import static org.springframework.security.crypto.util.EncodingUtils.subArray;
-
 import java.security.spec.AlgorithmParameterSpec;

 import javax.crypto.Cipher;
@@ -35,6 +28,13 @@ import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;
 import org.springframework.security.crypto.keygen.KeyGenerators;

+import static org.springframework.security.crypto.encrypt.CipherUtils.doFinal;
+import static org.springframework.security.crypto.encrypt.CipherUtils.initCipher;
+import static org.springframework.security.crypto.encrypt.CipherUtils.newCipher;
+import static org.springframework.security.crypto.encrypt.CipherUtils.newSecretKey;
+import static org.springframework.security.crypto.util.EncodingUtils.concatenate;
+import static org.springframework.security.crypto.util.EncodingUtils.subArray;
+
 /**
 * Encryptor that uses AES encryption.
 *
@@ -18,6 +18,7 @@ package org.springframework.security.crypto.encrypt;
 import org.bouncycastle.crypto.PBEParametersGenerator;
 import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
 import org.bouncycastle.crypto.params.KeyParameter;
+
 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;
 import org.springframework.security.crypto.keygen.KeyGenerators;
@@ -15,18 +15,19 @@
 */
 package org.springframework.security.crypto.encrypt;

-import static org.springframework.security.crypto.util.EncodingUtils.concatenate;
-import static org.springframework.security.crypto.util.EncodingUtils.subArray;
-
 import org.bouncycastle.crypto.BufferedBlockCipher;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
 import org.bouncycastle.crypto.paddings.PKCS7Padding;
 import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
 import org.bouncycastle.crypto.params.ParametersWithIV;
+
 import org.springframework.security.crypto.encrypt.AesBytesEncryptor.CipherAlgorithm;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;

+import static org.springframework.security.crypto.util.EncodingUtils.concatenate;
+import static org.springframework.security.crypto.util.EncodingUtils.subArray;
+
 /**
 * An Encryptor equivalent to {@link AesBytesEncryptor} using {@link CipherAlgorithm#CBC}
 * that uses Bouncy Castle instead of JCE. The algorithm is equivalent to
@@ -15,16 +15,17 @@
 */
 package org.springframework.security.crypto.encrypt;

-import static org.springframework.security.crypto.util.EncodingUtils.concatenate;
-import static org.springframework.security.crypto.util.EncodingUtils.subArray;
-
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.modes.AEADBlockCipher;
 import org.bouncycastle.crypto.modes.GCMBlockCipher;
 import org.bouncycastle.crypto.params.AEADParameters;
+
 import org.springframework.security.crypto.encrypt.AesBytesEncryptor.CipherAlgorithm;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;

+import static org.springframework.security.crypto.util.EncodingUtils.concatenate;
+import static org.springframework.security.crypto.util.EncodingUtils.subArray;
+
 /**
 * An Encryptor equivalent to {@link AesBytesEncryptor} using {@link CipherAlgorithm#GCM}
 * that uses Bouncy Castle instead of JCE. The algorithm is equivalent to
@@ -16,6 +16,9 @@

 package org.springframework.security.crypto.factory;

+import java.util.HashMap;
+import java.util.Map;
+
 import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
@@ -23,9 +26,6 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
 import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder;

-import java.util.HashMap;
-import java.util.Map;
-
 /**
 * Used for creating {@link PasswordEncoder} instances
 *
@@ -15,12 +15,12 @@
 */
 package org.springframework.security.crypto.password;

+import java.security.MessageDigest;
+
 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;
 import org.springframework.security.crypto.keygen.KeyGenerators;

-import java.security.MessageDigest;
-
 import static org.springframework.security.crypto.util.EncodingUtils.concatenate;
 import static org.springframework.security.crypto.util.EncodingUtils.subArray;

@@ -16,13 +16,13 @@

 package org.springframework.security.crypto.password;

+import java.security.MessageDigest;
+import java.util.Base64;
+
 import org.springframework.security.crypto.codec.Utf8;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;
 import org.springframework.security.crypto.keygen.KeyGenerators;

-import java.security.MessageDigest;
-import java.util.Base64;
-
 /**
 * This {@link PasswordEncoder} is provided for legacy purposes only and is not considered
 * secure.
@@ -15,13 +15,13 @@
 */
 package org.springframework.security.crypto.password;

+import java.util.Base64;
+
 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.codec.Utf8;
 import org.springframework.security.crypto.keygen.Base64StringKeyGenerator;
 import org.springframework.security.crypto.keygen.StringKeyGenerator;

-import java.util.Base64;
-
 /**
 * This {@link PasswordEncoder} is provided for legacy purposes only and is not considered
 * secure.
@@ -15,14 +15,14 @@
 */
 package org.springframework.security.crypto.password;

+import java.security.MessageDigest;
+import java.util.Base64;
+
 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.codec.Utf8;
 import org.springframework.security.crypto.keygen.Base64StringKeyGenerator;
 import org.springframework.security.crypto.keygen.StringKeyGenerator;

-import java.security.MessageDigest;
-import java.util.Base64;
-
 /**
 * This {@link PasswordEncoder} is provided for legacy purposes only and is not considered
 * secure.
@@ -15,10 +15,10 @@
 */
 package org.springframework.security.crypto.password;

-import org.springframework.security.crypto.codec.Utf8;
-
 import java.security.MessageDigest;

+import org.springframework.security.crypto.codec.Utf8;
+
 /**
 * Utility for constant time comparison to prevent against timing attacks.
 *
@@ -15,15 +15,15 @@
 */
 package org.springframework.security.crypto.password;

-import static org.springframework.security.crypto.util.EncodingUtils.concatenate;
-import static org.springframework.security.crypto.util.EncodingUtils.subArray;
+import java.security.MessageDigest;

 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.codec.Utf8;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;
 import org.springframework.security.crypto.keygen.KeyGenerators;

-import java.security.MessageDigest;
+import static org.springframework.security.crypto.util.EncodingUtils.concatenate;
+import static org.springframework.security.crypto.util.EncodingUtils.subArray;

 /**
 * This {@link PasswordEncoder} is provided for legacy purposes only and is not considered
@@ -21,6 +21,7 @@ import java.util.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.bouncycastle.crypto.generators.SCrypt;
+
 import org.springframework.security.crypto.codec.Utf8;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;
 import org.springframework.security.crypto.keygen.KeyGenerators;
@@ -15,12 +15,13 @@
 */
 package org.springframework.security.crypto.argon2;

-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.util.Base64;
+
 import org.bouncycastle.crypto.params.Argon2Parameters;
 import org.junit.Test;

+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
 * @author Simeon Macke
 */
@@ -15,17 +15,19 @@
 */
 package org.springframework.security.crypto.argon2;

-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.lang.reflect.Field;
 import java.util.Arrays;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
+
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;

+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
 * @author Simeon Macke
 */
@@ -15,10 +15,10 @@
 */
 package org.springframework.security.crypto.bcrypt;

-import org.junit.Test;
-
 import java.security.SecureRandom;

+import org.junit.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;

 /**
@@ -14,13 +14,13 @@

 package org.springframework.security.crypto.bcrypt;

-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import static org.assertj.core.api.Assertions.assertThat;

 /**
@@ -15,9 +15,9 @@
 */
 package org.springframework.security.crypto.codec;

-import static org.assertj.core.api.Assertions.*;
+import org.junit.Test;

-import org.junit.*;
+import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Luke Taylor
@@ -15,11 +15,11 @@
 */
 package org.springframework.security.crypto.codec;

-import static org.assertj.core.api.Assertions.*;
+import java.util.Arrays;

-import org.junit.*;
+import org.junit.Test;

-import java.util.*;
+import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Luke Taylor
@@ -16,15 +16,15 @@

 package org.springframework.security.crypto.encrypt;

+import javax.crypto.SecretKey;
+import javax.crypto.spec.PBEKeySpec;
+
 import org.junit.Before;
 import org.junit.Test;

 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;

-import javax.crypto.SecretKey;
-import javax.crypto.spec.PBEKeySpec;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -22,6 +22,7 @@ import java.util.UUID;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.encrypt.AesBytesEncryptor.CipherAlgorithm;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;
@@ -22,6 +22,7 @@ import org.bouncycastle.util.Arrays;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.keygen.KeyGenerators;

@@ -22,6 +22,7 @@ import javax.crypto.NoSuchPaddingException;

 import org.junit.Assume;
 import org.junit.AssumptionViolatedException;
+
 import org.springframework.security.crypto.encrypt.AesBytesEncryptor.CipherAlgorithm;

 public class CryptoAssumptions {
@@ -15,10 +15,10 @@
 */
 package org.springframework.security.crypto.encrypt;

-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;

+import static org.assertj.core.api.Assertions.assertThat;
+
 public class EncryptorsTests {

 	@Test
@@ -17,6 +17,7 @@
 package org.springframework.security.crypto.factory;

 import org.junit.Test;
+
 import org.springframework.security.crypto.password.PasswordEncoder;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -16,11 +16,11 @@

 package org.springframework.security.crypto.keygen;

-import org.junit.Test;
-
 import java.util.Base64;

-import static org.assertj.core.api.Assertions.*;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Rob Winch
@@ -15,13 +15,14 @@
 */
 package org.springframework.security.crypto.keygen;

-import static org.assertj.core.api.Assertions.*;
-
 import java.util.Arrays;

 import org.junit.Test;
+
 import org.springframework.security.crypto.codec.Hex;

+import static org.assertj.core.api.Assertions.assertThat;
+
 public class KeyGeneratorsTests {

 	@Test
@@ -16,16 +16,16 @@

 package org.springframework.security.crypto.password;

+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;

-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
@@ -15,12 +15,12 @@
 */
 package org.springframework.security.crypto.password;

-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;
+
 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.codec.Utf8;
-import org.springframework.security.crypto.password.Digester;
+
+import static org.assertj.core.api.Assertions.assertThat;

 public class DigesterTests {

@@ -17,6 +17,7 @@
 package org.springframework.security.crypto.password;

 import org.junit.Test;
+
 import org.springframework.security.crypto.keygen.KeyGenerators;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -16,10 +16,10 @@

 package org.springframework.security.crypto.password;

-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;

+import static org.assertj.core.api.Assertions.assertThat;
+
@SuppressWarnings("deprecation")
 public class Md4PasswordEncoderTests {

@@ -15,10 +15,10 @@
 */
 package org.springframework.security.crypto.password;

-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;

+import static org.assertj.core.api.Assertions.assertThat;
+
@SuppressWarnings("deprecation")
 public class StandardPasswordEncoderTests {

@@ -15,10 +15,10 @@
 */
 package org.springframework.security.crypto.scrypt;

-import static org.assertj.core.api.Assertions.*;
-
 import org.junit.Test;

+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
 * @author Shazin Sadakath
 *
@@ -15,13 +15,14 @@
 */
 package org.springframework.security.crypto.util;

-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.util.Arrays;

 import org.junit.Test;
+
 import org.springframework.security.crypto.codec.Hex;

+import static org.assertj.core.api.Assertions.assertThat;
+
 public class EncodingUtilsTests {

 	@Test