hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 10:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed the ItemService from the DspaceObjectService

Browse Source
This commit is contained in:
Raf Ponsaerts
2019-01-28 14:10:36 +01:00
parent b908df263c
commit a62a66ec41
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
View File

@@ -27,7 +27,6 @@ import org.dspace.content.authority.Choices;
import org.dspace.content.authority.service.ChoiceAuthorityService; import org.dspace.content.authority.service.ChoiceAuthorityService;
import org.dspace.content.authority.service.MetadataAuthorityService; import org.dspace.content.authority.service.MetadataAuthorityService;
import org.dspace.content.service.DSpaceObjectService; import org.dspace.content.service.DSpaceObjectService;
import org.dspace.content.service.ItemService;
import org.dspace.content.service.MetadataFieldService; import org.dspace.content.service.MetadataFieldService;
import org.dspace.content.service.MetadataValueService; import org.dspace.content.service.MetadataValueService;
import org.dspace.content.service.RelationshipService; import org.dspace.content.service.RelationshipService;
@@ -65,8 +64,6 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
@Autowired(required = true) @Autowired(required = true)
protected MetadataAuthorityService metadataAuthorityService; protected MetadataAuthorityService metadataAuthorityService;
@Autowired(required = true) @Autowired(required = true)
protected ItemService itemService;
@Autowired(required = true)
protected RelationshipService relationshipService; protected RelationshipService relationshipService;
public DSpaceObjectServiceImpl() { public DSpaceObjectServiceImpl() {
@@ -559,7 +556,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
Map<MetadataField, Integer> fieldToLastPlace = new HashMap<>(); Map<MetadataField, Integer> fieldToLastPlace = new HashMap<>();
List<MetadataValue> metadataValues = new LinkedList<>(); List<MetadataValue> metadataValues = new LinkedList<>();
if (dso.getType() == Constants.ITEM) { if (dso.getType() == Constants.ITEM) {
metadataValues = itemService.getMetadata((Item) dso, Item.ANY, Item.ANY, Item.ANY, Item.ANY); metadataValues = getMetadata(dso, Item.ANY, Item.ANY, Item.ANY, Item.ANY);
} else { } else {
metadataValues = dso.getMetadata(); metadataValues = dso.getMetadata();
} }

6
dspace-api/src/main/java/org/dspace/content/MetadataValueComparator.java
View File

@@ -18,9 +18,11 @@ public class MetadataValueComparator
implements Comparator<MetadataValue>, Serializable { implements Comparator<MetadataValue>, Serializable {
@Override @Override
public int compare(MetadataValue mv1, MetadataValue mv2) { public int compare(MetadataValue mv1, MetadataValue mv2) {
int compare = mv1.getMetadataField().getMetadataSchema().getID().compareTo(mv2.getMetadataField().getMetadataSchema().getID()); int compare = mv1.getMetadataField().getMetadataSchema().getID()
if (compare != 0) .compareTo(mv2.getMetadataField().getMetadataSchema().getID());
if (compare != 0) {
return compare; return compare;
}
compare = mv1.getMetadataField().getElement().compareTo(mv2.getMetadataField().getElement()); compare = mv1.getMetadataField().getElement().compareTo(mv2.getMetadataField().getElement());
//TODO: continue comparison //TODO: continue comparison
return compare; return compare;