From c5b5cc507cd93522f5b93b24434f49f9782d4abd Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Thu, 4 Jul 2019 19:04:19 +0200 Subject: [PATCH] Cleanup redundant type casts --- .../security/acls/jdbc/BasicLookupStrategy.java | 2 +- .../springframework/security/acls/jdbc/JdbcAclService.java | 2 +- .../springframework/security/acls/domain/AclImplTests.java | 6 +++--- .../security/acls/jdbc/JdbcMutableAclServiceTests.java | 2 +- .../security/cas/jackson2/CasJackson2Module.java | 3 +-- .../builders/AuthenticationManagerBuilder.java | 2 +- .../resource/OAuth2ResourceServerConfigurerTests.java | 4 ++-- .../security/access/expression/ExpressionUtils.java | 2 +- .../access/method/MapBasedMethodSecurityMetadataSource.java | 4 ++-- .../security/jackson2/CoreJackson2Module.java | 3 +-- .../anonymous/AnonymousAuthenticationTokenTests.java | 2 +- .../security/authentication/dao/MockUserCache.java | 3 +-- ...egatingSecurityContextScheduledExecutorServiceTests.java | 2 +- .../core/token/KeyBasedPersistenceTokenServiceTests.java | 2 +- .../security/provisioning/JdbcUserDetailsManagerTests.java | 2 +- .../security/crypto/password/LdapShaPasswordEncoder.java | 2 +- .../python/PythonInterpreterPreInvocationAdvice.java | 2 +- .../PasswordComparisonAuthenticatorTests.java | 3 +-- .../security/ldap/userdetails/LdapUserDetailsManager.java | 2 +- .../integration-test/java/sample/webdriver/IndexPage.java | 2 +- .../src/main/java/sample/contact/ContactDaoSpring.java | 2 +- .../xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java | 4 ++-- .../main/java/sample/dms/secured/SecureDocumentDaoImpl.java | 2 +- .../security/test/web/support/WebTestUtils.java | 4 ++-- .../preauth/j2ee/WebXmlMappableAttributesRetriever.java | 2 +- .../authentication/www/DigestAuthenticationEntryPoint.java | 2 +- .../security/web/savedrequest/FastHttpDateFormat.java | 2 +- .../web/server/DefaultServerRedirectStrategyTests.java | 4 ++-- .../RedirectServerAuthenticationEntryPointTests.java | 2 +- .../RedirectServerAuthenticationFailureHandlerTests.java | 2 +- .../HttpStatusServerAccessDeniedHandlerTests.java | 2 +- 31 files changed, 38 insertions(+), 42 deletions(-) diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java index 4f646d8890..270c13cd78 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java @@ -455,7 +455,7 @@ public class BasicLookupStrategy implements LookupStrategy { // Now we have the parent (if there is one), create the true AclImpl AclImpl result = new AclImpl(inputAcl.getObjectIdentity(), - (Long) inputAcl.getId(), aclAuthorizationStrategy, grantingStrategy, + inputAcl.getId(), aclAuthorizationStrategy, grantingStrategy, parent, null, inputAcl.isEntriesInheriting(), inputAcl.getOwner()); // Copy the "aces" from the input to the destination diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java index b4ab295b12..380bb69306 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java @@ -118,7 +118,7 @@ public class JdbcAclService implements AclService { Assert.isTrue(map.containsKey(object), () -> "There should have been an Acl entry for ObjectIdentity " + object); - return (Acl) map.get(object); + return map.get(object); } public Acl readAclById(ObjectIdentity object) throws NotFoundException { diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java index 1362a45f98..149bbe9db1 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java @@ -501,13 +501,13 @@ public class AclImplTests { assertThat(acl.isSidLoaded(BEN)).isTrue(); assertThat(acl.isSidLoaded(null)).isTrue(); assertThat(acl.isSidLoaded(new ArrayList<>(0))).isTrue(); - assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid( + assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid( "ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED")))) .isTrue(); - assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid( + assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid( "ROLE_GENERAL"), new GrantedAuthoritySid("ROLE_IGNORED")))) .isFalse(); - assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid( + assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid( "ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_GENERAL")))) .isFalse(); } diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java index 6f63bd2649..95f3b386ff 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java @@ -319,7 +319,7 @@ public class JdbcMutableAclServiceTests extends Acl acl = jdbcMutableAclService.readAclById(getTopParentOid()); assertThat(acl).isNotNull(); - assertThat(getTopParentOid()).isEqualTo(((MutableAcl) acl).getObjectIdentity()); + assertThat(getTopParentOid()).isEqualTo(acl.getObjectIdentity()); } @Test diff --git a/cas/src/main/java/org/springframework/security/cas/jackson2/CasJackson2Module.java b/cas/src/main/java/org/springframework/security/cas/jackson2/CasJackson2Module.java index 1119f76c14..5d2e99370d 100644 --- a/cas/src/main/java/org/springframework/security/cas/jackson2/CasJackson2Module.java +++ b/cas/src/main/java/org/springframework/security/cas/jackson2/CasJackson2Module.java @@ -17,7 +17,6 @@ package org.springframework.security.cas.jackson2; import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import org.jasig.cas.client.authentication.AttributePrincipalImpl; import org.jasig.cas.client.validation.AssertionImpl; @@ -48,7 +47,7 @@ public class CasJackson2Module extends SimpleModule { @Override public void setupModule(SetupContext context) { - SecurityJackson2Modules.enableDefaultTyping((ObjectMapper) context.getOwner()); + SecurityJackson2Modules.enableDefaultTyping(context.getOwner()); context.setMixInAnnotations(AssertionImpl.class, AssertionImplMixin.class); context.setMixInAnnotations(AttributePrincipalImpl.class, AttributePrincipalImplMixin.class); context.setMixInAnnotations(CasAuthenticationToken.class, CasAuthenticationTokenMixin.class); diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java index 03d62e399f..36b4a97a28 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java @@ -287,6 +287,6 @@ public class AuthenticationManagerBuilder private > C apply( C configurer) throws Exception { this.defaultUserDetailsService = configurer.getUserDetailsService(); - return (C) super.apply(configurer); + return super.apply(configurer); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java index 995e7d98a8..03a913a21e 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java @@ -2072,11 +2072,11 @@ public class OAuth2ResourceServerConfigurerTests { } private T bean(Class beanClass) { - return (T) this.spring.getContext().getBean(beanClass); + return this.spring.getContext().getBean(beanClass); } private T verifyBean(Class beanClass) { - return (T) verify(this.spring.getContext().getBean(beanClass)); + return verify(this.spring.getContext().getBean(beanClass)); } private String json(String name) throws IOException { diff --git a/core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java b/core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java index a356ad3753..4bc6f347ce 100644 --- a/core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java +++ b/core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java @@ -23,7 +23,7 @@ public final class ExpressionUtils { public static boolean evaluateAsBoolean(Expression expr, EvaluationContext ctx) { try { - return ((Boolean) expr.getValue(ctx, Boolean.class)).booleanValue(); + return expr.getValue(ctx, Boolean.class).booleanValue(); } catch (EvaluationException e) { throw new IllegalArgumentException("Failed to evaluate expression '" diff --git a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java index 6ac0f7e83e..7a67fd002d 100644 --- a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java @@ -98,7 +98,7 @@ public class MapBasedMethodSecurityMetadataSource extends Class clazz) { RegisteredMethod registeredMethod = new RegisteredMethod(method, clazz); if (methodMap.containsKey(registeredMethod)) { - return (List) methodMap.get(registeredMethod); + return methodMap.get(registeredMethod); } // Search superclass if (clazz.getSuperclass() != null) { @@ -166,7 +166,7 @@ public class MapBasedMethodSecurityMetadataSource extends // register all matching methods for (Method method : matchingMethods) { RegisteredMethod registeredMethod = new RegisteredMethod(method, javaType); - String regMethodName = (String) this.nameMap.get(registeredMethod); + String regMethodName = this.nameMap.get(registeredMethod); if ((regMethodName == null) || (!regMethodName.equals(name) && (regMethodName.length() <= name diff --git a/core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java b/core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java index dc263393e8..8e50b2fff3 100644 --- a/core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java +++ b/core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java @@ -17,7 +17,6 @@ package org.springframework.security.jackson2; import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.BadCredentialsException; @@ -54,7 +53,7 @@ public class CoreJackson2Module extends SimpleModule { @Override public void setupModule(SetupContext context) { - SecurityJackson2Modules.enableDefaultTyping((ObjectMapper) context.getOwner()); + SecurityJackson2Modules.enableDefaultTyping(context.getOwner()); context.setMixInAnnotations(AnonymousAuthenticationToken.class, AnonymousAuthenticationTokenMixin.class); context.setMixInAnnotations(RememberMeAuthenticationToken.class, RememberMeAuthenticationTokenMixin.class); context.setMixInAnnotations(SimpleGrantedAuthority.class, SimpleGrantedAuthorityMixin.class); diff --git a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java index 3dcf9f16b1..40afdc6087 100644 --- a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java @@ -58,7 +58,7 @@ public class AnonymousAuthenticationTokenTests { try { new AnonymousAuthenticationToken("key", "Test", - (List) null); + null); fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { diff --git a/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java b/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java index 16a555e458..ea7132f53b 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java @@ -21,7 +21,6 @@ package org.springframework.security.authentication.dao; import java.util.HashMap; import java.util.Map; -import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserCache; import org.springframework.security.core.userdetails.UserDetails; @@ -29,7 +28,7 @@ public class MockUserCache implements UserCache { private Map cache = new HashMap<>(); public UserDetails getUserFromCache(String username) { - return (User) cache.get(username); + return cache.get(username); } public void putUserInCache(UserDetails user) { diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java index e476f64836..ec0d114bb7 100644 --- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java @@ -62,7 +62,7 @@ public abstract class AbstractDelegatingSecurityContextScheduledExecutorServiceT @Test public void scheduleCallable() { when( - (ScheduledFuture) delegate.schedule(wrappedCallable, 1, + delegate.schedule(wrappedCallable, 1, TimeUnit.SECONDS)).thenReturn(expectedResult); ScheduledFuture result = executor.schedule(callable, 1, TimeUnit.SECONDS); assertThat(result).isEqualTo(expectedResult); diff --git a/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java b/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java index cb5e7295ba..bda84bd2c8 100644 --- a/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java +++ b/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java @@ -40,7 +40,7 @@ public class KeyBasedPersistenceTokenServiceTests { service.setServerSecret("MY:SECRET$$$#"); service.setServerInteger(Integer.valueOf(454545)); try { - SecureRandom rnd = (SecureRandom) fb.getObject(); + SecureRandom rnd = fb.getObject(); service.setSecureRandom(rnd); service.afterPropertiesSet(); } diff --git a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java index 80c6ce337b..b60826f0da 100644 --- a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java +++ b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java @@ -406,7 +406,7 @@ public class JdbcUserDetailsManagerTests { private Map cache = new HashMap<>(); public UserDetails getUserFromCache(String username) { - return (User) cache.get(username); + return cache.get(username); } public void putUserInCache(UserDetails user) { diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java index 0a4b36ac7a..90252f3c14 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java +++ b/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java @@ -120,7 +120,7 @@ public class LdapShaPasswordEncoder implements PasswordEncoder { sha.update(salt); } - byte[] hash = combineHashAndSalt(sha.digest(), (byte[]) salt); + byte[] hash = combineHashAndSalt(sha.digest(), salt); String prefix; diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java index 0ab4931a95..d72861f797 100644 --- a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java +++ b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java @@ -62,7 +62,7 @@ public class PythonInterpreterPreInvocationAdvice implements throw new IllegalStateException("Python script did not set the permit flag"); } - return (Boolean) Py.tojava(allowed, Boolean.class); + return Py.tojava(allowed, Boolean.class); } private Map createArgumentMap(MethodInvocation mi) { diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java index 1832975b04..6cfdcb53b3 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java @@ -24,7 +24,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.crypto.keygen.KeyGenerators; import org.springframework.security.crypto.password.LdapShaPasswordEncoder; import org.springframework.security.crypto.password.NoOpPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.ldap.AbstractLdapIntegrationTests; import org.springframework.ldap.core.DirContextAdapter; @@ -122,7 +121,7 @@ public class PasswordComparisonAuthenticatorTests extends AbstractLdapIntegratio @Test(expected = IllegalArgumentException.class) public void testPasswordEncoderCantBeNull() { - authenticator.setPasswordEncoder((PasswordEncoder) null); + authenticator.setPasswordEncoder(null); } @Test diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java index 1225d7af92..582d095d4b 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java @@ -274,7 +274,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { ListIterator modIt = mods.listIterator(); while (modIt.hasNext()) { - ModificationItem mod = (ModificationItem) modIt.next(); + ModificationItem mod = modIt.next(); Attribute a = mod.getAttribute(); if ("objectclass".equalsIgnoreCase(a.getID())) { modIt.remove(); diff --git a/samples/boot/webflux-form/src/integration-test/java/sample/webdriver/IndexPage.java b/samples/boot/webflux-form/src/integration-test/java/sample/webdriver/IndexPage.java index cf7f88a559..9ca07b68f7 100644 --- a/samples/boot/webflux-form/src/integration-test/java/sample/webdriver/IndexPage.java +++ b/samples/boot/webflux-form/src/integration-test/java/sample/webdriver/IndexPage.java @@ -38,7 +38,7 @@ public class IndexPage { public static T to(WebDriver driver, int port, Class page) { driver.get("http://localhost:" + port +"/"); - return (T) PageFactory.initElements(driver, page); + return PageFactory.initElements(driver, page); } public IndexPage assertAt() { diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java b/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java index d648728dad..1fbf647eed 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java @@ -102,7 +102,7 @@ public class ContactDaoSpring extends JdbcDaoSupport implements ContactDao { return null; } else { - return (Contact) list.get(0); + return list.get(0); } } diff --git a/samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java b/samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java index 77b9bc9511..b4c437ca54 100755 --- a/samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java +++ b/samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java @@ -112,7 +112,7 @@ public class DocumentDaoImpl extends JdbcDaoSupport implements DocumentDao { .getLong("id"))); } }); - return (AbstractElement[]) directories.toArray(new AbstractElement[] {}); + return directories.toArray(new AbstractElement[] {}); } List directories = getJdbcTemplate().query( SELECT_FROM_DIRECTORY, new Object[] { directory.getId() }, @@ -140,7 +140,7 @@ public class DocumentDaoImpl extends JdbcDaoSupport implements DocumentDao { }); // Add the File elements after the Directory elements directories.addAll(files); - return (AbstractElement[]) directories.toArray(new AbstractElement[] {}); + return directories.toArray(new AbstractElement[] {}); } public void update(File file) { diff --git a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java index 6d04951edd..bc349e86bc 100755 --- a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java +++ b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java @@ -48,7 +48,7 @@ public class SecureDocumentDaoImpl extends DocumentDaoImpl implements SecureDocu } public String[] getUsers() { - return (String[]) getJdbcTemplate().query(SELECT_FROM_USERS, + return getJdbcTemplate().query(SELECT_FROM_USERS, new RowMapper() { public String mapRow(ResultSet rs, int rowNumber) throws SQLException { return rs.getString("USERNAME"); diff --git a/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java b/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java index eb0c175abd..98294cd08a 100644 --- a/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java +++ b/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java @@ -122,7 +122,7 @@ public abstract class WebTestUtils { if (springSecurityFilterChain == null) { return null; } - List filters = (List) ReflectionTestUtils + List filters = ReflectionTestUtils .invokeMethod(springSecurityFilterChain, "getFilters", request); if (filters == null) { return null; @@ -157,4 +157,4 @@ public abstract class WebTestUtils { private WebTestUtils() { } -} \ No newline at end of file +} diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java index 4613ebedf2..a8905b67ab 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java @@ -89,7 +89,7 @@ public class WebXmlMappableAttributesRetriever implements ResourceLoaderAware, NodeList roles = secRoleElt.getElementsByTagName("role-name"); if (roles.getLength() > 0) { - String roleName = ((Element) roles.item(0)).getTextContent().trim(); + String roleName = roles.item(0).getTextContent().trim(); roleNames.add(roleName); logger.info("Retrieved role-name '" + roleName + "' from web.xml"); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java index b74353e578..76de0ddfc1 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java @@ -84,7 +84,7 @@ public class DigestAuthenticationEntryPoint implements AuthenticationEntryPoint, public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { - HttpServletResponse httpResponse = (HttpServletResponse) response; + HttpServletResponse httpResponse = response; // compute a nonce (do not use remote IP address due to proxy farms) // format of nonce is: diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java b/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java index eb73762bd5..1543fdf065 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java @@ -177,7 +177,7 @@ public class FastHttpDateFormat { Long cachedDate = null; try { - cachedDate = (Long) parseCache.get(value); + cachedDate = parseCache.get(value); } catch (Exception ignored) { } diff --git a/web/src/test/java/org/springframework/security/web/server/DefaultServerRedirectStrategyTests.java b/web/src/test/java/org/springframework/security/web/server/DefaultServerRedirectStrategyTests.java index b81a419985..53833842d5 100644 --- a/web/src/test/java/org/springframework/security/web/server/DefaultServerRedirectStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/server/DefaultServerRedirectStrategyTests.java @@ -47,12 +47,12 @@ public class DefaultServerRedirectStrategyTests { @Test(expected = IllegalArgumentException.class) public void sendRedirectWhenLocationNullThenException() { - this.strategy.sendRedirect(this.exchange, (URI) null); + this.strategy.sendRedirect(this.exchange, null); } @Test(expected = IllegalArgumentException.class) public void sendRedirectWhenExchangeNullThenException() { - this.strategy.sendRedirect((ServerWebExchange) null, this.location); + this.strategy.sendRedirect(null, this.location); } @Test diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationEntryPointTests.java index 6b3ac375e3..ab3f9eab06 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationEntryPointTests.java @@ -56,7 +56,7 @@ public class RedirectServerAuthenticationEntryPointTests { @Test(expected = IllegalArgumentException.class) public void constructorStringWhenNullLocationThenException() { - new RedirectServerAuthenticationEntryPoint((String) null); + new RedirectServerAuthenticationEntryPoint(null); } @Test diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationFailureHandlerTests.java b/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationFailureHandlerTests.java index 3387df5fad..f5e6390cdb 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationFailureHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationFailureHandlerTests.java @@ -56,7 +56,7 @@ public class RedirectServerAuthenticationFailureHandlerTests { @Test(expected = IllegalArgumentException.class) public void constructorStringWhenNullLocationThenException() { - new RedirectServerAuthenticationEntryPoint((String) null); + new RedirectServerAuthenticationEntryPoint(null); } @Test diff --git a/web/src/test/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandlerTests.java b/web/src/test/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandlerTests.java index fcd2b7d131..b61e5ee6d0 100644 --- a/web/src/test/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandlerTests.java @@ -45,7 +45,7 @@ public class HttpStatusServerAccessDeniedHandlerTests { @Test(expected = IllegalArgumentException.class) public void constructorHttpStatusWhenNullThenException() { - new HttpStatusServerAccessDeniedHandler((HttpStatus) null); + new HttpStatusServerAccessDeniedHandler(null); } @Test