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

DSpace refactored service api

Browse Source
This commit is contained in:
KevinVdV
2014-11-08 09:19:09 +01:00
parent fcb3717aad
commit 54222f3c1d
1145 changed files with 52233 additions and 57064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
dspace-api/src/main/java/org/dspace/checker/HandleDispatcher.java
View File

@@ -9,13 +9,18 @@ package org.dspace.checker;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
import java.util.Iterator;
import org.apache.log4j.Logger;
import org.dspace.content.Bitstream;
import org.dspace.content.DSpaceObject;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.BitstreamService;
import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.handle.HandleManager;
import org.dspace.handle.factory.HandleServiceFactory;
import org.dspace.handle.service.HandleService;
/**
* A BitstreamDispatcher that checks all the bitstreams contained within an
@@ -32,19 +37,19 @@ public class HandleDispatcher implements BitstreamDispatcher
/** Log 4j logger. */
private static final Logger LOG = Logger.getLogger(HandleDispatcher.class);
protected Context context;
/** Handle to retrieve bitstreams from. */
private String handle = null;
protected String handle = null;
/** Has the type of object the handle refers to been determined. */
private boolean init = false;
protected boolean init = false;
/** the delegate to dispatch to. */
private ListDispatcher delegate = null;
protected IteratorDispatcher delegate = null;
/**
* Database access for retrieving bitstreams
*/
BitstreamInfoDAO bitstreamInfoDAO;
protected BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
protected HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
/**
* Blanked off, no-op constructor.
@@ -59,9 +64,9 @@ public class HandleDispatcher implements BitstreamDispatcher
* @param hdl
* the handle to get bitstreams from.
*/
public HandleDispatcher(BitstreamInfoDAO bitInfoDAO, String hdl)
public HandleDispatcher(Context context, String hdl)
{
bitstreamInfoDAO = bitInfoDAO;
this.context = context;
handle = hdl;
}
@@ -71,60 +76,33 @@ public class HandleDispatcher implements BitstreamDispatcher
* @throws SQLException
* if database access fails.
*/
private synchronized void init()
{
protected synchronized void init() throws SQLException {
if (!init)
{
Context context = null;
int dsoType = -1;
DSpaceObject dso = handleService.resolveToObject(context, handle);
int id = -1;
try
{
context = new Context();
DSpaceObject dso = HandleManager.resolveToObject(context, handle);
id = dso.getID();
dsoType = dso.getType();
context.abort();
Iterator<Bitstream> ids = new ArrayList<Bitstream>().iterator();
}
catch (SQLException e)
switch (dso.getType())
{
LOG.error("init error " + e.getMessage(), e);
throw new IllegalStateException("init error" + e.getMessage(), e);
case Constants.BITSTREAM:
ids = Arrays.asList(((Bitstream) dso)).iterator();
break;
}
finally
{
// Abort the context if it's still valid
if ((context != null) && context.isValid())
{
context.abort();
}
case Constants.ITEM:
ids = bitstreamService.getItemBitstreams(context, (org.dspace.content.Item) dso);
break;
case Constants.COLLECTION:
ids = bitstreamService.getCollectionBitstreams(context, (org.dspace.content.Collection) dso);
break;
case Constants.COMMUNITY:
ids = bitstreamService.getCommunityBitstreams(context, (org.dspace.content.Community) dso);
break;
}
List<Integer> ids = new ArrayList<Integer>();
switch (dsoType)
{
case Constants.BITSTREAM:
ids.add(Integer.valueOf(id));
break;
case Constants.ITEM:
ids = bitstreamInfoDAO.getItemBitstreams(id);
break;
case Constants.COLLECTION:
ids = bitstreamInfoDAO.getCollectionBitstreams(id);
break;
case Constants.COMMUNITY:
ids = bitstreamInfoDAO.getCommunityBitstreams(id);
break;
}
delegate = new ListDispatcher(ids);
delegate = new IteratorDispatcher(ids);
init = true;
}
}
@@ -134,8 +112,8 @@ public class HandleDispatcher implements BitstreamDispatcher
*
* @see org.dspace.checker.BitstreamDispatcher#next()
*/
public int next()
{
@Override
public Bitstream next() throws SQLException {
if (!init)
{
init();