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 8550450e8f2..4b71dc622fc 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
@@ -298,15 +298,17 @@ public boolean equals(Object obj) {
 	@Override
 	public int hashCode() {
 		int result = (this.parentAcl != null) ? this.parentAcl.hashCode() : 0;
-		result = 31 * result + this.aclAuthorizationStrategy.hashCode();
-		result = 31 * result
+		int thirtyOne = 31;
+
+		result = thirtyOne * result + this.aclAuthorizationStrategy.hashCode();
+		result = thirtyOne * result
 				+ ((this.permissionGrantingStrategy != null) ? this.permissionGrantingStrategy.hashCode() : 0);
-		result = 31 * result + ((this.aces != null) ? this.aces.hashCode() : 0);
-		result = 31 * result + this.objectIdentity.hashCode();
-		result = 31 * result + this.id.hashCode();
-		result = 31 * result + ((this.owner != null) ? this.owner.hashCode() : 0);
-		result = 31 * result + ((this.loadedSids != null) ? this.loadedSids.hashCode() : 0);
-		result = 31 * result + (this.entriesInheriting ? 1 : 0);
+		result = thirtyOne * result + ((this.aces != null) ? this.aces.hashCode() : 0);
+		result = thirtyOne * result + this.objectIdentity.hashCode();
+		result = thirtyOne * result + this.id.hashCode();
+		result = thirtyOne * result + ((this.owner != null) ? this.owner.hashCode() : 0);
+		result = thirtyOne * result + ((this.loadedSids != null) ? this.loadedSids.hashCode() : 0);
+		result = thirtyOne * result + (this.entriesInheriting ? 1 : 0);
 		return result;
 	}
 
diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/DefaultAddressStandardClaim.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/DefaultAddressStandardClaim.java
index 5d6a59cf97b..78eccdb0479 100644
--- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/DefaultAddressStandardClaim.java
+++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/DefaultAddressStandardClaim.java
@@ -105,12 +105,15 @@ public boolean equals(Object obj) {
 
 	@Override
 	public int hashCode() {
+
 		int result = (this.getFormatted() != null) ? this.getFormatted().hashCode() : 0;
-		result = 31 * result + ((this.getStreetAddress() != null) ? this.getStreetAddress().hashCode() : 0);
-		result = 31 * result + ((this.getLocality() != null) ? this.getLocality().hashCode() : 0);
-		result = 31 * result + ((this.getRegion() != null) ? this.getRegion().hashCode() : 0);
-		result = 31 * result + ((this.getPostalCode() != null) ? this.getPostalCode().hashCode() : 0);
-		result = 31 * result + ((this.getCountry() != null) ? this.getCountry().hashCode() : 0);
+		int thirtyOne = 31;
+
+		result = thirtyOne * result + ((this.getStreetAddress() != null) ? this.getStreetAddress().hashCode() : 0);
+		result = thirtyOne * result + ((this.getLocality() != null) ? this.getLocality().hashCode() : 0);
+		result = thirtyOne * result + ((this.getRegion() != null) ? this.getRegion().hashCode() : 0);
+		result = thirtyOne * result + ((this.getPostalCode() != null) ? this.getPostalCode().hashCode() : 0);
+		result = thirtyOne * result + ((this.getCountry() != null) ? this.getCountry().hashCode() : 0);
 		return result;
 	}