hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

First batch of errorprone fixes. #3061

Browse Source
This commit is contained in:
Mark H. Wood
2020-11-24 10:55:08 -05:00
parent 96742fe558
commit 65f04fcec9
29 changed files with 134 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dspace-api/src/main/java/org/dspace/content/MetadataField.java
View File

@@ -32,7 +32,6 @@ import org.hibernate.proxy.HibernateProxyHelper;
* metadata element belongs in a field.
*
* @author Martin Hald
* @version $Revision$
* @see org.dspace.content.MetadataValue
* @see org.dspace.content.MetadataSchema
*/
@@ -77,6 +76,7 @@ public class MetadataField implements ReloadableEntity<Integer> {
*
* @return metadata field id
*/
@Override
public Integer getID() {
return id;
}
@@ -164,7 +164,7 @@ public class MetadataField implements ReloadableEntity<Integer> {
*/
@Override
public boolean equals(Object obj) {
if (obj == null) {
if (!(obj instanceof MetadataField)) {
return false;
}
Class<?> objClass = HibernateProxyHelper.getClassWithoutInitializingProxy(obj);
@@ -175,10 +175,7 @@ public class MetadataField implements ReloadableEntity<Integer> {
if (!this.getID().equals(other.getID())) {
return false;
}
if (!getMetadataSchema().equals(other.getMetadataSchema())) {
return false;
}
return true;
return getMetadataSchema().equals(other.getMetadataSchema());
}
@Override