Skip to content

Commit c5b5cc5

Browse files
larsgreferrwinch
larsgrefer
authored and
rwinch
committed
Cleanup redundant type casts
1 parent 43737a5 commit c5b5cc5

File tree

31 files changed

+38
-42
lines changed

31 files changed

+38
-42
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ private AclImpl convert(Map<Serializable, Acl> inputMap, Long currentIdentity) {
455455

456456
// Now we have the parent (if there is one), create the true AclImpl
457457
AclImpl result = new AclImpl(inputAcl.getObjectIdentity(),
458-
(Long) inputAcl.getId(), aclAuthorizationStrategy, grantingStrategy,
458+
inputAcl.getId(), aclAuthorizationStrategy, grantingStrategy,
459459
parent, null, inputAcl.isEntriesInheriting(), inputAcl.getOwner());
460460

461461
// Copy the "aces" from the input to the destination

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public Acl readAclById(ObjectIdentity object, List<Sid> sids)
118118
Assert.isTrue(map.containsKey(object),
119119
() -> "There should have been an Acl entry for ObjectIdentity " + object);
120120

121-
return (Acl) map.get(object);
121+
return map.get(object);
122122
}
123123

124124
public Acl readAclById(ObjectIdentity object) throws NotFoundException {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -501,13 +501,13 @@ public void isSidLoadedBehavesAsExpected() throws Exception {
501501
assertThat(acl.isSidLoaded(BEN)).isTrue();
502502
assertThat(acl.isSidLoaded(null)).isTrue();
503503
assertThat(acl.isSidLoaded(new ArrayList<>(0))).isTrue();
504-
assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
504+
assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid(
505505
"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED"))))
506506
.isTrue();
507-
assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
507+
assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid(
508508
"ROLE_GENERAL"), new GrantedAuthoritySid("ROLE_IGNORED"))))
509509
.isFalse();
510-
assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
510+
assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid(
511511
"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_GENERAL"))))
512512
.isFalse();
513513
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ public void deleteAclAlsoDeletesChildren() throws Exception {
319319

320320
Acl acl = jdbcMutableAclService.readAclById(getTopParentOid());
321321
assertThat(acl).isNotNull();
322-
assertThat(getTopParentOid()).isEqualTo(((MutableAcl) acl).getObjectIdentity());
322+
assertThat(getTopParentOid()).isEqualTo(acl.getObjectIdentity());
323323
}
324324

325325
@Test

‎cas/src/main/java/org/springframework/security/cas/jackson2/CasJackson2Module.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.springframework.security.cas.jackson2;
1818

1919
import com.fasterxml.jackson.core.Version;
20-
import com.fasterxml.jackson.databind.ObjectMapper;
2120
import com.fasterxml.jackson.databind.module.SimpleModule;
2221
import org.jasig.cas.client.authentication.AttributePrincipalImpl;
2322
import org.jasig.cas.client.validation.AssertionImpl;
@@ -48,7 +47,7 @@ public CasJackson2Module() {
4847

4948
@Override
5049
public void setupModule(SetupContext context) {
51-
SecurityJackson2Modules.enableDefaultTyping((ObjectMapper) context.getOwner());
50+
SecurityJackson2Modules.enableDefaultTyping(context.getOwner());
5251
context.setMixInAnnotations(AssertionImpl.class, AssertionImplMixin.class);
5352
context.setMixInAnnotations(AttributePrincipalImpl.class, AttributePrincipalImplMixin.class);
5453
context.setMixInAnnotations(CasAuthenticationToken.class, CasAuthenticationTokenMixin.class);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,6 @@ public UserDetailsService getDefaultUserDetailsService() {
287287
private <C extends UserDetailsAwareConfigurer<AuthenticationManagerBuilder, ? extends UserDetailsService>> C apply(
288288
C configurer) throws Exception {
289289
this.defaultUserDetailsService = configurer.getUserDetailsService();
290-
return (C) super.apply(configurer);
290+
return super.apply(configurer);
291291
}
292292
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2072,11 +2072,11 @@ private void mockRestOperations(String response) {
20722072
}
20732073

20742074
private <T> T bean(Class<T> beanClass) {
2075-
return (T) this.spring.getContext().getBean(beanClass);
2075+
return this.spring.getContext().getBean(beanClass);
20762076
}
20772077

20782078
private <T> T verifyBean(Class<T> beanClass) {
2079-
return (T) verify(this.spring.getContext().getBean(beanClass));
2079+
return verify(this.spring.getContext().getBean(beanClass));
20802080
}
20812081

20822082
private String json(String name) throws IOException {

‎core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public final class ExpressionUtils {
2323

2424
public static boolean evaluateAsBoolean(Expression expr, EvaluationContext ctx) {
2525
try {
26-
return ((Boolean) expr.getValue(ctx, Boolean.class)).booleanValue();
26+
return expr.getValue(ctx, Boolean.class).booleanValue();
2727
}
2828
catch (EvaluationException e) {
2929
throw new IllegalArgumentException("Failed to evaluate expression '"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private List<ConfigAttribute> findAttributesSpecifiedAgainst(Method method,
9898
Class<?> clazz) {
9999
RegisteredMethod registeredMethod = new RegisteredMethod(method, clazz);
100100
if (methodMap.containsKey(registeredMethod)) {
101-
return (List<ConfigAttribute>) methodMap.get(registeredMethod);
101+
return methodMap.get(registeredMethod);
102102
}
103103
// Search superclass
104104
if (clazz.getSuperclass() != null) {
@@ -166,7 +166,7 @@ public void addSecureMethod(Class<?> javaType, String mappedName,
166166
// register all matching methods
167167
for (Method method : matchingMethods) {
168168
RegisteredMethod registeredMethod = new RegisteredMethod(method, javaType);
169-
String regMethodName = (String) this.nameMap.get(registeredMethod);
169+
String regMethodName = this.nameMap.get(registeredMethod);
170170

171171
if ((regMethodName == null)
172172
|| (!regMethodName.equals(name) && (regMethodName.length() <= name

‎core/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.springframework.security.jackson2;
1818

1919
import com.fasterxml.jackson.core.Version;
20-
import com.fasterxml.jackson.databind.ObjectMapper;
2120
import com.fasterxml.jackson.databind.module.SimpleModule;
2221
import org.springframework.security.authentication.AnonymousAuthenticationToken;
2322
import org.springframework.security.authentication.BadCredentialsException;
@@ -54,7 +53,7 @@ public CoreJackson2Module() {
5453

5554
@Override
5655
public void setupModule(SetupContext context) {
57-
SecurityJackson2Modules.enableDefaultTyping((ObjectMapper) context.getOwner());
56+
SecurityJackson2Modules.enableDefaultTyping(context.getOwner());
5857
context.setMixInAnnotations(AnonymousAuthenticationToken.class, AnonymousAuthenticationTokenMixin.class);
5958
context.setMixInAnnotations(RememberMeAuthenticationToken.class, RememberMeAuthenticationTokenMixin.class);
6059
context.setMixInAnnotations(SimpleGrantedAuthority.class, SimpleGrantedAuthorityMixin.class);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void testConstructorRejectsNulls() {
5858

5959
try {
6060
new AnonymousAuthenticationToken("key", "Test",
61-
(List<GrantedAuthority>) null);
61+
null);
6262
fail("Should have thrown IllegalArgumentException");
6363
}
6464
catch (IllegalArgumentException expected) {

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
import java.util.HashMap;
2222
import java.util.Map;
2323

24-
import org.springframework.security.core.userdetails.User;
2524
import org.springframework.security.core.userdetails.UserCache;
2625
import org.springframework.security.core.userdetails.UserDetails;
2726

2827
public class MockUserCache implements UserCache {
2928
private Map<String, UserDetails> cache = new HashMap<>();
3029

3130
public UserDetails getUserFromCache(String username) {
32-
return (User) cache.get(username);
31+
return cache.get(username);
3332
}
3433

3534
public void putUserInCache(UserDetails user) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void scheduleRunnable() {
6262
@Test
6363
public void scheduleCallable() {
6464
when(
65-
(ScheduledFuture<Object>) delegate.schedule(wrappedCallable, 1,
65+
delegate.schedule(wrappedCallable, 1,
6666
TimeUnit.SECONDS)).thenReturn(expectedResult);
6767
ScheduledFuture<Object> result = executor.schedule(callable, 1, TimeUnit.SECONDS);
6868
assertThat(result).isEqualTo(expectedResult);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private KeyBasedPersistenceTokenService getService() {
4040
service.setServerSecret("MY:SECRET$$$#");
4141
service.setServerInteger(Integer.valueOf(454545));
4242
try {
43-
SecureRandom rnd = (SecureRandom) fb.getObject();
43+
SecureRandom rnd = fb.getObject();
4444
service.setSecureRandom(rnd);
4545
service.afterPropertiesSet();
4646
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ private class MockUserCache implements UserCache {
406406
private Map<String, UserDetails> cache = new HashMap<>();
407407

408408
public UserDetails getUserFromCache(String username) {
409-
return (User) cache.get(username);
409+
return cache.get(username);
410410
}
411411

412412
public void putUserInCache(UserDetails user) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private String encode(CharSequence rawPassword, byte[] salt) {
120120
sha.update(salt);
121121
}
122122

123-
byte[] hash = combineHashAndSalt(sha.digest(), (byte[]) salt);
123+
byte[] hash = combineHashAndSalt(sha.digest(), salt);
124124

125125
String prefix;
126126

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public boolean before(Authentication authentication, MethodInvocation mi,
6262
throw new IllegalStateException("Python script did not set the permit flag");
6363
}
6464

65-
return (Boolean) Py.tojava(allowed, Boolean.class);
65+
return Py.tojava(allowed, Boolean.class);
6666
}
6767

6868
private Map<String, Object> createArgumentMap(MethodInvocation mi) {

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.security.crypto.keygen.KeyGenerators;
2525
import org.springframework.security.crypto.password.LdapShaPasswordEncoder;
2626
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
27-
import org.springframework.security.crypto.password.PasswordEncoder;
2827
import org.springframework.security.ldap.AbstractLdapIntegrationTests;
2928

3029
import org.springframework.ldap.core.DirContextAdapter;
@@ -122,7 +121,7 @@ public void testLdapCompareSucceedsWithShaEncodedPassword() {
122121

123122
@Test(expected = IllegalArgumentException.class)
124123
public void testPasswordEncoderCantBeNull() {
125-
authenticator.setPasswordEncoder((PasswordEncoder) null);
124+
authenticator.setPasswordEncoder(null);
126125
}
127126

128127
@Test

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ public void updateUser(UserDetails user) {
274274
ListIterator<ModificationItem> modIt = mods.listIterator();
275275

276276
while (modIt.hasNext()) {
277-
ModificationItem mod = (ModificationItem) modIt.next();
277+
ModificationItem mod = modIt.next();
278278
Attribute a = mod.getAttribute();
279279
if ("objectclass".equalsIgnoreCase(a.getID())) {
280280
modIt.remove();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public IndexPage(WebDriver webDriver) {
3838

3939
public static <T> T to(WebDriver driver, int port, Class<T> page) {
4040
driver.get("http://localhost:" + port +"/");
41-
return (T) PageFactory.initElements(driver, page);
41+
return PageFactory.initElements(driver, page);
4242
}
4343

4444
public IndexPage assertAt() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public Contact mapRow(ResultSet rs, int rowNum) throws SQLException {
102102
return null;
103103
}
104104
else {
105-
return (Contact) list.get(0);
105+
return list.get(0);
106106
}
107107
}
108108

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public Directory mapRow(ResultSet rs, int rowNumber)
112112
.getLong("id")));
113113
}
114114
});
115-
return (AbstractElement[]) directories.toArray(new AbstractElement[] {});
115+
return directories.toArray(new AbstractElement[] {});
116116
}
117117
List<AbstractElement> directories = getJdbcTemplate().query(
118118
SELECT_FROM_DIRECTORY, new Object[] { directory.getId() },
@@ -140,7 +140,7 @@ public File mapRow(ResultSet rs, int rowNumber) throws SQLException {
140140
});
141141
// Add the File elements after the Directory elements
142142
directories.addAll(files);
143-
return (AbstractElement[]) directories.toArray(new AbstractElement[] {});
143+
return directories.toArray(new AbstractElement[] {});
144144
}
145145

146146
public void update(File file) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public SecureDocumentDaoImpl(MutableAclService mutableAclService) {
4848
}
4949

5050
public String[] getUsers() {
51-
return (String[]) getJdbcTemplate().query(SELECT_FROM_USERS,
51+
return getJdbcTemplate().query(SELECT_FROM_USERS,
5252
new RowMapper<String>() {
5353
public String mapRow(ResultSet rs, int rowNumber) throws SQLException {
5454
return rs.getString("USERNAME");

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static <T extends Filter> T findFilter(HttpServletRequest request,
122122
if (springSecurityFilterChain == null) {
123123
return null;
124124
}
125-
List<Filter> filters = (List<Filter>) ReflectionTestUtils
125+
List<Filter> filters = ReflectionTestUtils
126126
.invokeMethod(springSecurityFilterChain, "getFilters", request);
127127
if (filters == null) {
128128
return null;
@@ -157,4 +157,4 @@ private static Filter getSpringSecurityFilterChain(ServletContext servletContext
157157

158158
private WebTestUtils() {
159159
}
160-
}
160+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void afterPropertiesSet() throws Exception {
8989
NodeList roles = secRoleElt.getElementsByTagName("role-name");
9090

9191
if (roles.getLength() > 0) {
92-
String roleName = ((Element) roles.item(0)).getTextContent().trim();
92+
String roleName = roles.item(0).getTextContent().trim();
9393
roleNames.add(roleName);
9494
logger.info("Retrieved role-name '" + roleName + "' from web.xml");
9595
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void afterPropertiesSet() throws Exception {
8484

8585
public void commence(HttpServletRequest request, HttpServletResponse response,
8686
AuthenticationException authException) throws IOException, ServletException {
87-
HttpServletResponse httpResponse = (HttpServletResponse) response;
87+
HttpServletResponse httpResponse = response;
8888

8989
// compute a nonce (do not use remote IP address due to proxy farms)
9090
// format of nonce is:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public static long parseDate(String value, DateFormat[] threadLocalformats) {
177177
Long cachedDate = null;
178178

179179
try {
180-
cachedDate = (Long) parseCache.get(value);
180+
cachedDate = parseCache.get(value);
181181
}
182182
catch (Exception ignored) {
183183
}

‎web/src/test/java/org/springframework/security/web/server/DefaultServerRedirectStrategyTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public class DefaultServerRedirectStrategyTests {
4747

4848
@Test(expected = IllegalArgumentException.class)
4949
public void sendRedirectWhenLocationNullThenException() {
50-
this.strategy.sendRedirect(this.exchange, (URI) null);
50+
this.strategy.sendRedirect(this.exchange, null);
5151
}
5252

5353
@Test(expected = IllegalArgumentException.class)
5454
public void sendRedirectWhenExchangeNullThenException() {
55-
this.strategy.sendRedirect((ServerWebExchange) null, this.location);
55+
this.strategy.sendRedirect(null, this.location);
5656
}
5757

5858
@Test

‎web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationEntryPointTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class RedirectServerAuthenticationEntryPointTests {
5656

5757
@Test(expected = IllegalArgumentException.class)
5858
public void constructorStringWhenNullLocationThenException() {
59-
new RedirectServerAuthenticationEntryPoint((String) null);
59+
new RedirectServerAuthenticationEntryPoint(null);
6060
}
6161

6262
@Test

‎web/src/test/java/org/springframework/security/web/server/authentication/RedirectServerAuthenticationFailureHandlerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class RedirectServerAuthenticationFailureHandlerTests {
5656

5757
@Test(expected = IllegalArgumentException.class)
5858
public void constructorStringWhenNullLocationThenException() {
59-
new RedirectServerAuthenticationEntryPoint((String) null);
59+
new RedirectServerAuthenticationEntryPoint(null);
6060
}
6161

6262
@Test

‎web/src/test/java/org/springframework/security/web/server/authorization/HttpStatusServerAccessDeniedHandlerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class HttpStatusServerAccessDeniedHandlerTests {
4545

4646
@Test(expected = IllegalArgumentException.class)
4747
public void constructorHttpStatusWhenNullThenException() {
48-
new HttpStatusServerAccessDeniedHandler((HttpStatus) null);
48+
new HttpStatusServerAccessDeniedHandler(null);
4949
}
5050

5151
@Test

0 commit comments

Comments
 (0)