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

DS-3004: Refactored GroupService so that it doesn't use dc.title anymore to search for a group by name

Browse Source
This commit is contained in:
Tom Desair
2016-02-26 14:52:56 +01:00
parent 5798f58410
commit 382d9421b7
13 changed files with 205 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
View File

@@ -16,7 +16,6 @@ import org.dspace.authorize.service.AuthorizeService;
import org.dspace.content.DSpaceObject;
import org.dspace.content.DSpaceObjectServiceImpl;
import org.dspace.content.MetadataField;
import org.dspace.content.MetadataSchema;
import org.dspace.content.service.CollectionService;
import org.dspace.content.service.CommunityService;
import org.dspace.core.Constants;
@@ -50,9 +49,6 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
@Autowired(required = true)
protected GroupDAO groupDAO;
// @Autowired(required = true)
// protected Group2GroupDAO group2GroupDAO;
@Autowired(required = true)
protected Group2GroupCacheDAO group2GroupCacheDAO;
@@ -275,22 +271,25 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
return groupDAO.findByName(context, name);
}
/** DEPRECATED: Please use findAll(Context context, List<MetadataField> metadataSortFields) instead */
@Override
public List<Group> findAll(Context context, int sortField) throws SQLException
{
List<MetadataField> metadataFieldsSort = new ArrayList<>();
switch (sortField)
{
case NAME:
metadataFieldsSort.add(metadataFieldService.findByElement(context, MetadataSchema.DC_SCHEMA, "title", null));
break;
default:
metadataFieldsSort.add(metadataFieldService.findByElement(context, MetadataSchema.DC_SCHEMA, "title", null));
@Deprecated
public List<Group> findAll(Context context, int sortField) throws SQLException {
if(sortField == GroupService.NAME) {
return findAll(context, null);
} else {
throw new UnsupportedOperationException("You can only find all groups sorted by name with this method");
}
}
return groupDAO.findAll(context, metadataFieldsSort, null);
@Override
public List<Group> findAll(Context context, List<MetadataField> metadataSortFields) throws SQLException
{
if(CollectionUtils.isEmpty(metadataSortFields)) {
return groupDAO.findAll(context);
} else {
return groupDAO.findAll(context, metadataSortFields);
}
}
@Override
@@ -672,4 +671,9 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
public int countTotal(Context context) throws SQLException {
return groupDAO.countRows(context);
}
@Override
public List<Group> findByMetadataField(final Context context, final String searchValue, final MetadataField metadataField) throws SQLException {
return groupDAO.findByMetadataField(context, searchValue, metadataField);
}
}