More errorprone warnings. #3061

This commit is contained in:
Mark H. Wood
2020-11-24 20:22:06 -05:00
parent 65f04fcec9
commit f6112babc3
73 changed files with 360 additions and 390 deletions

View File

@@ -13,7 +13,6 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
@@ -450,7 +449,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
clearMetadata(context, dso, field.schema, field.element, field.qualifier,
language);
String newValueLanguage = (Item.ANY.equals(language)) ? null : language;
String newValueLanguage = Item.ANY.equals(language) ? null : language;
addMetadata(context, dso, field.schema, field.element, field.qualifier,
newValueLanguage, value);
dso.setMetadataModified();
@@ -595,7 +594,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
*/
// A map created to store the latest place for each metadata field
Map<MetadataField, Integer> fieldToLastPlace = new HashMap<>();
List<MetadataValue> metadataValues = new LinkedList<>();
List<MetadataValue> metadataValues;
if (dso.getType() == Constants.ITEM) {
metadataValues = getMetadata(dso, Item.ANY, Item.ANY, Item.ANY, Item.ANY);
} else {
@@ -628,7 +627,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
String authority = metadataValue.getAuthority();
String relationshipId = StringUtils.split(authority, "::")[1];
Relationship relationship = relationshipService.find(context, Integer.parseInt(relationshipId));
if (relationship.getLeftItem() == (Item) dso) {
if (relationship.getLeftItem().equals((Item) dso)) {
relationship.setLeftPlace(mvPlace);
} else {
relationship.setRightPlace(mvPlace);