From 99df632f24374e89d16a9c6909952fd0d14e727f Mon Sep 17 00:00:00 2001
From: Johnny Lim
Date: Wed, 1 Nov 2017 22:28:29 +0900
Subject: [PATCH] Add missing @Override annotations
This commit also adds MissingOverrideCheck module to Checkstyle configuration.
---
.../acls/domain/AccessControlEntryImpl.java | 9 +++++++++
.../security/acls/domain/AclImpl.java | 17 +++++++++++++++++
.../acls/domain/GrantedAuthoritySid.java | 3 +++
.../acls/domain/ObjectIdentityImpl.java | 5 +++++
.../security/acls/domain/PrincipalSid.java | 3 +++
.../authentication/CasAuthenticationToken.java | 4 ++++
.../http/HttpSecurityBeanDefinitionParser.java | 6 +++++-
.../security/access/SecurityConfig.java | 4 ++++
.../access/intercept/RunAsUserToken.java | 3 +++
...DelegatingMethodSecurityMetadataSource.java | 4 ++++
.../MapBasedMethodSecurityMetadataSource.java | 7 +++++++
.../AnonymousAuthenticationToken.java | 3 +++
.../RememberMeAuthenticationToken.java | 3 +++
.../jaas/JaasGrantedAuthority.java | 4 ++++
.../DelegatingSecurityContextCallable.java | 2 ++
.../DelegatingSecurityContextRunnable.java | 2 ++
.../security/core/ComparableVersion.java | 18 +++++++++++++++++-
.../core/authority/SimpleGrantedAuthority.java | 4 ++++
.../core/context/SecurityContextHolder.java | 1 +
.../core/context/SecurityContextImpl.java | 5 +++++
.../security/core/token/DefaultToken.java | 6 ++++++
.../security/util/InMemoryResource.java | 4 ++++
etc/checkstyle/checkstyle.xml | 5 ++++-
.../ldap/search/FilterBasedLdapUserSearch.java | 2 ++
.../ldap/userdetails/LdapAuthority.java | 1 +
.../ldap/userdetails/LdapUserDetailsImpl.java | 11 +++++++++++
.../messaging/util/matcher/MessageMatcher.java | 2 ++
.../util/matcher/SimpMessageTypeMatcher.java | 4 +++-
.../security/openid/OpenIDAttribute.java | 1 +
.../openid/OpenIDAuthenticationStatus.java | 1 +
.../src/main/java/sample/contact/Contact.java | 1 +
.../src/main/java/sample/dms/Directory.java | 1 +
.../xml/dms/src/main/java/sample/dms/File.java | 1 +
.../UsernameEqualsPasswordLoginModule.java | 7 +++++++
.../src/main/java/bigbank/Account.java | 1 +
.../security/web/FilterChainProxy.java | 4 ++++
.../web/access/intercept/RequestKey.java | 3 +++
...DelegatingAuthenticationFailureHandler.java | 1 +
.../WebAuthenticationDetails.java | 3 +++
...tedAuthoritiesWebAuthenticationDetails.java | 2 ++
.../rememberme/AbstractRememberMeServices.java | 5 +++++
.../switchuser/SwitchUserGrantedAuthority.java | 4 ++++
.../security/web/header/Header.java | 2 ++
.../web/savedrequest/DefaultSavedRequest.java | 9 +++++++++
44 files changed, 184 insertions(+), 4 deletions(-)
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
index 0a735f3517..93fa26324f 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
@@ -64,6 +64,7 @@ public class AccessControlEntryImpl implements AccessControlEntry,
// ~ Methods
// ========================================================================================================
+ @Override
public boolean equals(Object arg0) {
if (!(arg0 instanceof AccessControlEntryImpl)) {
return false;
@@ -140,30 +141,37 @@ public class AccessControlEntryImpl implements AccessControlEntry,
return result;
}
+ @Override
public Acl getAcl() {
return acl;
}
+ @Override
public Serializable getId() {
return id;
}
+ @Override
public Permission getPermission() {
return permission;
}
+ @Override
public Sid getSid() {
return sid;
}
+ @Override
public boolean isAuditFailure() {
return auditFailure;
}
+ @Override
public boolean isAuditSuccess() {
return auditSuccess;
}
+ @Override
public boolean isGranting() {
return granting;
}
@@ -181,6 +189,7 @@ public class AccessControlEntryImpl implements AccessControlEntry,
this.permission = permission;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("AccessControlEntryImpl[");
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
index babeb26d47..54cf4a6708 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
@@ -123,6 +123,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
// ~ Methods
// ========================================================================================================
+ @Override
public void deleteAce(int aceIndex) throws NotFoundException {
aclAuthorizationStrategy.securityCheck(this,
AclAuthorizationStrategy.CHANGE_GENERAL);
@@ -144,6 +145,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
}
}
+ @Override
public void insertAce(int atIndexLocation, Permission permission, Sid sid,
boolean granting) throws NotFoundException {
aclAuthorizationStrategy.securityCheck(this,
@@ -167,20 +169,24 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
}
}
+ @Override
public List getEntries() {
// Can safely return AccessControlEntry directly, as they're immutable outside the
// ACL package
return new ArrayList(aces);
}
+ @Override
public Serializable getId() {
return this.id;
}
+ @Override
public ObjectIdentity getObjectIdentity() {
return objectIdentity;
}
+ @Override
public boolean isEntriesInheriting() {
return entriesInheriting;
}
@@ -192,6 +198,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
* ACL was only loaded for a subset of SIDs
* @see DefaultPermissionGrantingStrategy
*/
+ @Override
public boolean isGranted(List permission, List sids,
boolean administrativeMode) throws NotFoundException, UnloadedSidException {
Assert.notEmpty(permission, "Permissions required");
@@ -205,6 +212,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
administrativeMode);
}
+ @Override
public boolean isSidLoaded(List sids) {
// If loadedSides is null, this indicates all SIDs were loaded
// Also return true if the caller didn't specify a SID to find
@@ -233,12 +241,14 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
return true;
}
+ @Override
public void setEntriesInheriting(boolean entriesInheriting) {
aclAuthorizationStrategy.securityCheck(this,
AclAuthorizationStrategy.CHANGE_GENERAL);
this.entriesInheriting = entriesInheriting;
}
+ @Override
public void setOwner(Sid newOwner) {
aclAuthorizationStrategy.securityCheck(this,
AclAuthorizationStrategy.CHANGE_OWNERSHIP);
@@ -246,10 +256,12 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
this.owner = newOwner;
}
+ @Override
public Sid getOwner() {
return this.owner;
}
+ @Override
public void setParent(Acl newParent) {
aclAuthorizationStrategy.securityCheck(this,
AclAuthorizationStrategy.CHANGE_GENERAL);
@@ -258,10 +270,12 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
this.parentAcl = newParent;
}
+ @Override
public Acl getParentAcl() {
return parentAcl;
}
+ @Override
public void updateAce(int aceIndex, Permission permission) throws NotFoundException {
aclAuthorizationStrategy.securityCheck(this,
AclAuthorizationStrategy.CHANGE_GENERAL);
@@ -273,6 +287,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
}
}
+ @Override
public void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure) {
aclAuthorizationStrategy.securityCheck(this,
AclAuthorizationStrategy.CHANGE_AUDITING);
@@ -285,6 +300,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
}
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof AclImpl) {
AclImpl rhs = (AclImpl) obj;
@@ -341,6 +357,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
return result;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("AclImpl[");
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java b/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java
index 19afd2d6ff..b771ed906f 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java
@@ -55,6 +55,7 @@ public class GrantedAuthoritySid implements Sid {
// ~ Methods
// ========================================================================================================
+ @Override
public boolean equals(Object object) {
if ((object == null) || !(object instanceof GrantedAuthoritySid)) {
return false;
@@ -66,6 +67,7 @@ public class GrantedAuthoritySid implements Sid {
this.getGrantedAuthority());
}
+ @Override
public int hashCode() {
return this.getGrantedAuthority().hashCode();
}
@@ -74,6 +76,7 @@ public class GrantedAuthoritySid implements Sid {
return grantedAuthority;
}
+ @Override
public String toString() {
return "GrantedAuthoritySid[" + this.grantedAuthority + "]";
}
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java
index feb467b8e9..3fecf2036a 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java
@@ -110,6 +110,7 @@ public class ObjectIdentityImpl implements ObjectIdentity {
*
* @return true
if the presented object matches this object
*/
+ @Override
public boolean equals(Object arg0) {
if (arg0 == null || !(arg0 instanceof ObjectIdentityImpl)) {
return false;
@@ -134,10 +135,12 @@ public class ObjectIdentityImpl implements ObjectIdentity {
return type.equals(other.type);
}
+ @Override
public Serializable getIdentifier() {
return identifier;
}
+ @Override
public String getType() {
return type;
}
@@ -147,6 +150,7 @@ public class ObjectIdentityImpl implements ObjectIdentity {
*
* @return the hash
*/
+ @Override
public int hashCode() {
int code = 31;
code ^= this.type.hashCode();
@@ -155,6 +159,7 @@ public class ObjectIdentityImpl implements ObjectIdentity {
return code;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(this.getClass().getName()).append("[");
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java b/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java
index 42ec8f304c..d2db407d6e 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java
@@ -60,6 +60,7 @@ public class PrincipalSid implements Sid {
// ~ Methods
// ========================================================================================================
+ @Override
public boolean equals(Object object) {
if ((object == null) || !(object instanceof PrincipalSid)) {
return false;
@@ -70,6 +71,7 @@ public class PrincipalSid implements Sid {
return ((PrincipalSid) object).getPrincipal().equals(this.getPrincipal());
}
+ @Override
public int hashCode() {
return this.getPrincipal().hashCode();
}
@@ -78,6 +80,7 @@ public class PrincipalSid implements Sid {
return principal;
}
+ @Override
public String toString() {
return "PrincipalSid[" + this.principal + "]";
}
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
index 2cf3597326..57cf2118b6 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
@@ -122,6 +122,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
return key.hashCode();
}
+ @Override
public boolean equals(final Object obj) {
if (!super.equals(obj)) {
return false;
@@ -155,6 +156,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
return result;
}
+ @Override
public Object getCredentials() {
return this.credentials;
}
@@ -163,6 +165,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
return this.keyHash;
}
+ @Override
public Object getPrincipal() {
return this.principal;
}
@@ -175,6 +178,7 @@ public class CasAuthenticationToken extends AbstractAuthenticationToken implemen
return userDetails;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(super.toString());
diff --git a/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java
index ad83f098ae..c3519d2ab6 100644
--- a/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java
@@ -86,6 +86,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
* "universal" match pattern mapped to the list of beans which have been parsed here.
*/
@SuppressWarnings({ "unchecked" })
+ @Override
public BeanDefinition parse(Element element, ParserContext pc) {
CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(
element.getTagName(), pc.extractSource(element));
@@ -424,10 +425,12 @@ class OrderDecorator implements Ordered {
this.order = order;
}
+ @Override
public int getOrder() {
return order;
}
+ @Override
public String toString() {
return bean + ", order = " + order;
}
@@ -443,6 +446,7 @@ class OrderDecorator implements Ordered {
* @author Rob Winch
*/
final class ClearCredentialsMethodInvokingFactoryBean extends MethodInvokingFactoryBean {
+ @Override
public void afterPropertiesSet() throws Exception {
boolean isTargetProviderManager = getTargetObject() instanceof ProviderManager;
if (!isTargetProviderManager) {
@@ -465,4 +469,4 @@ final class ClearCredentialsMethodInvokingFactoryBean extends MethodInvokingFact
public boolean isEraseCredentialsAfterAuthentication() {
return false;
}
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/springframework/security/access/SecurityConfig.java b/core/src/main/java/org/springframework/security/access/SecurityConfig.java
index d238cc5528..3db3e49f5d 100644
--- a/core/src/main/java/org/springframework/security/access/SecurityConfig.java
+++ b/core/src/main/java/org/springframework/security/access/SecurityConfig.java
@@ -44,6 +44,7 @@ public class SecurityConfig implements ConfigAttribute {
// ~ Methods
// ========================================================================================================
+ @Override
public boolean equals(Object obj) {
if (obj instanceof ConfigAttribute) {
ConfigAttribute attr = (ConfigAttribute) obj;
@@ -54,14 +55,17 @@ public class SecurityConfig implements ConfigAttribute {
return false;
}
+ @Override
public String getAttribute() {
return this.attrib;
}
+ @Override
public int hashCode() {
return this.attrib.hashCode();
}
+ @Override
public String toString() {
return this.attrib;
}
diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
index 2cc097a170..86c6dabb47 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
@@ -58,6 +58,7 @@ public class RunAsUserToken extends AbstractAuthenticationToken {
// ~ Methods
// ========================================================================================================
+ @Override
public Object getCredentials() {
return this.credentials;
}
@@ -70,10 +71,12 @@ public class RunAsUserToken extends AbstractAuthenticationToken {
return this.originalAuthentication;
}
+ @Override
public Object getPrincipal() {
return this.principal;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder(super.toString());
String className = this.originalAuthentication == null ? null
diff --git a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
index 3d84aeef77..4ce48b52ce 100644
--- a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
@@ -93,6 +93,7 @@ public final class DelegatingMethodSecurityMetadataSource extends
}
}
+ @Override
public Collection getAllConfigAttributes() {
Set set = new HashSet();
for (MethodSecurityMetadataSource s : methodSecurityMetadataSources) {
@@ -120,17 +121,20 @@ public final class DelegatingMethodSecurityMetadataSource extends
this.targetClass = targetClass;
}
+ @Override
public boolean equals(Object other) {
DefaultCacheKey otherKey = (DefaultCacheKey) other;
return (this.method.equals(otherKey.method) && ObjectUtils.nullSafeEquals(
this.targetClass, otherKey.targetClass));
}
+ @Override
public int hashCode() {
return this.method.hashCode() * 21
+ (this.targetClass != null ? this.targetClass.hashCode() : 0);
}
+ @Override
public String toString() {
return "CacheKey[" + (targetClass == null ? "-" : targetClass.getName())
+ "; " + method + "]";
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 c5e5ada71a..28957cce2c 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
@@ -75,6 +75,7 @@ public class MapBasedMethodSecurityMetadataSource extends
/**
* Implementation does not support class-level attributes.
*/
+ @Override
protected Collection findAttributes(Class> clazz) {
return null;
}
@@ -83,6 +84,7 @@ public class MapBasedMethodSecurityMetadataSource extends
* Will walk the method inheritance tree to find the most specific declaration
* applicable.
*/
+ @Override
protected Collection findAttributes(Method method,
Class> targetClass) {
if (targetClass == null) {
@@ -232,6 +234,7 @@ public class MapBasedMethodSecurityMetadataSource extends
*
* @return the attributes explicitly defined against this bean
*/
+ @Override
public Collection getAllConfigAttributes() {
Set allAttributes = new HashSet();
@@ -258,6 +261,7 @@ public class MapBasedMethodSecurityMetadataSource extends
.substring(1, mappedName.length())));
}
+ @Override
public void setBeanClassLoader(ClassLoader beanClassLoader) {
Assert.notNull(beanClassLoader, "Bean class loader required");
this.beanClassLoader = beanClassLoader;
@@ -290,6 +294,7 @@ public class MapBasedMethodSecurityMetadataSource extends
this.registeredJavaType = registeredJavaType;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -302,10 +307,12 @@ public class MapBasedMethodSecurityMetadataSource extends
return false;
}
+ @Override
public int hashCode() {
return method.hashCode() * registeredJavaType.hashCode();
}
+ @Override
public String toString() {
return "RegisteredMethod[" + registeredJavaType.getName() + "; " + method
+ "]";
diff --git a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
index 4a2fac6756..edfb721447 100644
--- a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
@@ -82,6 +82,7 @@ public class AnonymousAuthenticationToken extends AbstractAuthenticationToken im
return key.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (!super.equals(obj)) {
return false;
@@ -112,6 +113,7 @@ public class AnonymousAuthenticationToken extends AbstractAuthenticationToken im
*
* @return an empty String
*/
+ @Override
public Object getCredentials() {
return "";
}
@@ -120,6 +122,7 @@ public class AnonymousAuthenticationToken extends AbstractAuthenticationToken im
return this.keyHash;
}
+ @Override
public Object getPrincipal() {
return this.principal;
}
diff --git a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java
index 745d85b11c..a7a3a7eb4a 100644
--- a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java
@@ -90,6 +90,7 @@ public class RememberMeAuthenticationToken extends AbstractAuthenticationToken {
*
* @return an empty String
*/
+ @Override
public Object getCredentials() {
return "";
}
@@ -98,10 +99,12 @@ public class RememberMeAuthenticationToken extends AbstractAuthenticationToken {
return this.keyHash;
}
+ @Override
public Object getPrincipal() {
return this.principal;
}
+ @Override
public boolean equals(Object obj) {
if (!super.equals(obj)) {
return false;
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java
index 82bdc8d773..f1efb4c7c6 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java
@@ -48,14 +48,17 @@ public final class JaasGrantedAuthority implements GrantedAuthority {
return principal;
}
+ @Override
public String getAuthority() {
return role;
}
+ @Override
public int hashCode() {
return 31 ^ principal.hashCode() ^ role.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -69,6 +72,7 @@ public final class JaasGrantedAuthority implements GrantedAuthority {
return false;
}
+ @Override
public String toString() {
return "Jaas Authority [" + role + "," + principal + "]";
}
diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java
index 139db5026a..53285c960a 100644
--- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java
+++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java
@@ -78,6 +78,7 @@ public final class DelegatingSecurityContextCallable implements Callable {
this(delegate, SecurityContextHolder.getContext());
}
+ @Override
public V call() throws Exception {
this.originalSecurityContext = SecurityContextHolder.getContext();
@@ -96,6 +97,7 @@ public final class DelegatingSecurityContextCallable implements Callable {
}
}
+ @Override
public String toString() {
return delegate.toString();
}
diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java
index f832881657..12654e67ff 100644
--- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java
+++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java
@@ -75,6 +75,7 @@ public final class DelegatingSecurityContextRunnable implements Runnable {
this(delegate, SecurityContextHolder.getContext());
}
+ @Override
public void run() {
this.originalSecurityContext = SecurityContextHolder.getContext();
@@ -93,6 +94,7 @@ public final class DelegatingSecurityContextRunnable implements Runnable {
}
}
+ @Override
public String toString() {
return delegate.toString();
}
diff --git a/core/src/main/java/org/springframework/security/core/ComparableVersion.java b/core/src/main/java/org/springframework/security/core/ComparableVersion.java
index 0a213c45e2..813299f496 100644
--- a/core/src/main/java/org/springframework/security/core/ComparableVersion.java
+++ b/core/src/main/java/org/springframework/security/core/ComparableVersion.java
@@ -121,14 +121,17 @@ class ComparableVersion implements Comparable {
this.value = new BigInteger(str);
}
+ @Override
public int getType() {
return INTEGER_ITEM;
}
+ @Override
public boolean isNull() {
return BigInteger_ZERO.equals(value);
}
+ @Override
public int compareTo(Item item) {
if (item == null) {
return BigInteger_ZERO.equals(value) ? 0 : 1; // 1.0 == 1, 1.1 > 1
@@ -149,6 +152,7 @@ class ComparableVersion implements Comparable {
}
}
+ @Override
public String toString() {
return value.toString();
}
@@ -198,10 +202,12 @@ class ComparableVersion implements Comparable {
this.value = ALIASES.getProperty(value, value);
}
+ @Override
public int getType() {
return STRING_ITEM;
}
+ @Override
public boolean isNull() {
return (comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX) == 0);
}
@@ -226,6 +232,7 @@ class ComparableVersion implements Comparable {
return i == -1 ? (_QUALIFIERS.size() + "-" + qualifier) : String.valueOf(i);
}
+ @Override
public int compareTo(Item item) {
if (item == null) {
// 1-rc < 1, 1-ga > 1
@@ -247,6 +254,7 @@ class ComparableVersion implements Comparable {
}
}
+ @Override
public String toString() {
return value;
}
@@ -257,10 +265,12 @@ class ComparableVersion implements Comparable {
* and for sub-lists (which start with '-(number)' in the version specification).
*/
private static class ListItem extends ArrayList- implements Item {
+ @Override
public int getType() {
return LIST_ITEM;
}
+ @Override
public boolean isNull() {
return (size() == 0);
}
@@ -278,6 +288,7 @@ class ComparableVersion implements Comparable {
}
}
+ @Override
public int compareTo(Item item) {
if (item == null) {
if (size() == 0) {
@@ -316,6 +327,7 @@ class ComparableVersion implements Comparable {
}
}
+ @Override
public String toString() {
StringBuilder buffer = new StringBuilder("(");
for (Iterator
- iter = iterator(); iter.hasNext();) {
@@ -418,20 +430,24 @@ class ComparableVersion implements Comparable {
return isDigit ? new IntegerItem(buf) : new StringItem(buf, false);
}
+ @Override
public int compareTo(ComparableVersion o) {
return items.compareTo(o.items);
}
+ @Override
public String toString() {
return value;
}
+ @Override
public boolean equals(Object o) {
return (o instanceof ComparableVersion)
&& canonical.equals(((ComparableVersion) o).canonical);
}
+ @Override
public int hashCode() {
return canonical.hashCode();
}
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java b/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java
index f8b608dabb..f85fca6a13 100644
--- a/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java
+++ b/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java
@@ -39,10 +39,12 @@ public final class SimpleGrantedAuthority implements GrantedAuthority {
this.role = role;
}
+ @Override
public String getAuthority() {
return role;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -55,10 +57,12 @@ public final class SimpleGrantedAuthority implements GrantedAuthority {
return false;
}
+ @Override
public int hashCode() {
return this.role.hashCode();
}
+ @Override
public String toString() {
return this.role;
}
diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java
index 5cf052e545..41b57de393 100644
--- a/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java
+++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java
@@ -161,6 +161,7 @@ public class SecurityContextHolder {
return strategy.createEmptyContext();
}
+ @Override
public String toString() {
return "SecurityContextHolder[strategy='" + strategyName + "'; initializeCount="
+ initializeCount + "]";
diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java
index 8376db58b3..88e0e97198 100644
--- a/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java
+++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java
@@ -44,6 +44,7 @@ public class SecurityContextImpl implements SecurityContext {
// ~ Methods
// ========================================================================================================
+ @Override
public boolean equals(Object obj) {
if (obj instanceof SecurityContextImpl) {
SecurityContextImpl test = (SecurityContextImpl) obj;
@@ -61,10 +62,12 @@ public class SecurityContextImpl implements SecurityContext {
return false;
}
+ @Override
public Authentication getAuthentication() {
return authentication;
}
+ @Override
public int hashCode() {
if (this.authentication == null) {
return -1;
@@ -74,10 +77,12 @@ public class SecurityContextImpl implements SecurityContext {
}
}
+ @Override
public void setAuthentication(Authentication authentication) {
this.authentication = authentication;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(super.toString());
diff --git a/core/src/main/java/org/springframework/security/core/token/DefaultToken.java b/core/src/main/java/org/springframework/security/core/token/DefaultToken.java
index 643245e1f7..1b0a572d9d 100644
--- a/core/src/main/java/org/springframework/security/core/token/DefaultToken.java
+++ b/core/src/main/java/org/springframework/security/core/token/DefaultToken.java
@@ -38,18 +38,22 @@ public class DefaultToken implements Token {
this.extendedInformation = extendedInformation;
}
+ @Override
public String getKey() {
return key;
}
+ @Override
public long getKeyCreationTime() {
return keyCreationTime;
}
+ @Override
public String getExtendedInformation() {
return extendedInformation;
}
+ @Override
public boolean equals(Object obj) {
if (obj != null && obj instanceof DefaultToken) {
DefaultToken rhs = (DefaultToken) obj;
@@ -60,6 +64,7 @@ public class DefaultToken implements Token {
return false;
}
+ @Override
public int hashCode() {
int code = 979;
code = code * key.hashCode();
@@ -68,6 +73,7 @@ public class DefaultToken implements Token {
return code;
}
+ @Override
public String toString() {
return "DefaultToken[key=" + key + "; creation=" + new Date(keyCreationTime)
+ "; extended=" + extendedInformation + "]";
diff --git a/core/src/main/java/org/springframework/security/util/InMemoryResource.java b/core/src/main/java/org/springframework/security/util/InMemoryResource.java
index d75e648986..647a68af45 100644
--- a/core/src/main/java/org/springframework/security/util/InMemoryResource.java
+++ b/core/src/main/java/org/springframework/security/util/InMemoryResource.java
@@ -60,18 +60,22 @@ public class InMemoryResource extends AbstractResource {
// ~ Methods
// ========================================================================================================
+ @Override
public String getDescription() {
return description;
}
+ @Override
public InputStream getInputStream() throws IOException {
return new ByteArrayInputStream(source);
}
+ @Override
public int hashCode() {
return 1;
}
+ @Override
public boolean equals(Object res) {
if (!(res instanceof InMemoryResource)) {
return false;
diff --git a/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml
index fe25bb4525..acf10b8dbb 100644
--- a/etc/checkstyle/checkstyle.xml
+++ b/etc/checkstyle/checkstyle.xml
@@ -6,7 +6,7 @@
-
+
@@ -15,6 +15,9 @@
+
+
+
diff --git a/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java b/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java
index 2f4bb18447..e90cb56c22 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java
@@ -111,6 +111,7 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch {
*
* @throws UsernameNotFoundException if no matching entry is found.
*/
+ @Override
public DirContextOperations searchForUser(String username) {
if (logger.isDebugEnabled()) {
logger.debug("Searching for user '" + username + "', with user search "
@@ -183,6 +184,7 @@ public class FilterBasedLdapUserSearch implements LdapUserSearch {
searchControls.setReturningAttributes(attrs);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java
index 2515562fff..92b4c6329c 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java
@@ -114,6 +114,7 @@ public class LdapAuthority implements GrantedAuthority {
/**
* {@inheritDoc}
*/
+ @Override
public String getAuthority() {
return role;
}
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java
index 354893ad88..065e0d19a6 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java
@@ -75,34 +75,42 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData
// ~ Methods
// ========================================================================================================
+ @Override
public Collection getAuthorities() {
return authorities;
}
+ @Override
public String getDn() {
return dn;
}
+ @Override
public String getPassword() {
return password;
}
+ @Override
public String getUsername() {
return username;
}
+ @Override
public boolean isAccountNonExpired() {
return accountNonExpired;
}
+ @Override
public boolean isAccountNonLocked() {
return accountNonLocked;
}
+ @Override
public boolean isCredentialsNonExpired() {
return credentialsNonExpired;
}
+ @Override
public boolean isEnabled() {
return enabled;
}
@@ -112,10 +120,12 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData
password = null;
}
+ @Override
public int getTimeBeforeExpiration() {
return timeBeforeExpiration;
}
+ @Override
public int getGraceLoginsRemaining() {
return graceLoginsRemaining;
}
@@ -133,6 +143,7 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData
return dn.hashCode();
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(super.toString()).append(": ");
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java
index d4b3bb1078..b4bc9a7b40 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java
@@ -36,10 +36,12 @@ public interface MessageMatcher {
* Matches every {@link Message}
*/
MessageMatcher
*/
+ @Override
public final void loginSuccess(HttpServletRequest request,
HttpServletResponse response, Authentication successfulAuthentication) {
@@ -439,6 +443,7 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
* Implementation of {@code LogoutHandler}. Default behaviour is to call
* {@code cancelCookie()}.
*/
+ @Override
public void logout(HttpServletRequest request, HttpServletResponse response,
Authentication authentication) {
if (logger.isDebugEnabled()) {
diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java
index 42ddd3e27a..0338cbac63 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java
@@ -60,14 +60,17 @@ public final class SwitchUserGrantedAuthority implements GrantedAuthority {
return source;
}
+ @Override
public String getAuthority() {
return role;
}
+ @Override
public int hashCode() {
return 31 ^ source.hashCode() ^ role.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -81,6 +84,7 @@ public final class SwitchUserGrantedAuthority implements GrantedAuthority {
return false;
}
+ @Override
public String toString() {
return "Switch User Authority [" + role + "," + source + "]";
}
diff --git a/web/src/main/java/org/springframework/security/web/header/Header.java b/web/src/main/java/org/springframework/security/web/header/Header.java
index e36715df3b..0d4b3acb0b 100644
--- a/web/src/main/java/org/springframework/security/web/header/Header.java
+++ b/web/src/main/java/org/springframework/security/web/header/Header.java
@@ -77,10 +77,12 @@ public final class Header {
return this.headerValues.equals(header.headerValues);
}
+ @Override
public int hashCode() {
return headerName.hashCode() + headerValues.hashCode();
}
+ @Override
public String toString() {
return "Header [name: " + headerName + ", values: " + headerValues + "]";
}
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java
index 5a5811c77a..9ad5e36827 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java
@@ -264,6 +264,7 @@ public class DefaultSavedRequest implements SavedRequest {
return contextPath;
}
+ @Override
public List getCookies() {
List cookieList = new ArrayList(cookies.size());
@@ -279,15 +280,18 @@ public class DefaultSavedRequest implements SavedRequest {
*
* @return the full URL of this request
*/
+ @Override
public String getRedirectUrl() {
return UrlUtils.buildFullRequestUrl(scheme, serverName, serverPort, requestURI,
queryString);
}
+ @Override
public Collection getHeaderNames() {
return headers.keySet();
}
+ @Override
public List getHeaderValues(String name) {
List values = headers.get(name);
@@ -298,14 +302,17 @@ public class DefaultSavedRequest implements SavedRequest {
return values;
}
+ @Override
public List getLocales() {
return locales;
}
+ @Override
public String getMethod() {
return method;
}
+ @Override
public Map getParameterMap() {
return parameters;
}
@@ -314,6 +321,7 @@ public class DefaultSavedRequest implements SavedRequest {
return parameters.keySet();
}
+ @Override
public String[] getParameterValues(String name) {
return parameters.get(name);
}
@@ -385,6 +393,7 @@ public class DefaultSavedRequest implements SavedRequest {
}
}
+ @Override
public String toString() {
return "DefaultSavedRequest[" + getRedirectUrl() + "]";
}