REST writeStats to reuse existing context

This commit is contained in:
Peter Dietz
2014-10-21 10:17:06 -04:00
parent 334d7197f0
commit cbd595e782
5 changed files with 57 additions and 84 deletions

View File

@@ -99,7 +99,7 @@ public class CollectionsResource extends Resource
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.core.Constants.READ);
writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
headers, request);
headers, request, context);
collection = new Collection(dspaceCollection, expand, context, limit, offset);
context.complete();
@@ -182,7 +182,7 @@ public class CollectionsResource extends Resource
offset);
collections.add(collection);
writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent,
xforwarderfor, headers, request);
xforwarderfor, headers, request, context);
}
}
context.complete();
@@ -254,7 +254,7 @@ public class CollectionsResource extends Resource
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.core.Constants.READ);
writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
headers, request);
headers, request, context);
items = new ArrayList<Item>();
org.dspace.content.ItemIterator dspaceItems = dspaceCollection.getItems();
@@ -267,7 +267,7 @@ public class CollectionsResource extends Resource
{
items.add(new Item(dspaceItem, expand, context));
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor,
headers, request);
headers, request, context);
}
}
}
@@ -335,7 +335,7 @@ public class CollectionsResource extends Resource
org.dspace.core.Constants.WRITE);
writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
headers, request);
headers, request, context);
log.trace("Creating item in collection(id=" + collectionId + ").");
org.dspace.content.WorkspaceItem workspaceItem = org.dspace.content.WorkspaceItem.create(context, dspaceCollection,
@@ -435,7 +435,7 @@ public class CollectionsResource extends Resource
org.dspace.core.Constants.WRITE);
writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
headers, request);
headers, request, context);
dspaceCollection.setMetadata("name", collection.getName());
dspaceCollection.setLicense(collection.getLicense());
@@ -451,7 +451,7 @@ public class CollectionsResource extends Resource
}
catch (ContextException e)
{
processException("Could not update collection(id=" + collectionId + "), ContextEception. Message: " + e.getMessage(),
processException("Could not update collection(id=" + collectionId + "), ContextException. Message: " + e.getMessage(),
context);
}
catch (SQLException e)
@@ -507,7 +507,7 @@ public class CollectionsResource extends Resource
org.dspace.core.Constants.DELETE);
writeStats(dspaceCollection, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor,
headers, request);
headers, request, context);
org.dspace.content.Community community = (org.dspace.content.Community) dspaceCollection.getParentObject();
community.removeCollection(dspaceCollection);
@@ -610,8 +610,8 @@ public class CollectionsResource extends Resource
}
writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor,
headers, request);
writeStats(item, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers, request);
headers, request, context);
writeStats(item, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers, request, context);
dspaceCollection.removeItem(item);