mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-07 01:54:22 +00:00
Shrink writeStats signature, DSO type constant unneccessary
This commit is contained in:
@@ -37,7 +37,6 @@ import org.dspace.authorize.AuthorizeException;
|
||||
import org.dspace.authorize.AuthorizeManager;
|
||||
import org.dspace.content.BitstreamFormat;
|
||||
import org.dspace.content.Bundle;
|
||||
import org.dspace.core.Constants;
|
||||
import org.dspace.eperson.Group;
|
||||
import org.dspace.rest.common.Bitstream;
|
||||
import org.dspace.rest.common.ResourcePolicy;
|
||||
@@ -101,7 +100,7 @@ public class BitstreamResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.READ);
|
||||
|
||||
writeStats(Constants.BITSTREAM, dspaceBitstream, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(dspaceBitstream, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
|
||||
bitstream = new Bitstream(dspaceBitstream, expand);
|
||||
@@ -241,7 +240,7 @@ public class BitstreamResource extends Resource
|
||||
{ // To eliminate bitstreams which cause exception, because of
|
||||
// reading under administrator permissions
|
||||
bitstreams.add(new Bitstream(dspaceBitstreams[i], expand));
|
||||
writeStats(Constants.BITSTREAM, dspaceBitstreams[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
writeStats(dspaceBitstreams[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
xforwarderfor, headers, request);
|
||||
}
|
||||
}
|
||||
@@ -306,7 +305,7 @@ public class BitstreamResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.READ);
|
||||
|
||||
writeStats(Constants.BITSTREAM, dspaceBitstream, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(dspaceBitstream, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
|
||||
log.trace("Bitsream(id=" + bitstreamId + ") data was successfully read.");
|
||||
@@ -464,7 +463,7 @@ public class BitstreamResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.WRITE);
|
||||
|
||||
writeStats(Constants.BITSTREAM, dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
log.trace("Updating bitstream metadata.");
|
||||
@@ -595,7 +594,7 @@ public class BitstreamResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.WRITE);
|
||||
|
||||
writeStats(Constants.BITSTREAM, dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
log.trace("Creating new bitstream.");
|
||||
@@ -679,7 +678,7 @@ public class BitstreamResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.DELETE);
|
||||
|
||||
writeStats(Constants.BITSTREAM, dspaceBitstream, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceBitstream, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
log.trace("Deleting bitstream from all bundles.");
|
||||
|
@@ -33,7 +33,6 @@ import org.apache.log4j.Logger;
|
||||
import org.dspace.authorize.AuthorizeException;
|
||||
import org.dspace.authorize.AuthorizeManager;
|
||||
import org.dspace.browse.BrowseException;
|
||||
import org.dspace.core.Constants;
|
||||
import org.dspace.rest.common.Collection;
|
||||
import org.dspace.rest.common.Item;
|
||||
import org.dspace.rest.common.MetadataEntry;
|
||||
@@ -99,7 +98,7 @@ public class CollectionsResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
|
||||
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.core.Constants.READ);
|
||||
writeStats(Constants.COLLECTION, dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
collection = new Collection(dspaceCollection, expand, context, limit, offset);
|
||||
@@ -187,7 +186,7 @@ public class CollectionsResource extends Resource
|
||||
Collection collection = new org.dspace.rest.common.Collection(dspaceCollections[i], null, context, limit,
|
||||
offset);
|
||||
collections.add(collection);
|
||||
writeStats(Constants.COLLECTION, dspaceCollections[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
writeStats(dspaceCollections[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
xforwarderfor, headers, request);
|
||||
}
|
||||
}
|
||||
@@ -260,7 +259,7 @@ public class CollectionsResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
|
||||
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.core.Constants.READ);
|
||||
writeStats(Constants.COLLECTION, dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
List<Item> items = new ArrayList<Item>();
|
||||
@@ -273,7 +272,7 @@ public class CollectionsResource extends Resource
|
||||
if (AuthorizeManager.authorizeActionBoolean(context, dspaceItem, org.dspace.core.Constants.READ))
|
||||
{
|
||||
items.add(new Item(dspaceItem, expand, context));
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
}
|
||||
}
|
||||
@@ -343,7 +342,7 @@ public class CollectionsResource extends Resource
|
||||
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
|
||||
org.dspace.core.Constants.WRITE);
|
||||
|
||||
writeStats(Constants.COLLECTION, dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
log.trace("Creating item in collection(id=" + collectionId + ").");
|
||||
@@ -443,7 +442,7 @@ public class CollectionsResource extends Resource
|
||||
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
|
||||
org.dspace.core.Constants.WRITE);
|
||||
|
||||
writeStats(Constants.COLLECTION, dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
dspaceCollection.setMetadata("name", collection.getName());
|
||||
@@ -515,7 +514,7 @@ public class CollectionsResource extends Resource
|
||||
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
|
||||
org.dspace.core.Constants.DELETE);
|
||||
|
||||
writeStats(Constants.COLLECTION, dspaceCollection, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceCollection, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
org.dspace.content.Community community = (org.dspace.content.Community) dspaceCollection.getParentObject();
|
||||
@@ -618,9 +617,9 @@ public class CollectionsResource extends Resource
|
||||
throw new WebApplicationException(Response.Status.UNAUTHORIZED);
|
||||
}
|
||||
|
||||
writeStats(Constants.COLLECTION, dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
writeStats(Constants.ITEM, item, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(item, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
|
||||
dspaceCollection.removeItem(item);
|
||||
|
||||
|
@@ -31,7 +31,6 @@ import javax.ws.rs.core.Response;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.dspace.authorize.AuthorizeException;
|
||||
import org.dspace.authorize.AuthorizeManager;
|
||||
import org.dspace.core.Constants;
|
||||
import org.dspace.rest.common.Collection;
|
||||
import org.dspace.rest.common.Community;
|
||||
import org.dspace.rest.exceptions.ContextException;
|
||||
@@ -87,7 +86,7 @@ public class CommunitiesResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
|
||||
org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.READ);
|
||||
writeStats(Constants.COMMUNITY, dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
|
||||
community = new Community(dspaceCommunity, expand, context);
|
||||
@@ -165,7 +164,7 @@ public class CommunitiesResource extends Resource
|
||||
if (AuthorizeManager.authorizeActionBoolean(context, dspaceCommunities[i], org.dspace.core.Constants.READ))
|
||||
{
|
||||
Community community = new Community(dspaceCommunities[i], expand, context);
|
||||
writeStats(Constants.COMMUNITY, dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
writeStats(dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
xforwarderfor, headers, request);
|
||||
communities.add(community);
|
||||
}
|
||||
@@ -249,7 +248,7 @@ public class CommunitiesResource extends Resource
|
||||
if (AuthorizeManager.authorizeActionBoolean(context, dspaceCommunities[i], org.dspace.core.Constants.READ))
|
||||
{
|
||||
Community community = new Community(dspaceCommunities[i], expand, context);
|
||||
writeStats(Constants.COMMUNITY, dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
writeStats(dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
xforwarderfor, headers, request);
|
||||
communities.add(community);
|
||||
}
|
||||
@@ -319,7 +318,7 @@ public class CommunitiesResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
|
||||
org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.READ);
|
||||
writeStats(Constants.COMMUNITY, dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
|
||||
if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0)))
|
||||
@@ -336,7 +335,7 @@ public class CommunitiesResource extends Resource
|
||||
if (AuthorizeManager.authorizeActionBoolean(context, dspaceCollections[i], org.dspace.core.Constants.READ))
|
||||
{
|
||||
collections.add(new Collection(dspaceCollections[i], expand, context, 20, 0));
|
||||
writeStats(Constants.COLLECTION, dspaceCollections[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
writeStats(dspaceCollections[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
xforwarderfor, headers, request);
|
||||
}
|
||||
}
|
||||
@@ -407,7 +406,7 @@ public class CommunitiesResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
|
||||
org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.READ);
|
||||
writeStats(Constants.COMMUNITY, dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
|
||||
if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0)))
|
||||
@@ -424,7 +423,7 @@ public class CommunitiesResource extends Resource
|
||||
if (AuthorizeManager.authorizeActionBoolean(context, dspaceCommunities[i], org.dspace.core.Constants.READ))
|
||||
{
|
||||
communities.add(new Community(dspaceCommunities[i], expand, context));
|
||||
writeStats(Constants.COMMUNITY, dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
writeStats(dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent,
|
||||
xforwarderfor, headers, request);
|
||||
}
|
||||
}
|
||||
@@ -497,7 +496,7 @@ public class CommunitiesResource extends Resource
|
||||
}
|
||||
|
||||
org.dspace.content.Community dspaceCommunity = org.dspace.content.Community.create(null, context);
|
||||
writeStats(Constants.COMMUNITY, dspaceCommunity, UsageEvent.Action.CREATE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceCommunity, UsageEvent.Action.CREATE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
dspaceCommunity.setMetadata("name", community.getName());
|
||||
@@ -569,7 +568,7 @@ public class CommunitiesResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.WRITE);
|
||||
|
||||
writeStats(Constants.COMMUNITY, dspaceCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
org.dspace.content.Collection dspaceCollection = dspaceCommunity.createCollection();
|
||||
@@ -653,7 +652,7 @@ public class CommunitiesResource extends Resource
|
||||
org.dspace.content.Community dspaceParentCommunity = findCommunity(context, communityId,
|
||||
org.dspace.core.Constants.WRITE);
|
||||
|
||||
writeStats(Constants.COMMUNITY, dspaceParentCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceParentCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
org.dspace.content.Community dspaceCommunity = org.dspace.content.Community.create(dspaceParentCommunity, context);
|
||||
@@ -730,7 +729,7 @@ public class CommunitiesResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
|
||||
org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.WRITE);
|
||||
writeStats(Constants.COMMUNITY, dspaceCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
|
||||
// dspaceCommunity.setLogo(arg0); // TODO Add this option.
|
||||
@@ -797,7 +796,7 @@ public class CommunitiesResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
|
||||
org.dspace.content.Community community = findCommunity(context, communityId, org.dspace.core.Constants.DELETE);
|
||||
writeStats(Constants.COMMUNITY, community, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(community, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
|
||||
community.delete();
|
||||
@@ -896,9 +895,9 @@ public class CommunitiesResource extends Resource
|
||||
throw new WebApplicationException(Response.Status.UNAUTHORIZED);
|
||||
}
|
||||
|
||||
writeStats(Constants.COMMUNITY, community, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(community, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
writeStats(Constants.COLLECTION, collection, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(collection, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
|
||||
community.removeCollection(collection);
|
||||
@@ -1002,9 +1001,9 @@ public class CommunitiesResource extends Resource
|
||||
throw new WebApplicationException(Response.Status.UNAUTHORIZED);
|
||||
}
|
||||
|
||||
writeStats(Constants.COMMUNITY, parentCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(parentCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
writeStats(Constants.COMMUNITY, subcommunity, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(subcommunity, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
|
||||
parentCommunity.removeSubcommunity(subcommunity);
|
||||
|
@@ -39,7 +39,6 @@ import org.dspace.content.BitstreamFormat;
|
||||
import org.dspace.content.Bundle;
|
||||
import org.dspace.content.DCValue;
|
||||
import org.dspace.content.ItemIterator;
|
||||
import org.dspace.core.Constants;
|
||||
import org.dspace.eperson.Group;
|
||||
import org.dspace.rest.common.Bitstream;
|
||||
import org.dspace.rest.common.Item;
|
||||
@@ -105,7 +104,7 @@ public class ItemsResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ);
|
||||
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
|
||||
item = new Item(dspaceItem, expand, context);
|
||||
context.complete();
|
||||
@@ -181,7 +180,7 @@ public class ItemsResource extends Resource
|
||||
if (AuthorizeManager.authorizeActionBoolean(context, dspaceItem, org.dspace.core.Constants.READ))
|
||||
{
|
||||
items.add(new Item(dspaceItem, expand, context));
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
|
||||
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
|
||||
headers, request);
|
||||
}
|
||||
}
|
||||
@@ -243,7 +242,7 @@ public class ItemsResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ);
|
||||
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
|
||||
List<MetadataEntry> metadata = new org.dspace.rest.common.Item(dspaceItem, "metadata", context).getMetadata();
|
||||
context.complete();
|
||||
@@ -304,7 +303,7 @@ public class ItemsResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ);
|
||||
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
|
||||
List<Bitstream> bitstreams;
|
||||
List<Bitstream> itemBitstreams = new Item(dspaceItem, "bitstreams", context).getBitstreams();
|
||||
@@ -380,7 +379,7 @@ public class ItemsResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
|
||||
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
|
||||
for (MetadataEntry entry : metadata)
|
||||
{
|
||||
@@ -460,7 +459,7 @@ public class ItemsResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
|
||||
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
|
||||
// Is better to add bitstream to ORIGINAL bundle or to item own?
|
||||
log.trace("Creating bitstream in item.");
|
||||
@@ -626,7 +625,7 @@ public class ItemsResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
|
||||
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
|
||||
log.trace("Deleting original metadata from item.");
|
||||
for (MetadataEntry entry : metadata)
|
||||
@@ -708,7 +707,7 @@ public class ItemsResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.DELETE);
|
||||
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(dspaceItem, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
|
||||
log.trace("Deleting item.");
|
||||
org.dspace.content.Collection collection = org.dspace.content.Collection.find(context,
|
||||
@@ -777,7 +776,7 @@ public class ItemsResource extends Resource
|
||||
context = createContext(getUser(headers));
|
||||
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
|
||||
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
|
||||
log.trace("Deleting metadata.");
|
||||
// TODO Rewrite without deprecated object. Leave there only generated metadata.
|
||||
@@ -872,8 +871,8 @@ public class ItemsResource extends Resource
|
||||
return Response.status(Status.UNAUTHORIZED).build();
|
||||
}
|
||||
|
||||
writeStats(Constants.ITEM, item, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(Constants.BITSTREAM, bitstream, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(item, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request);
|
||||
writeStats(bitstream, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
|
||||
log.trace("Deleting bitstream...");
|
||||
@@ -1014,7 +1013,7 @@ public class ItemsResource extends Resource
|
||||
org.dspace.content.Item dspaceItem = this.findItem(context, row.getIntColumn("ITEM_ID"),
|
||||
org.dspace.core.Constants.READ);
|
||||
Item item = new Item(dspaceItem, "", context);
|
||||
writeStats(Constants.ITEM, dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers,
|
||||
request);
|
||||
items.add(item);
|
||||
}
|
||||
|
@@ -17,6 +17,7 @@ import javax.ws.rs.core.HttpHeaders;
|
||||
import javax.ws.rs.core.Response;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
import org.dspace.content.DSpaceObject;
|
||||
import org.dspace.core.ConfigurationManager;
|
||||
import org.dspace.eperson.EPerson;
|
||||
import org.dspace.rest.exceptions.ContextException;
|
||||
@@ -50,7 +51,7 @@ public class Resource
|
||||
* authorization to read form database. And Exception, if there was some
|
||||
* problem with creating context.
|
||||
*
|
||||
* @param user
|
||||
* @param person
|
||||
* User which will be logged in context.
|
||||
* @return New created context with logged user if user was not null.
|
||||
* Otherwise, without logged user.
|
||||
@@ -87,11 +88,6 @@ public class Resource
|
||||
|
||||
/**
|
||||
* It write statistic about using REST api.
|
||||
*
|
||||
* @param typeOfObject
|
||||
* Type of which object is performed. From class
|
||||
* org.dspace.core.Constants. For example: bitstream, item and so
|
||||
* on.
|
||||
* @param dspaceObject
|
||||
* Object of DSpace which is performed.
|
||||
* @param action
|
||||
@@ -102,8 +98,8 @@ public class Resource
|
||||
* @param headers
|
||||
* @param request
|
||||
*/
|
||||
protected void writeStats(int typeOfObject, org.dspace.content.DSpaceObject dspaceObject, UsageEvent.Action action,
|
||||
String user_ip, String user_agent, String xforwarderfor, HttpHeaders headers, HttpServletRequest request)
|
||||
protected void writeStats(DSpaceObject dspaceObject, UsageEvent.Action action,
|
||||
String user_ip, String user_agent, String xforwarderfor, HttpHeaders headers, HttpServletRequest request)
|
||||
{
|
||||
|
||||
if (!writeStatistics)
|
||||
|
Reference in New Issue
Block a user