diff --git a/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java b/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java index f8f78d837d..b6d362a305 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java +++ b/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java @@ -127,8 +127,7 @@ public class AclPermissionEvaluator implements PermissionEvaluator { List resolvePermission(Object permission) { if (permission instanceof Integer) { - return Arrays.asList(permissionFactory.buildFromMask(((Integer) permission) - .intValue())); + return Arrays.asList(permissionFactory.buildFromMask((Integer) permission)); } if (permission instanceof Permission) { diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java index cf43adf1a2..6625abdc5d 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java @@ -146,10 +146,9 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS "Unknown ACE class"); AccessControlEntryImpl entry = (AccessControlEntryImpl) entry_; - stmt.setLong(1, ((Long) acl.getId()).longValue()); + stmt.setLong(1, (Long) acl.getId()); stmt.setInt(2, i); - stmt.setLong(3, createOrRetrieveSidPrimaryKey(entry.getSid(), true) - .longValue()); + stmt.setLong(3, createOrRetrieveSidPrimaryKey(entry.getSid(), true)); stmt.setInt(4, entry.getPermission().getMask()); stmt.setBoolean(5, entry.isGranting()); stmt.setBoolean(6, entry.isAuditSuccess()); diff --git a/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java b/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java index 1b71c0f4c9..7cb29ed097 100644 --- a/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java +++ b/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java @@ -66,7 +66,7 @@ public class PasswordEncoderParser { boolean useBase64 = false; if (StringUtils.hasText(element.getAttribute(ATT_BASE_64))) { - useBase64 = Boolean.valueOf(element.getAttribute(ATT_BASE_64)).booleanValue(); + useBase64 = Boolean.valueOf(element.getAttribute(ATT_BASE_64)); } String ref = element.getAttribute(ATT_REF); 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 4bc6f347ce..70cf8ab5a5 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 expr.getValue(ctx, Boolean.class).booleanValue(); + return expr.getValue(ctx, Boolean.class); } catch (EvaluationException e) { throw new IllegalArgumentException("Failed to evaluate expression '" diff --git a/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java index d0238e662f..3e2b2ef82a 100644 --- a/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java +++ b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java @@ -105,7 +105,7 @@ public class KeyBasedPersistenceTokenService implements TokenService, Initializi long creationTime; try { - creationTime = Long.decode(tokens[0]).longValue(); + creationTime = Long.decode(tokens[0]); } catch (NumberFormatException nfe) { throw new IllegalArgumentException("Expected number but found " + tokens[0]); @@ -144,7 +144,7 @@ public class KeyBasedPersistenceTokenService implements TokenService, Initializi } private String computeServerSecretApplicableAt(long time) { - return serverSecret + ":" + new Long(time % serverInteger.intValue()).intValue(); + return serverSecret + ":" + new Long(time % serverInteger).intValue(); } /** diff --git a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java index 58cba41d1d..230bfe9263 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java +++ b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java @@ -119,7 +119,7 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { Boolean matches = (Boolean) executeReadOnly(new LdapCompareCallback()); - return matches.booleanValue(); + return matches; } /** diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java index 8185d6c3b6..f2c92d7b64 100755 --- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java +++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java @@ -299,7 +299,7 @@ public class PasswordPolicyResponseControl extends PasswordPolicyControl { return new BEREnumerated(stream, bytesRead); } else { - if (this.inChoice.booleanValue()) { + if (this.inChoice) { // graceLogins return new BERInteger(stream, bytesRead); } diff --git a/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java b/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java index 015505127a..5c4b51f2b2 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java +++ b/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java @@ -44,7 +44,7 @@ public class AddPermissionValidator implements Validator { "Recipient is required. *"); if (addPermission.getPermission() != null) { - int permission = addPermission.getPermission().intValue(); + int permission = addPermission.getPermission(); if ((permission != BasePermission.ADMINISTRATION.getMask()) && (permission != BasePermission.READ.getMask()) diff --git a/web/src/main/java/org/springframework/security/web/PortMapperImpl.java b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java index 5094dc2b99..f9144ecd52 100644 --- a/web/src/main/java/org/springframework/security/web/PortMapperImpl.java +++ b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java @@ -104,8 +104,8 @@ public class PortMapperImpl implements PortMapper { Integer httpPort = Integer.valueOf(entry.getKey()); Integer httpsPort = Integer.valueOf(entry.getValue()); - if ((httpPort.intValue() < 1) || (httpPort.intValue() > 65535) - || (httpsPort.intValue() < 1) || (httpsPort.intValue() > 65535)) { + if ((httpPort < 1) || (httpPort > 65535) + || (httpsPort < 1) || (httpsPort > 65535)) { throw new IllegalArgumentException( "one or both ports out of legal range: " + httpPort + ", " + httpsPort); diff --git a/web/src/main/java/org/springframework/security/web/PortResolverImpl.java b/web/src/main/java/org/springframework/security/web/PortResolverImpl.java index 9acfedfdcf..d77bb353a0 100644 --- a/web/src/main/java/org/springframework/security/web/PortResolverImpl.java +++ b/web/src/main/java/org/springframework/security/web/PortResolverImpl.java @@ -63,7 +63,7 @@ public class PortResolverImpl implements PortResolver { if (portLookup != null) { // IE 6 bug - serverPort = portLookup.intValue(); + serverPort = portLookup; } return serverPort; diff --git a/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java b/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java index 74e5e29afb..1380a72639 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java @@ -67,7 +67,7 @@ public abstract class AbstractRetryEntryPoint implements ChannelEntryPoint { Integer redirectPort = getMappedPort(currentPort); if (redirectPort != null) { - boolean includePort = redirectPort.intValue() != standardPort; + boolean includePort = redirectPort != standardPort; redirectUrl = scheme + request.getServerName() + ((includePort) ? (":" + redirectPort) : "") + redirectUrl; diff --git a/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java index c1b1595799..5bcd829e25 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java +++ b/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java @@ -196,7 +196,7 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin if (httpsPort != null) { // Overwrite scheme and port in the redirect URL urlBuilder.setScheme("https"); - urlBuilder.setPort(httpsPort.intValue()); + urlBuilder.setPort(httpsPort); } else { logger.warn("Unable to redirect to HTTPS as no port mapping found for HTTP port " @@ -221,7 +221,7 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin RedirectUrlBuilder urlBuilder = new RedirectUrlBuilder(); urlBuilder.setScheme("https"); urlBuilder.setServerName(request.getServerName()); - urlBuilder.setPort(httpsPort.intValue()); + urlBuilder.setPort(httpsPort); urlBuilder.setContextPath(request.getContextPath()); urlBuilder.setServletPath(request.getServletPath()); urlBuilder.setPathInfo(request.getPathInfo()); diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java index 614cf904d1..9ea38a8476 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java @@ -102,7 +102,7 @@ public class TokenBasedRememberMeServices extends AbstractRememberMeServices { long tokenExpiryTime; try { - tokenExpiryTime = new Long(cookieTokens[1]).longValue(); + tokenExpiryTime = new Long(cookieTokens[1]); } catch (NumberFormatException nfe) { throw new InvalidCookieException( diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java index 5fa559facf..1696015efe 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java @@ -417,7 +417,7 @@ public class DigestAuthenticationFilter extends GenericFilterBean // Extract expiry time from nonce try { - this.nonceExpiryTime = new Long(nonceTokens[0]).longValue(); + this.nonceExpiryTime = new Long(nonceTokens[0]); } catch (NumberFormatException nfe) { throw new BadCredentialsException(DigestAuthenticationFilter.this.messages 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 3f6c08bd3e..ec1cbeae76 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 @@ -183,7 +183,7 @@ public class FastHttpDateFormat { } if (cachedDate != null) { - return cachedDate.longValue(); + return cachedDate; } Long date; @@ -206,7 +206,7 @@ public class FastHttpDateFormat { return (-1L); } else { - return date.longValue(); + return date; } } diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java index 44b0043464..d0fc2a1336 100644 --- a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java +++ b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java @@ -52,7 +52,7 @@ public class ELRequestMatcher implements RequestMatcher { public boolean matches(HttpServletRequest request) { EvaluationContext context = createELContext(request); - return expression.getValue(context, Boolean.class).booleanValue(); + return expression.getValue(context, Boolean.class); } /**