Polish

Fixes gh-3892

core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java

@@ -19,7 +19,6 @@ package org.springframework.security.access.intercept;
 import java.util.Collection;
 
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 
 /**

core/src/main/java/org/springframework/security/access/intercept/aspectj/MethodInvocationAdapter.java

@@ -22,8 +22,6 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.CodeSignature;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 
 /**
  * Decorates a JoinPoint to allow it to be used with method-security infrastructure

core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java

@@ -26,7 +26,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java

@@ -16,7 +16,6 @@
 
 package org.springframework.security.access.vote;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.logging.Log;

core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java

@@ -18,7 +18,6 @@ package org.springframework.security.authentication;
 
 import java.io.Serializable;
 import java.util.Collection;
-import java.util.List;
 
 import org.springframework.security.core.GrantedAuthority;
 

core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java

@@ -17,7 +17,6 @@
 package org.springframework.security.authentication.dao;
 
 import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.AuthenticationServiceException;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.InternalAuthenticationServiceException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

core/src/main/java/org/springframework/security/authentication/encoding/LdapShaPasswordEncoder.java

@@ -16,7 +16,6 @@
 
 package org.springframework.security.authentication.encoding;
 
-import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 
 import org.springframework.security.crypto.codec.Base64;

core/src/main/java/org/springframework/security/authentication/encoding/Md4PasswordEncoder.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.security.authentication.encoding;
 
-import java.io.UnsupportedEncodingException;
-
 import org.springframework.security.crypto.codec.Base64;
 import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.codec.Utf8;

core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoderUtils.java

@@ -17,8 +17,6 @@ package org.springframework.security.authentication.encoding;
 
 import org.springframework.security.crypto.codec.Utf8;
 
-import java.io.UnsupportedEncodingException;
-
 /**
  * Utility for constant time comparison to prevent against timing attacks.
  *

core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java

@@ -25,7 +25,6 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 

core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java

@@ -20,7 +20,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 

core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java

@@ -16,7 +16,6 @@
 package org.springframework.security.core.authority.mapping;
 
 import java.util.Collection;
-import java.util.List;
 
 import org.springframework.security.core.GrantedAuthority;
 

core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.security.access.expression;
 
-import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.assertj.core.api.Assertions.*;

core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java

@@ -16,8 +16,6 @@
 package org.springframework.security.access.expression.method;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 import org.junit.Before;
@@ -30,8 +28,6 @@ import org.springframework.security.access.expression.ExpressionUtils;
 import org.springframework.security.authentication.AuthenticationTrustResolver;
 import org.springframework.security.core.Authentication;
 
-import java.util.*;
-
 /**
  * Tests for {@link MethodSecurityExpressionRoot}
  *

core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java

@@ -17,7 +17,6 @@
 package org.springframework.security.access.intercept.aopalliance;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import org.aopalliance.intercept.MethodInvocation;

core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java

@@ -17,7 +17,6 @@
 package org.springframework.security.access.intercept.aspectj;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import org.aopalliance.intercept.MethodInvocation;

core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java

@@ -18,7 +18,6 @@ package org.springframework.security.access.vote;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;

core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.security.authentication;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.*;

core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java

@@ -17,7 +17,6 @@
 package org.springframework.security.authentication;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;

core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java

@@ -17,7 +17,6 @@
 package org.springframework.security.authentication.rcp;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;

core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java

@@ -21,11 +21,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.SmartApplicationListener;
-import org.springframework.security.core.session.SessionDestroyedEvent;
 
-import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;

core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java

@@ -34,7 +34,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 import org.springframework.core.SpringVersion;
-import org.springframework.test.util.ReflectionTestUtils;
 
 /**
  * Checks that the embedded version information is up to date.

core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java

@@ -21,13 +21,11 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.core.SpringVersion;
 import org.springframework.security.access.method.P;
 import org.springframework.test.util.ReflectionTestUtils;
 

core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java

@@ -17,7 +17,6 @@ package org.springframework.security.provisioning;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
-import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collections;
 import java.util.HashMap;