Cleanup redundant type casts

acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java

@@ -455,7 +455,7 @@ private AclImpl convert(Map<Serializable, Acl> inputMap, Long currentIdentity) {
 
 		// 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

acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java

@@ -118,7 +118,7 @@ public Acl readAclById(ObjectIdentity object, List<Sid> sids)
 		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 {

acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java

@@ -501,13 +501,13 @@ public void isSidLoadedBehavesAsExpected() throws Exception {
 		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();
 	}

acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java

@@ -319,7 +319,7 @@ public void deleteAclAlsoDeletesChildren() throws Exception {
 
 		Acl acl = jdbcMutableAclService.readAclById(getTopParentOid());
 		assertThat(acl).isNotNull();
-		assertThat(getTopParentOid()).isEqualTo(((MutableAcl) acl).getObjectIdentity());
+		assertThat(getTopParentOid()).isEqualTo(acl.getObjectIdentity());
 	}
 
 	@Test

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 CasJackson2Module() {
 
 	@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);

config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java

@@ -287,6 +287,6 @@ public UserDetailsService getDefaultUserDetailsService() {
 	private <C extends UserDetailsAwareConfigurer<AuthenticationManagerBuilder, ? extends UserDetailsService>> C apply(
 			C configurer) throws Exception {
 		this.defaultUserDetailsService = configurer.getUserDetailsService();
-		return (C) super.apply(configurer);
+		return super.apply(configurer);
 	}
 }

config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java

@@ -2072,11 +2072,11 @@ private void mockRestOperations(String response) {
 	}
 
 	private <T> T bean(Class<T> beanClass) {
-		return (T) this.spring.getContext().getBean(beanClass);
+		return this.spring.getContext().getBean(beanClass);
 	}
 
 	private <T> T verifyBean(Class<T> beanClass) {
-		return (T) verify(this.spring.getContext().getBean(beanClass));
+		return verify(this.spring.getContext().getBean(beanClass));
 	}
 
 	private String json(String name) throws IOException {

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 '"

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

@@ -98,7 +98,7 @@ private List<ConfigAttribute> findAttributesSpecifiedAgainst(Method method,
 			Class<?> clazz) {
 		RegisteredMethod registeredMethod = new RegisteredMethod(method, clazz);
 		if (methodMap.containsKey(registeredMethod)) {
-			return (List<ConfigAttribute>) methodMap.get(registeredMethod);
+			return methodMap.get(registeredMethod);
 		}
 		// Search superclass
 		if (clazz.getSuperclass() != null) {
@@ -166,7 +166,7 @@ public void addSecureMethod(Class<?> javaType, String mappedName,
 		// 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

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 CoreJackson2Module() {
 
 	@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);

core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java

@@ -58,7 +58,7 @@ public void testConstructorRejectsNulls() {
 
 		try {
 			new AnonymousAuthenticationToken("key", "Test",
-					(List<GrantedAuthority>) null);
+					null);
 			fail("Should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {

core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java

@@ -21,15 +21,14 @@
 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;
 
 public class MockUserCache implements UserCache {
 	private Map<String, UserDetails> cache = new HashMap<>();
 
 	public UserDetails getUserFromCache(String username) {
-		return (User) cache.get(username);
+		return cache.get(username);
 	}
 
 	public void putUserInCache(UserDetails user) {

core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java

@@ -62,7 +62,7 @@ public void scheduleRunnable() {
 	@Test
 	public void scheduleCallable() {
 		when(
-				(ScheduledFuture<Object>) delegate.schedule(wrappedCallable, 1,
+				delegate.schedule(wrappedCallable, 1,
 						TimeUnit.SECONDS)).thenReturn(expectedResult);
 		ScheduledFuture<Object> result = executor.schedule(callable, 1, TimeUnit.SECONDS);
 		assertThat(result).isEqualTo(expectedResult);

core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java

@@ -40,7 +40,7 @@ private KeyBasedPersistenceTokenService getService() {
 		service.setServerSecret("MY:SECRET$$$#");
 		service.setServerInteger(Integer.valueOf(454545));
 		try {
-			SecureRandom rnd = (SecureRandom) fb.getObject();
+			SecureRandom rnd = fb.getObject();
 			service.setSecureRandom(rnd);
 			service.afterPropertiesSet();
 		}

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

@@ -406,7 +406,7 @@ private class MockUserCache implements UserCache {
 		private Map<String, UserDetails> cache = new HashMap<>();
 
 		public UserDetails getUserFromCache(String username) {
-			return (User) cache.get(username);
+			return cache.get(username);
 		}
 
 		public void putUserInCache(UserDetails user) {

crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java

@@ -120,7 +120,7 @@ private String encode(CharSequence rawPassword, byte[] salt) {
 			sha.update(salt);
 		}
 
-		byte[] hash = combineHashAndSalt(sha.digest(), (byte[]) salt);
+		byte[] hash = combineHashAndSalt(sha.digest(), salt);
 
 		String prefix;
 

itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java

@@ -62,7 +62,7 @@ public boolean before(Authentication authentication, MethodInvocation mi,
 			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<String, Object> createArgumentMap(MethodInvocation mi) {

ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java

@@ -24,7 +24,6 @@
 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 void testLdapCompareSucceedsWithShaEncodedPassword() {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testPasswordEncoderCantBeNull() {
-		authenticator.setPasswordEncoder((PasswordEncoder) null);
+		authenticator.setPasswordEncoder(null);
 	}
 
 	@Test

ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java

@@ -274,7 +274,7 @@ public void updateUser(UserDetails user) {
 		ListIterator<ModificationItem> 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();

samples/boot/webflux-form/src/integration-test/java/sample/webdriver/IndexPage.java

@@ -38,7 +38,7 @@ public IndexPage(WebDriver webDriver) {
 
 	public static <T> T to(WebDriver driver, int port, Class<T> page) {
 		driver.get("http://localhost:" + port +"/");
-		return (T) PageFactory.initElements(driver, page);
+		return PageFactory.initElements(driver, page);
 	}
 
 	public IndexPage assertAt() {

samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java

@@ -102,7 +102,7 @@ public Contact mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return null;
 		}
 		else {
-			return (Contact) list.get(0);
+			return list.get(0);
 		}
 	}
 

samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java

@@ -112,7 +112,7 @@ public Directory mapRow(ResultSet rs, int rowNumber)
 									.getLong("id")));
 						}
 					});
-			return (AbstractElement[]) directories.toArray(new AbstractElement[] {});
+			return directories.toArray(new AbstractElement[] {});
 		}
 		List<AbstractElement> directories = getJdbcTemplate().query(
 				SELECT_FROM_DIRECTORY, new Object[] { directory.getId() },
@@ -140,7 +140,7 @@ public File mapRow(ResultSet rs, int rowNumber) throws SQLException {
 				});
 		// 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) {

samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java

@@ -48,7 +48,7 @@ public SecureDocumentDaoImpl(MutableAclService mutableAclService) {
 	}
 
 	public String[] getUsers() {
-		return (String[]) getJdbcTemplate().query(SELECT_FROM_USERS,
+		return getJdbcTemplate().query(SELECT_FROM_USERS,
 				new RowMapper<String>() {
 					public String mapRow(ResultSet rs, int rowNumber) throws SQLException {
 						return rs.getString("USERNAME");

test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java

@@ -122,7 +122,7 @@ static <T extends Filter> T findFilter(HttpServletRequest request,
 		if (springSecurityFilterChain == null) {
 			return null;
 		}
-		List<Filter> filters = (List<Filter>) ReflectionTestUtils
+		List<Filter> filters = ReflectionTestUtils
 				.invokeMethod(springSecurityFilterChain, "getFilters", request);
 		if (filters == null) {
 			return null;
@@ -157,4 +157,4 @@ private static Filter getSpringSecurityFilterChain(ServletContext servletContext
 
 	private WebTestUtils() {
 	}
-}
+}

web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java

@@ -89,7 +89,7 @@ public void afterPropertiesSet() throws Exception {
 			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");
 			}

web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java

@@ -84,7 +84,7 @@ public void afterPropertiesSet() throws Exception {
 
 	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:

web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java

@@ -177,7 +177,7 @@ public static long parseDate(String value, DateFormat[] threadLocalformats) {
 		Long cachedDate = null;
 
 		try {
-			cachedDate = (Long) parseCache.get(value);
+			cachedDate = parseCache.get(value);
 		}
 		catch (Exception ignored) {
 		}

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

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

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

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