You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/05/18 21:12:06 UTC
directory-fortress-core git commit: FC-105 - [fortress-core] -
Definition of 'equals()' without corresponding definition of 'hashCode()'
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 07801899b -> ec0e81bac
FC-105 - [fortress-core] - Definition of 'equals()' without corresponding definition of 'hashCode()'
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/ec0e81ba
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/ec0e81ba
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/ec0e81ba
Branch: refs/heads/master
Commit: ec0e81bacb631269dedf2c0ff3183600370a013d
Parents: 0780189
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon May 18 14:11:55 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon May 18 14:11:55 2015 -0500
----------------------------------------------------------------------
.../directory/fortress/core/rbac/PermObj.java | 15 ++++++++++++
.../fortress/core/rbac/Permission.java | 17 +++++++++++++
.../directory/fortress/core/rbac/Props.java | 8 +++++++
.../directory/fortress/core/rbac/PwPolicy.java | 21 ++++++++++++++++
.../directory/fortress/core/rbac/Role.java | 25 ++++++++++++++++++--
.../directory/fortress/core/rbac/SDSet.java | 11 +++++++++
.../fortress/core/rbac/UserAdminRole.java | 13 ++++++++++
.../directory/fortress/core/rbac/UserRole.java | 16 +++++++++++++
8 files changed, 124 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ec0e81ba/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java b/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
index 73fbecd..018c497 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
@@ -522,6 +522,20 @@ public class PermObj extends FortEntity implements Serializable
}
+ @Override
+ public int hashCode()
+ {
+ int result = ( admin ? 1 : 0 );
+ result = 31 * result + ( internalId != null ? internalId.hashCode() : 0 );
+ result = 31 * result + ( objName != null ? objName.hashCode() : 0 );
+ result = 31 * result + ( description != null ? description.hashCode() : 0 );
+ result = 31 * result + ( props != null ? props.hashCode() : 0 );
+ result = 31 * result + ( ou != null ? ou.hashCode() : 0 );
+ result = 31 * result + ( type != null ? type.hashCode() : 0 );
+ result = 31 * result + ( dn != null ? dn.hashCode() : 0 );
+ return result;
+ }
+
/**
* Matches the objName from two PermObj entities.
*
@@ -529,6 +543,7 @@ public class PermObj extends FortEntity implements Serializable
* @return boolean indicating both objects contain matching objNames.
*/
public boolean equals( Object thatObj )
+
{
if ( this == thatObj )
return true;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ec0e81ba/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java b/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
index ef15635..7c5aa77 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
@@ -744,6 +744,23 @@ public class Permission extends FortEntity implements Serializable
.getOpName().equalsIgnoreCase( this.getOpName() ) ) );
}
+ @Override
+ public int hashCode()
+ {
+ int result = ( admin ? 1 : 0 );
+ result = 31 * result + ( internalId != null ? internalId.hashCode() : 0 );
+ result = 31 * result + ( opName != null ? opName.hashCode() : 0 );
+ result = 31 * result + ( objName != null ? objName.hashCode() : 0 );
+ result = 31 * result + ( objId != null ? objId.hashCode() : 0 );
+ result = 31 * result + ( abstractName != null ? abstractName.hashCode() : 0 );
+ result = 31 * result + ( type != null ? type.hashCode() : 0 );
+ result = 31 * result + ( dn != null ? dn.hashCode() : 0 );
+ result = 31 * result + ( description != null ? description.hashCode() : 0 );
+ result = 31 * result + ( props != null ? props.hashCode() : 0 );
+ result = 31 * result + ( roles != null ? roles.hashCode() : 0 );
+ result = 31 * result + ( users != null ? users.hashCode() : 0 );
+ return result;
+ }
@Override
public String toString()
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ec0e81ba/src/main/java/org/apache/directory/fortress/core/rbac/Props.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Props.java b/src/main/java/org/apache/directory/fortress/core/rbac/Props.java
index 11aeea6..d68e666 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Props.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Props.java
@@ -210,5 +210,13 @@ public class Props extends FortEntity implements Serializable
}
return false;
}
+
+ @Override
+ public int hashCode()
+ {
+ int result = key != null ? key.hashCode() : 0;
+ result = 31 * result + ( value != null ? value.hashCode() : 0 );
+ return result;
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ec0e81ba/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicy.java b/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicy.java
index ba592ae..22ac3f4 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicy.java
@@ -828,6 +828,27 @@ public class PwPolicy extends FortEntity implements Serializable
return thatPolicy.getName().equalsIgnoreCase( this.getName() );
}
+ @Override
+ public int hashCode()
+ {
+ int result = name != null ? name.hashCode() : 0;
+ result = 31 * result + ( attribute != null ? attribute.hashCode() : 0 );
+ result = 31 * result + ( minAge != null ? minAge.hashCode() : 0 );
+ result = 31 * result + ( maxAge != null ? maxAge.hashCode() : 0 );
+ result = 31 * result + ( inHistory != null ? inHistory.hashCode() : 0 );
+ result = 31 * result + ( checkQuality != null ? checkQuality.hashCode() : 0 );
+ result = 31 * result + ( minLength != null ? minLength.hashCode() : 0 );
+ result = 31 * result + ( expireWarning != null ? expireWarning.hashCode() : 0 );
+ result = 31 * result + ( graceLoginLimit != null ? graceLoginLimit.hashCode() : 0 );
+ result = 31 * result + ( lockout != null ? lockout.hashCode() : 0 );
+ result = 31 * result + ( lockoutDuration != null ? lockoutDuration.hashCode() : 0 );
+ result = 31 * result + ( maxFailure != null ? maxFailure.hashCode() : 0 );
+ result = 31 * result + ( failureCountInterval != null ? failureCountInterval.hashCode() : 0 );
+ result = 31 * result + ( mustChange != null ? mustChange.hashCode() : 0 );
+ result = 31 * result + ( allowUserChange != null ? allowUserChange.hashCode() : 0 );
+ result = 31 * result + ( safeModify != null ? safeModify.hashCode() : 0 );
+ return result;
+ }
/**
* @see Object#toString()
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ec0e81ba/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Role.java b/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
index f4e2f98..f4b3de4 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
@@ -707,8 +707,29 @@ public class Role extends FortEntity implements Constraint, Graphable, java.io.S
return thatRole.getName().equalsIgnoreCase( name );
}
-
-
+
+ @Override
+ public int hashCode()
+ {
+ int result = id != null ? id.hashCode() : 0;
+ result = 31 * result + ( name != null ? name.hashCode() : 0 );
+ result = 31 * result + ( description != null ? description.hashCode() : 0 );
+ result = 31 * result + ( dn != null ? dn.hashCode() : 0 );
+ result = 31 * result + ( occupants != null ? occupants.hashCode() : 0 );
+ result = 31 * result + ( parents != null ? parents.hashCode() : 0 );
+ result = 31 * result + ( children != null ? children.hashCode() : 0 );
+ result = 31 * result + ( beginTime != null ? beginTime.hashCode() : 0 );
+ result = 31 * result + ( endTime != null ? endTime.hashCode() : 0 );
+ result = 31 * result + ( beginDate != null ? beginDate.hashCode() : 0 );
+ result = 31 * result + ( endDate != null ? endDate.hashCode() : 0 );
+ result = 31 * result + ( beginLockDate != null ? beginLockDate.hashCode() : 0 );
+ result = 31 * result + ( endLockDate != null ? endLockDate.hashCode() : 0 );
+ result = 31 * result + ( dayMask != null ? dayMask.hashCode() : 0 );
+ result = 31 * result + timeout;
+ result = 31 * result + ( rawData != null ? rawData.hashCode() : 0 );
+ return result;
+ }
+
/**
* @see Object#toString()
*/
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ec0e81ba/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java b/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
index b20b1ef..7b928b1 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
@@ -413,6 +413,17 @@ public class SDSet extends FortEntity implements Serializable, Comparable<SDSet>
return thatSet.getName().equalsIgnoreCase( this.getName() );
}
+ @Override
+ public int hashCode()
+ {
+ int result = id != null ? id.hashCode() : 0;
+ result = 31 * result + ( name != null ? name.hashCode() : 0 );
+ result = 31 * result + ( description != null ? description.hashCode() : 0 );
+ result = 31 * result + ( cardinality != null ? cardinality.hashCode() : 0 );
+ result = 31 * result + ( members != null ? members.hashCode() : 0 );
+ result = 31 * result + ( type != null ? type.hashCode() : 0 );
+ return result;
+ }
@Override
public String toString()
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ec0e81ba/src/main/java/org/apache/directory/fortress/core/rbac/UserAdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserAdminRole.java
index 34b2ee4..5331716 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserAdminRole.java
@@ -612,4 +612,17 @@ public class UserAdminRole extends UserRole implements Administrator
return ( ( thatRole.getName().equalsIgnoreCase( this.getName() ) ) && ( thatRole.getUserId()
.equalsIgnoreCase( this.getUserId() ) ) );
}
+
+ @Override
+ public int hashCode()
+ {
+ int result = osPs != null ? osPs.hashCode() : 0;
+ result = 31 * result + ( osUs != null ? osUs.hashCode() : 0 );
+ result = 31 * result + ( beginRange != null ? beginRange.hashCode() : 0 );
+ result = 31 * result + ( endRange != null ? endRange.hashCode() : 0 );
+ result = 31 * result + ( beginInclusive ? 1 : 0 );
+ result = 31 * result + ( endInclusive ? 1 : 0 );
+ result = 31 * result + ( parents != null ? parents.hashCode() : 0 );
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ec0e81ba/src/main/java/org/apache/directory/fortress/core/rbac/UserRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserRole.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserRole.java
index d261723..e678a08 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserRole.java
@@ -608,6 +608,22 @@ public class UserRole extends FortEntity implements Serializable, Constraint
return ( thatRole.getName().equalsIgnoreCase( name ) );
}
+ @Override
+ public int hashCode()
+ {
+ int result = userId != null ? userId.hashCode() : 0;
+ result = 31 * result + ( name != null ? name.hashCode() : 0 );
+ result = 31 * result + ( timeout != null ? timeout.hashCode() : 0 );
+ result = 31 * result + ( beginTime != null ? beginTime.hashCode() : 0 );
+ result = 31 * result + ( endTime != null ? endTime.hashCode() : 0 );
+ result = 31 * result + ( beginDate != null ? beginDate.hashCode() : 0 );
+ result = 31 * result + ( endDate != null ? endDate.hashCode() : 0 );
+ result = 31 * result + ( beginLockDate != null ? beginLockDate.hashCode() : 0 );
+ result = 31 * result + ( endLockDate != null ? endLockDate.hashCode() : 0 );
+ result = 31 * result + ( dayMask != null ? dayMask.hashCode() : 0 );
+ result = 31 * result + ( parents != null ? parents.hashCode() : 0 );
+ return result;
+ }
/**
* Used to retrieve UserRole Role name attribute. The Fortress UserRole name maps to 'ftRA' attribute on