add principalType to feed acl id (equals/hashcode)
@@ -164,23 +164,23 @@ public class JpaFeedOpsAclEntry implements FeedOpsAclEntry, Serializable{
}
@Override
- public int hashCode() {
- return Objects.hash(getUuid(), getPrincipalName());
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
}
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass().isAssignableFrom(obj.getClass())) {
- EntryId that = (EntryId) obj;
- return Objects.equals(getUuid(), that.getUuid()) && Objects.equals(getPrincipalName(), that.getPrincipalName());
- } else {
+ if (!(o instanceof EntryId)) {
return false;
}
+ EntryId entryId = (EntryId) o;
+ return Objects.equals(uuid, entryId.uuid) &&
+ Objects.equals(principalName, entryId.principalName) &&
+ principalType == entryId.principalType;
}
-
+ @Override
+ public int hashCode() {
+ return Objects.hash(uuid, principalName, principalType);
+ }
}
}
