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

Merge remote-tracking branch 'origin/master' into DS-3851_workflow

Browse Source
This commit is contained in:
Andrea Bollini
2019-01-01 13:00:11 +01:00
parent 25e3a69b8f 21fe950593
commit c8e11e6700
690 changed files with 12372 additions and 5001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View File

@@ -17,8 +17,8 @@ import java.util.List;
import java.util.UUID;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;
import org.dspace.app.util.AuthorizeUtil;
import org.dspace.authorize.AuthorizeConfiguration;
import org.dspace.authorize.AuthorizeException;
@@ -65,7 +65,7 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
/**
* log4j category
*/
private static final Logger log = Logger.getLogger(Item.class);
private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(Item.class);
@Autowired(required = true)
protected ItemDAO itemDAO;
@@ -216,12 +216,6 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
return itemDAO.findBySubmitter(context, eperson);
}
@Override
public List<Item> findBySubmitter(Context context, EPerson eperson, Integer limit, Integer offset)
throws SQLException {
return itemDAO.findBySubmitter(context, eperson, limit, offset);
}
@Override
public Iterator<Item> findBySubmitterDateSorted(Context context, EPerson eperson, Integer limit)
throws SQLException {
@@ -308,11 +302,6 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
return matchingBundles;
}
@Override
public List<Bundle> getBundles(Context context, Item item, String name) throws SQLException {
return itemDAO.findBundlesByName(context, item, name);
}
@Override
public void addBundle(Context context, Item item, Bundle bundle) throws SQLException, AuthorizeException {
// Check authorisation