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
This commit is contained in:
Phillip Webb
2020-08-05 11:35:47 -07:00
committed by Rob Winch
parent 5f64f53c3f
commit 37fa94fafc
1381 changed files with 5449 additions and 3969 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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