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

fix typos in method signatures

Browse Source
This commit is contained in:
Ivan Masár
2015-01-16 13:07:27 +01:00
parent 0571386370
commit 3dc71439b0
10 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dspace-api/src/main/java/org/dspace/statistics/ElasticSearchLogger.java
View File

@@ -313,7 +313,7 @@ public class ElasticSearchLogger {
} }
} }
public void post(DSpaceObject dspaceObject, String ip, String userAgent, String xforwarderfor, EPerson currentUser) { public void post(DSpaceObject dspaceObject, String ip, String userAgent, String xforwardedfor, EPerson currentUser) {
//log.info("DS-ES post for type:"+dspaceObject.getType() + " -- " + dspaceObject.getName()); //log.info("DS-ES post for type:"+dspaceObject.getType() + " -- " + dspaceObject.getName());
client = ElasticSearchLogger.getInstance().getClient(); client = ElasticSearchLogger.getInstance().getClient();
@@ -329,14 +329,14 @@ public class ElasticSearchLogger {
// Save our basic info that we already have // Save our basic info that we already have
if (isUseProxies() && xforwarderfor != null) { if (isUseProxies() && xforwardedfor != null) {
/* This header is a comma delimited list */ /* This header is a comma delimited list */
for (String xfip : xforwarderfor.split(",")) { for (String xfip : xforwardedfor.split(",")) {
/* proxy itself will sometime populate this header with the same value in /* proxy itself will sometime populate this header with the same value in
remote address. ordering in spec is vague, we'll just take the last remote address. ordering in spec is vague, we'll just take the last
not equal to the proxy not equal to the proxy
*/ */
if (!xforwarderfor.contains(ip)) { if (!xforwardedfor.contains(ip)) {
ip = xfip.trim(); ip = xfip.trim();
} }
} }

12
dspace-api/src/main/java/org/dspace/statistics/SolrLogger.java
View File

@@ -242,13 +242,13 @@ public class SolrLogger
} }
public static void postView(DSpaceObject dspaceObject, public static void postView(DSpaceObject dspaceObject,
String ip, String userAgent, String xforwarderfor, EPerson currentUser) { String ip, String userAgent, String xforwardedfor, EPerson currentUser) {
if (solr == null || locationService == null) { if (solr == null || locationService == null) {
return; return;
} }
try { try {
SolrInputDocument doc1 = getCommonSolrDoc(dspaceObject, ip, userAgent, xforwarderfor, SolrInputDocument doc1 = getCommonSolrDoc(dspaceObject, ip, userAgent, xforwardedfor,
currentUser); currentUser);
if (doc1 == null) if (doc1 == null)
return; return;
@@ -376,7 +376,7 @@ public class SolrLogger
return doc1; return doc1;
} }
private static SolrInputDocument getCommonSolrDoc(DSpaceObject dspaceObject, String ip, String userAgent, String xforwarderfor, EPerson currentUser) throws SQLException { private static SolrInputDocument getCommonSolrDoc(DSpaceObject dspaceObject, String ip, String userAgent, String xforwardedfor, EPerson currentUser) throws SQLException {
boolean isSpiderBot = SpiderDetector.isSpider(ip); boolean isSpiderBot = SpiderDetector.isSpider(ip);
if(isSpiderBot && if(isSpiderBot &&
!ConfigurationManager.getBooleanProperty("usage-statistics", "logBots", true)) !ConfigurationManager.getBooleanProperty("usage-statistics", "logBots", true))
@@ -388,14 +388,14 @@ public class SolrLogger
// Save our basic info that we already have // Save our basic info that we already have
if (isUseProxies() && xforwarderfor != null) { if (isUseProxies() && xforwardedfor != null) {
/* This header is a comma delimited list */ /* This header is a comma delimited list */
for (String xfip : xforwarderfor.split(",")) { for (String xfip : xforwardedfor.split(",")) {
/* proxy itself will sometime populate this header with the same value in /* proxy itself will sometime populate this header with the same value in
remote address. ordering in spec is vague, we'll just take the last remote address. ordering in spec is vague, we'll just take the last
not equal to the proxy not equal to the proxy
*/ */
if (!xforwarderfor.contains(ip)) { if (!xforwardedfor.contains(ip)) {
ip = xfip.trim(); ip = xfip.trim();
} }
} }

12
dspace-api/src/main/java/org/dspace/usage/UsageEvent.java
View File

@@ -56,7 +56,7 @@ public class UsageEvent extends Event {
private transient String userAgent; private transient String userAgent;
private transient String xforwarderfor; private transient String xforwardedfor;
private transient Context context; private transient Context context;
@@ -163,7 +163,7 @@ public class UsageEvent extends Event {
this.object = object; this.object = object;
} }
public UsageEvent(Action action, String ip, String userAgent, String xforwarderfor, Context context, DSpaceObject object) public UsageEvent(Action action, String ip, String userAgent, String xforwardedfor, Context context, DSpaceObject object)
{ {
super(checkParams(action, context, object)); super(checkParams(action, context, object));
@@ -195,7 +195,7 @@ public class UsageEvent extends Event {
this.request = null; this.request = null;
this.ip = ip; this.ip = ip;
this.userAgent = userAgent; this.userAgent = userAgent;
this.xforwarderfor = xforwarderfor; this.xforwardedfor = xforwardedfor;
this.context = context; this.context = context;
this.object = object; this.object = object;
} }
@@ -222,11 +222,11 @@ public class UsageEvent extends Event {
} }
public String getXforwarderfor() { public String getXforwarderfor() {
return xforwarderfor; return xforwardedfor;
} }
public void setXforwarderfor(String xforwarderfor) { public void setXforwarderfor(String xforwardedfor) {
this.xforwarderfor = xforwarderfor; this.xforwardedfor = xforwardedfor;
} }
public void setRequest(HttpServletRequest request) { public void setRequest(HttpServletRequest request) {

2
dspace-rest/README.md
View File

@@ -55,7 +55,7 @@ View/Download a specific Bitstream
####Statistics ####Statistics
Recording of statistics for view of items or download of bitstreams (set stats = true in rest.cfg to enable stats recording) Recording of statistics for view of items or download of bitstreams (set stats = true in rest.cfg to enable stats recording)
http://localhost:8080/rest/items/:ID?userIP=ip&userAgent=userAgent&xforwarderfor=xforwarderfor http://localhost:8080/rest/items/:ID?userIP=ip&userAgent=userAgent&xforwardedfor=xforwardedfor
If no parameters are given the details of httprequest sender are used in statistics. If no parameters are given the details of httprequest sender are used in statistics.
This enables tools to record the details of their user rather then themselves. This enables tools to record the details of their user rather then themselves.

24
dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java
View File

@@ -87,7 +87,7 @@ public class BitstreamResource extends Resource
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Bitstream getBitstream(@PathParam("bitstream_id") Integer bitstreamId, @QueryParam("expand") String expand, public Bitstream getBitstream(@PathParam("bitstream_id") Integer bitstreamId, @QueryParam("expand") String expand,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -100,7 +100,7 @@ public class BitstreamResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.READ); org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.READ);
writeStats(dspaceBitstream, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, writeStats(dspaceBitstream, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
bitstream = new Bitstream(dspaceBitstream, expand); bitstream = new Bitstream(dspaceBitstream, expand);
@@ -211,7 +211,7 @@ public class BitstreamResource extends Resource
public Bitstream[] getBitstreams(@QueryParam("expand") String expand, public Bitstream[] getBitstreams(@QueryParam("expand") String expand,
@QueryParam("limit") @DefaultValue("100") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("limit") @DefaultValue("100") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -241,7 +241,7 @@ public class BitstreamResource extends Resource
// reading under administrator permissions // reading under administrator permissions
bitstreams.add(new Bitstream(dspaceBitstreams[i], expand)); bitstreams.add(new Bitstream(dspaceBitstreams[i], expand));
writeStats(dspaceBitstreams[i], UsageEvent.Action.VIEW, user_ip, user_agent, writeStats(dspaceBitstreams[i], UsageEvent.Action.VIEW, user_ip, user_agent,
xforwarderfor, headers, request, context); xforwardedfor, headers, request, context);
} }
} }
} }
@@ -292,7 +292,7 @@ public class BitstreamResource extends Resource
@Path("/{bitstream_id}/retrieve") @Path("/{bitstream_id}/retrieve")
public javax.ws.rs.core.Response getBitstreamData(@PathParam("bitstream_id") Integer bitstreamId, public javax.ws.rs.core.Response getBitstreamData(@PathParam("bitstream_id") Integer bitstreamId,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -306,7 +306,7 @@ public class BitstreamResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.READ); org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.READ);
writeStats(dspaceBitstream, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, writeStats(dspaceBitstream, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
log.trace("Bitsream(id=" + bitstreamId + ") data was successfully read."); log.trace("Bitsream(id=" + bitstreamId + ") data was successfully read.");
@@ -449,7 +449,7 @@ public class BitstreamResource extends Resource
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Response updateBitstream(@PathParam("bitstream_id") Integer bitstreamId, Bitstream bitstream, public Response updateBitstream(@PathParam("bitstream_id") Integer bitstreamId, Bitstream bitstream,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -461,7 +461,7 @@ public class BitstreamResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.WRITE); org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.WRITE);
writeStats(dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, writeStats(dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
log.trace("Updating bitstream metadata."); log.trace("Updating bitstream metadata.");
@@ -580,7 +580,7 @@ public class BitstreamResource extends Resource
@Path("/{bitstream_id}/data") @Path("/{bitstream_id}/data")
public Response updateBitstreamData(@PathParam("bitstream_id") Integer bitstreamId, InputStream is, public Response updateBitstreamData(@PathParam("bitstream_id") Integer bitstreamId, InputStream is,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -592,7 +592,7 @@ public class BitstreamResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.WRITE); org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.WRITE);
writeStats(dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, writeStats(dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
log.trace("Creating new bitstream."); log.trace("Creating new bitstream.");
@@ -664,7 +664,7 @@ public class BitstreamResource extends Resource
@DELETE @DELETE
@Path("/{bitstream_id}") @Path("/{bitstream_id}")
public Response deleteBitstream(@PathParam("bitstream_id") Integer bitstreamId, @QueryParam("userIP") String user_ip, public Response deleteBitstream(@PathParam("bitstream_id") Integer bitstreamId, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -676,7 +676,7 @@ public class BitstreamResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.DELETE); org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId, org.dspace.core.Constants.DELETE);
writeStats(dspaceBitstream, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor, writeStats(dspaceBitstream, UsageEvent.Action.DELETE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
log.trace("Deleting bitstream from all bundles."); log.trace("Deleting bitstream from all bundles.");

32
dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java
View File

@@ -86,7 +86,7 @@ public class CollectionsResource extends Resource
public org.dspace.rest.common.Collection getCollection(@PathParam("collection_id") Integer collectionId, public org.dspace.rest.common.Collection getCollection(@PathParam("collection_id") Integer collectionId,
@QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("100") Integer limit, @QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("100") Integer limit,
@QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("userIP") String user_ip, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -99,7 +99,7 @@ public class CollectionsResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.core.Constants.READ); org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.core.Constants.READ);
writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
collection = new Collection(dspaceCollection, expand, context, limit, offset); collection = new Collection(dspaceCollection, expand, context, limit, offset);
@@ -155,7 +155,7 @@ public class CollectionsResource extends Resource
public org.dspace.rest.common.Collection[] getCollections(@QueryParam("expand") String expand, public org.dspace.rest.common.Collection[] getCollections(@QueryParam("expand") String expand,
@QueryParam("limit") @DefaultValue("100") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("limit") @DefaultValue("100") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -183,7 +183,7 @@ public class CollectionsResource extends Resource
offset); offset);
collections.add(collection); collections.add(collection);
writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent,
xforwarderfor, headers, request, context); xforwardedfor, headers, request, context);
} }
} }
context.complete(); context.complete();
@@ -241,7 +241,7 @@ public class CollectionsResource extends Resource
public org.dspace.rest.common.Item[] getCollectionItems(@PathParam("collection_id") Integer collectionId, public org.dspace.rest.common.Item[] getCollectionItems(@PathParam("collection_id") Integer collectionId,
@QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("100") Integer limit, @QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("100") Integer limit,
@QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("userIP") String user_ip, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -254,7 +254,7 @@ public class CollectionsResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.core.Constants.READ); org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.core.Constants.READ);
writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
items = new ArrayList<Item>(); items = new ArrayList<Item>();
@@ -267,7 +267,7 @@ public class CollectionsResource extends Resource
if (ItemService.isItemListedForUser(context, dspaceItem)) if (ItemService.isItemListedForUser(context, dspaceItem))
{ {
items.add(new Item(dspaceItem, expand, context)); items.add(new Item(dspaceItem, expand, context));
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
} }
} }
@@ -321,7 +321,7 @@ public class CollectionsResource extends Resource
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Item addCollectionItem(@PathParam("collection_id") Integer collectionId, Item item, public Item addCollectionItem(@PathParam("collection_id") Integer collectionId, Item item,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -335,7 +335,7 @@ public class CollectionsResource extends Resource
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
org.dspace.core.Constants.WRITE); org.dspace.core.Constants.WRITE);
writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
log.trace("Creating item in collection(id=" + collectionId + ")."); log.trace("Creating item in collection(id=" + collectionId + ").");
@@ -422,7 +422,7 @@ public class CollectionsResource extends Resource
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Response updateCollection(@PathParam("collection_id") Integer collectionId, public Response updateCollection(@PathParam("collection_id") Integer collectionId,
org.dspace.rest.common.Collection collection, @QueryParam("userIP") String user_ip, org.dspace.rest.common.Collection collection, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -435,7 +435,7 @@ public class CollectionsResource extends Resource
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
org.dspace.core.Constants.WRITE); org.dspace.core.Constants.WRITE);
writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
dspaceCollection.setMetadata("name", collection.getName()); dspaceCollection.setMetadata("name", collection.getName());
@@ -494,7 +494,7 @@ public class CollectionsResource extends Resource
@Path("/{collection_id}") @Path("/{collection_id}")
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Response deleteCollection(@PathParam("collection_id") Integer collectionId, @QueryParam("userIP") String user_ip, public Response deleteCollection(@PathParam("collection_id") Integer collectionId, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -507,7 +507,7 @@ public class CollectionsResource extends Resource
org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId, org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
org.dspace.core.Constants.DELETE); org.dspace.core.Constants.DELETE);
writeStats(dspaceCollection, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, writeStats(dspaceCollection, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
org.dspace.content.Community community = (org.dspace.content.Community) dspaceCollection.getParentObject(); org.dspace.content.Community community = (org.dspace.content.Community) dspaceCollection.getParentObject();
@@ -566,7 +566,7 @@ public class CollectionsResource extends Resource
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Response deleteCollectionItem(@PathParam("collection_id") Integer collectionId, @PathParam("item_id") Integer itemId, public Response deleteCollectionItem(@PathParam("collection_id") Integer collectionId, @PathParam("item_id") Integer itemId,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -610,9 +610,9 @@ public class CollectionsResource extends Resource
throw new WebApplicationException(Response.Status.UNAUTHORIZED); throw new WebApplicationException(Response.Status.UNAUTHORIZED);
} }
writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
writeStats(item, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(item, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwardedfor, headers, request, context);
dspaceCollection.removeItem(item); dspaceCollection.removeItem(item);

56
dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java
View File

@@ -73,7 +73,7 @@ public class CommunitiesResource extends Resource
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Community getCommunity(@PathParam("community_id") Integer communityId, @QueryParam("expand") String expand, public Community getCommunity(@PathParam("community_id") Integer communityId, @QueryParam("expand") String expand,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -86,7 +86,7 @@ public class CommunitiesResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.READ); org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.READ);
writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
community = new Community(dspaceCommunity, expand, context); community = new Community(dspaceCommunity, expand, context);
@@ -139,7 +139,7 @@ public class CommunitiesResource extends Resource
public Community[] getCommunities(@QueryParam("expand") String expand, public Community[] getCommunities(@QueryParam("expand") String expand,
@QueryParam("limit") @DefaultValue("100") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("limit") @DefaultValue("100") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -167,7 +167,7 @@ public class CommunitiesResource extends Resource
{ {
Community community = new Community(dspaceCommunities[i], expand, context); Community community = new Community(dspaceCommunities[i], expand, context);
writeStats(dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent, writeStats(dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent,
xforwarderfor, headers, request, context); xforwardedfor, headers, request, context);
communities.add(community); communities.add(community);
} }
} }
@@ -221,7 +221,7 @@ public class CommunitiesResource extends Resource
public Community[] getTopCommunities(@QueryParam("expand") String expand, public Community[] getTopCommunities(@QueryParam("expand") String expand,
@QueryParam("limit") @DefaultValue("20") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("limit") @DefaultValue("20") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -249,7 +249,7 @@ public class CommunitiesResource extends Resource
{ {
Community community = new Community(dspaceCommunities[i], expand, context); Community community = new Community(dspaceCommunities[i], expand, context);
writeStats(dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent, writeStats(dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent,
xforwarderfor, headers, request, context); xforwardedfor, headers, request, context);
communities.add(community); communities.add(community);
} }
} }
@@ -303,7 +303,7 @@ public class CommunitiesResource extends Resource
public Collection[] getCommunityCollections(@PathParam("community_id") Integer communityId, public Collection[] getCommunityCollections(@PathParam("community_id") Integer communityId,
@QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("100") Integer limit, @QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("100") Integer limit,
@QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("userIP") String user_ip, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -316,7 +316,7 @@ public class CommunitiesResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.READ); org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.READ);
writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0))) if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0)))
@@ -334,7 +334,7 @@ public class CommunitiesResource extends Resource
{ {
collections.add(new Collection(dspaceCollections[i], expand, context, 20, 0)); collections.add(new Collection(dspaceCollections[i], expand, context, 20, 0));
writeStats(dspaceCollections[i], UsageEvent.Action.VIEW, user_ip, user_agent, writeStats(dspaceCollections[i], UsageEvent.Action.VIEW, user_ip, user_agent,
xforwarderfor, headers, request, context); xforwardedfor, headers, request, context);
} }
} }
@@ -389,7 +389,7 @@ public class CommunitiesResource extends Resource
public Community[] getCommunityCommunities(@PathParam("community_id") Integer communityId, public Community[] getCommunityCommunities(@PathParam("community_id") Integer communityId,
@QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("20") Integer limit, @QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("20") Integer limit,
@QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("userIP") String user_ip, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -402,7 +402,7 @@ public class CommunitiesResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.READ); org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.READ);
writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0))) if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0)))
@@ -420,7 +420,7 @@ public class CommunitiesResource extends Resource
{ {
communities.add(new Community(dspaceCommunities[i], expand, context)); communities.add(new Community(dspaceCommunities[i], expand, context));
writeStats(dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent, writeStats(dspaceCommunities[i], UsageEvent.Action.VIEW, user_ip, user_agent,
xforwarderfor, headers, request, context); xforwardedfor, headers, request, context);
} }
} }
@@ -464,7 +464,7 @@ public class CommunitiesResource extends Resource
@POST @POST
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Community createCommunity(Community community, @QueryParam("userIP") String user_ip, public Community createCommunity(Community community, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -489,7 +489,7 @@ public class CommunitiesResource extends Resource
} }
org.dspace.content.Community dspaceCommunity = org.dspace.content.Community.create(null, context); org.dspace.content.Community dspaceCommunity = org.dspace.content.Community.create(null, context);
writeStats(dspaceCommunity, UsageEvent.Action.CREATE, user_ip, user_agent, xforwarderfor, writeStats(dspaceCommunity, UsageEvent.Action.CREATE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
dspaceCommunity.setMetadata("name", community.getName()); dspaceCommunity.setMetadata("name", community.getName());
@@ -549,7 +549,7 @@ public class CommunitiesResource extends Resource
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Collection addCommunityCollection(@PathParam("community_id") Integer communityId, Collection collection, public Collection addCommunityCollection(@PathParam("community_id") Integer communityId, Collection collection,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -562,7 +562,7 @@ public class CommunitiesResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.WRITE); org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.WRITE);
writeStats(dspaceCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, writeStats(dspaceCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
org.dspace.content.Collection dspaceCollection = dspaceCommunity.createCollection(); org.dspace.content.Collection dspaceCollection = dspaceCommunity.createCollection();
@@ -633,7 +633,7 @@ public class CommunitiesResource extends Resource
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Community addCommunityCommunity(@PathParam("community_id") Integer communityId, Community community, public Community addCommunityCommunity(@PathParam("community_id") Integer communityId, Community community,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -647,7 +647,7 @@ public class CommunitiesResource extends Resource
org.dspace.content.Community dspaceParentCommunity = findCommunity(context, communityId, org.dspace.content.Community dspaceParentCommunity = findCommunity(context, communityId,
org.dspace.core.Constants.WRITE); org.dspace.core.Constants.WRITE);
writeStats(dspaceParentCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, writeStats(dspaceParentCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
org.dspace.content.Community dspaceCommunity = org.dspace.content.Community.create(dspaceParentCommunity, context); org.dspace.content.Community dspaceCommunity = org.dspace.content.Community.create(dspaceParentCommunity, context);
@@ -713,7 +713,7 @@ public class CommunitiesResource extends Resource
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Response updateCommunity(@PathParam("community_id") Integer communityId, Community community, public Response updateCommunity(@PathParam("community_id") Integer communityId, Community community,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -725,7 +725,7 @@ public class CommunitiesResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.WRITE); org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId, org.dspace.core.Constants.WRITE);
writeStats(dspaceCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, writeStats(dspaceCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
// dspaceCommunity.setLogo(arg0); // TODO Add this option. // dspaceCommunity.setLogo(arg0); // TODO Add this option.
@@ -780,7 +780,7 @@ public class CommunitiesResource extends Resource
@DELETE @DELETE
@Path("/{community_id}") @Path("/{community_id}")
public Response deleteCommunity(@PathParam("community_id") Integer communityId, @QueryParam("userIP") String user_ip, public Response deleteCommunity(@PathParam("community_id") Integer communityId, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -792,7 +792,7 @@ public class CommunitiesResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Community community = findCommunity(context, communityId, org.dspace.core.Constants.DELETE); org.dspace.content.Community community = findCommunity(context, communityId, org.dspace.core.Constants.DELETE);
writeStats(community, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor, headers, writeStats(community, UsageEvent.Action.DELETE, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
community.delete(); community.delete();
@@ -850,7 +850,7 @@ public class CommunitiesResource extends Resource
@Path("/{community_id}/collections/{collection_id}") @Path("/{community_id}/collections/{collection_id}")
public Response deleteCommunityCollection(@PathParam("community_id") Integer communityId, public Response deleteCommunityCollection(@PathParam("community_id") Integer communityId,
@PathParam("collection_id") Integer collectionId, @QueryParam("userIP") String user_ip, @PathParam("collection_id") Integer collectionId, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -892,9 +892,9 @@ public class CommunitiesResource extends Resource
throw new WebApplicationException(Response.Status.UNAUTHORIZED); throw new WebApplicationException(Response.Status.UNAUTHORIZED);
} }
writeStats(community, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, writeStats(community, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
writeStats(collection, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor, headers, writeStats(collection, UsageEvent.Action.DELETE, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
community.removeCollection(collection); community.removeCollection(collection);
@@ -956,7 +956,7 @@ public class CommunitiesResource extends Resource
@Path("/{community_id}/communities/{community_id2}") @Path("/{community_id}/communities/{community_id2}")
public Response deleteCommunityCommunity(@PathParam("community_id") Integer parentCommunityId, public Response deleteCommunityCommunity(@PathParam("community_id") Integer parentCommunityId,
@PathParam("community_id2") Integer subcommunityId, @QueryParam("userIP") String user_ip, @PathParam("community_id2") Integer subcommunityId, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -999,9 +999,9 @@ public class CommunitiesResource extends Resource
throw new WebApplicationException(Response.Status.UNAUTHORIZED); throw new WebApplicationException(Response.Status.UNAUTHORIZED);
} }
writeStats(parentCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, writeStats(parentCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
writeStats(subcommunity, UsageEvent.Action.DELETE, user_ip, user_agent, xforwarderfor, headers, writeStats(subcommunity, UsageEvent.Action.DELETE, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
parentCommunity.removeSubcommunity(subcommunity); parentCommunity.removeSubcommunity(subcommunity);

46
dspace-rest/src/main/java/org/dspace/rest/ItemsResource.java
View File

@@ -92,7 +92,7 @@ public class ItemsResource extends Resource
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Item getItem(@PathParam("item_id") Integer itemId, @QueryParam("expand") String expand, public Item getItem(@PathParam("item_id") Integer itemId, @QueryParam("expand") String expand,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -105,7 +105,7 @@ public class ItemsResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ); org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ);
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers, request, context);
item = new Item(dspaceItem, expand, context); item = new Item(dspaceItem, expand, context);
context.complete(); context.complete();
@@ -152,7 +152,7 @@ public class ItemsResource extends Resource
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Item[] getItems(@QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("100") Integer limit, public Item[] getItems(@QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("100") Integer limit,
@QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("userIP") String user_ip, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -182,7 +182,7 @@ public class ItemsResource extends Resource
if (ItemService.isItemListedForUser(context, dspaceItem)) if (ItemService.isItemListedForUser(context, dspaceItem))
{ {
items.add(new Item(dspaceItem, expand, context)); items.add(new Item(dspaceItem, expand, context));
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor,
headers, request, context); headers, request, context);
} }
} }
@@ -228,7 +228,7 @@ public class ItemsResource extends Resource
@Path("/{item_id}/metadata") @Path("/{item_id}/metadata")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public MetadataEntry[] getItemMetadata(@PathParam("item_id") Integer itemId, @QueryParam("userIP") String user_ip, public MetadataEntry[] getItemMetadata(@PathParam("item_id") Integer itemId, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -241,7 +241,7 @@ public class ItemsResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ); org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ);
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers, request, context);
metadata = new org.dspace.rest.common.Item(dspaceItem, "metadata", context).getMetadata(); metadata = new org.dspace.rest.common.Item(dspaceItem, "metadata", context).getMetadata();
context.complete(); context.complete();
@@ -288,7 +288,7 @@ public class ItemsResource extends Resource
public Bitstream[] getItemBitstreams(@PathParam("item_id") Integer itemId, public Bitstream[] getItemBitstreams(@PathParam("item_id") Integer itemId,
@QueryParam("limit") @DefaultValue("20") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("limit") @DefaultValue("20") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -300,7 +300,7 @@ public class ItemsResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ); org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ);
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers, request, context);
List<Bitstream> itemBitstreams = new Item(dspaceItem, "bitstreams", context).getBitstreams(); List<Bitstream> itemBitstreams = new Item(dspaceItem, "bitstreams", context).getBitstreams();
@@ -359,7 +359,7 @@ public class ItemsResource extends Resource
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Response addItemMetadata(@PathParam("item_id") Integer itemId, List<org.dspace.rest.common.MetadataEntry> metadata, public Response addItemMetadata(@PathParam("item_id") Integer itemId, List<org.dspace.rest.common.MetadataEntry> metadata,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -371,7 +371,7 @@ public class ItemsResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE); org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers, request, context);
for (MetadataEntry entry : metadata) for (MetadataEntry entry : metadata)
{ {
@@ -438,7 +438,7 @@ public class ItemsResource extends Resource
@QueryParam("name") String name, @QueryParam("description") String description, @QueryParam("name") String name, @QueryParam("description") String description,
@QueryParam("groupId") Integer groupId, @QueryParam("year") Integer year, @QueryParam("month") Integer month, @QueryParam("groupId") Integer groupId, @QueryParam("year") Integer year, @QueryParam("month") Integer month,
@QueryParam("day") Integer day, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("day") Integer day, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -451,7 +451,7 @@ public class ItemsResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE); org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers, request, context);
// Is better to add bitstream to ORIGINAL bundle or to item own? // Is better to add bitstream to ORIGINAL bundle or to item own?
log.trace("Creating bitstream in item."); log.trace("Creating bitstream in item.");
@@ -609,7 +609,7 @@ public class ItemsResource extends Resource
@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Response updateItemMetadata(@PathParam("item_id") Integer itemId, MetadataEntry[] metadata, public Response updateItemMetadata(@PathParam("item_id") Integer itemId, MetadataEntry[] metadata,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -621,7 +621,7 @@ public class ItemsResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE); org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers, request, context);
log.trace("Deleting original metadata from item."); log.trace("Deleting original metadata from item.");
for (MetadataEntry entry : metadata) for (MetadataEntry entry : metadata)
@@ -691,7 +691,7 @@ public class ItemsResource extends Resource
@DELETE @DELETE
@Path("/{item_id}") @Path("/{item_id}")
public Response deleteItem(@PathParam("item_id") Integer itemId, @QueryParam("userIP") String user_ip, public Response deleteItem(@PathParam("item_id") Integer itemId, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -703,7 +703,7 @@ public class ItemsResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.DELETE); org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.DELETE);
writeStats(dspaceItem, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(dspaceItem, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwardedfor, headers, request, context);
log.trace("Deleting item."); log.trace("Deleting item.");
org.dspace.content.Collection collection = org.dspace.content.Collection.find(context, org.dspace.content.Collection collection = org.dspace.content.Collection.find(context,
@@ -760,7 +760,7 @@ public class ItemsResource extends Resource
@DELETE @DELETE
@Path("/{item_id}/metadata") @Path("/{item_id}/metadata")
public Response deleteItemMetadata(@PathParam("item_id") Integer itemId, @QueryParam("userIP") String user_ip, public Response deleteItemMetadata(@PathParam("item_id") Integer itemId, @QueryParam("userIP") String user_ip,
@QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException @Context HttpHeaders headers, @Context HttpServletRequest request) throws WebApplicationException
{ {
@@ -772,7 +772,7 @@ public class ItemsResource extends Resource
context = createContext(getUser(headers)); context = createContext(getUser(headers));
org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE); org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers, request, context);
log.trace("Deleting metadata."); log.trace("Deleting metadata.");
// TODO Rewrite without deprecated object. Leave there only generated metadata. // TODO Rewrite without deprecated object. Leave there only generated metadata.
@@ -841,7 +841,7 @@ public class ItemsResource extends Resource
@Path("/{item_id}/bitstreams/{bitstream_id}") @Path("/{item_id}/bitstreams/{bitstream_id}")
public Response deleteItemBitstream(@PathParam("item_id") Integer itemId, @PathParam("bitstream_id") Integer bitstreamId, public Response deleteItemBitstream(@PathParam("item_id") Integer itemId, @PathParam("bitstream_id") Integer bitstreamId,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -867,8 +867,8 @@ public class ItemsResource extends Resource
return Response.status(Status.UNAUTHORIZED).build(); return Response.status(Status.UNAUTHORIZED).build();
} }
writeStats(item, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(item, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers, request, context);
writeStats(bitstream, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwarderfor, headers, writeStats(bitstream, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
log.trace("Deleting bitstream..."); log.trace("Deleting bitstream...");
@@ -938,7 +938,7 @@ public class ItemsResource extends Resource
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public Item[] findItemsByMetadataField(MetadataEntry metadataEntry, @QueryParam("expand") String expand, public Item[] findItemsByMetadataField(MetadataEntry metadataEntry, @QueryParam("expand") String expand,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
@QueryParam("xforwarderfor") String xforwarderfor, @Context HttpHeaders headers, @Context HttpServletRequest request) @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers, @Context HttpServletRequest request)
throws WebApplicationException throws WebApplicationException
{ {
@@ -1009,7 +1009,7 @@ public class ItemsResource extends Resource
org.dspace.content.Item dspaceItem = this.findItem(context, row.getIntColumn("ITEM_ID"), org.dspace.content.Item dspaceItem = this.findItem(context, row.getIntColumn("ITEM_ID"),
org.dspace.core.Constants.READ); org.dspace.core.Constants.READ);
Item item = new Item(dspaceItem, "", context); Item item = new Item(dspaceItem, "", context);
writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
request, context); request, context);
items.add(item); items.add(item);
} }

6
dspace-rest/src/main/java/org/dspace/rest/Resource.java
View File

@@ -98,13 +98,13 @@ public class Resource
* Action that was performed. * Action that was performed.
* @param user_ip * @param user_ip
* @param user_agent * @param user_agent
* @param xforwarderfor * @param xforwardedfor
* @param headers * @param headers
* @param request * @param request
* @param context * @param context
*/ */
protected void writeStats(DSpaceObject dspaceObject, UsageEvent.Action action, protected void writeStats(DSpaceObject dspaceObject, UsageEvent.Action action,
String user_ip, String user_agent, String xforwarderfor, HttpHeaders headers, HttpServletRequest request, Context context) String user_ip, String user_agent, String xforwardedfor, HttpHeaders headers, HttpServletRequest request, Context context)
{ {
if (!writeStatistics) if (!writeStatistics)
{ {
@@ -118,7 +118,7 @@ public class Resource
else else
{ {
new DSpace().getEventService().fireEvent( new DSpace().getEventService().fireEvent(
new UsageEvent(action, user_ip, user_agent, xforwarderfor, context, dspaceObject)); new UsageEvent(action, user_ip, user_agent, xforwardedfor, context, dspaceObject));
} }
log.debug("fired event"); log.debug("fired event");

22
dspace-services/src/main/java/org/dspace/services/sessions/model/SessionImpl.java
View File

@@ -144,7 +144,7 @@ public final class SessionImpl implements Session {
* @return true if the attribute is set * @return true if the attribute is set
*/ */
public boolean isAttributeSet(String key) { public boolean isAttributeSet(String key) {
return getKeyAtribute(key) != null; return getKeyAttribute(key) != null;
} }
/** /**
@@ -202,7 +202,7 @@ public final class SessionImpl implements Session {
* @return the value OR null if not found * @return the value OR null if not found
* @throws IllegalArgumentException if the key is null * @throws IllegalArgumentException if the key is null
*/ */
protected String getKeyAtribute(String key) { protected String getKeyAttribute(String key) {
if (key == null) { if (key == null) {
throw new IllegalArgumentException("session attribute key cannot be null"); throw new IllegalArgumentException("session attribute key cannot be null");
} }
@@ -272,7 +272,7 @@ public final class SessionImpl implements Session {
* @see org.dspace.services.model.Session#getAttribute(java.lang.String) * @see org.dspace.services.model.Session#getAttribute(java.lang.String)
*/ */
public String getAttribute(String key) { public String getAttribute(String key) {
return getKeyAtribute(key); return getKeyAttribute(key);
} }
/* (non-Javadoc) /* (non-Javadoc)
@@ -340,27 +340,27 @@ public final class SessionImpl implements Session {
} }
public String getOriginatingHostIP() { public String getOriginatingHostIP() {
return getKeyAtribute(HOST_IP); return getKeyAttribute(HOST_IP);
} }
public String getOriginatingHostName() { public String getOriginatingHostName() {
return getKeyAtribute(HOST_NAME); return getKeyAttribute(HOST_NAME);
} }
public String getServerId() { public String getServerId() {
return getKeyAtribute(SERVER_ID); return getKeyAttribute(SERVER_ID);
} }
public String getSessionId() { public String getSessionId() {
return getKeyAtribute(SESSION_ID); return getKeyAttribute(SESSION_ID);
} }
public String getUserEID() { public String getUserEID() {
return getKeyAtribute(USER_EID); return getKeyAttribute(USER_EID);
} }
public String getUserId() { public String getUserId() {
return getKeyAtribute(USER_ID); return getKeyAttribute(USER_ID);
} }
public boolean isActive() { public boolean isActive() {
@@ -376,7 +376,7 @@ public final class SessionImpl implements Session {
public String getId() { public String getId() {
String id = null; String id = null;
if (isAttributeSet(SESSION_ID)) { if (isAttributeSet(SESSION_ID)) {
id = getKeyAtribute(SESSION_ID); id = getKeyAttribute(SESSION_ID);
} else { } else {
id = this.httpSession.getId(); id = this.httpSession.getId();
} }
@@ -422,7 +422,7 @@ public final class SessionImpl implements Session {
* @see javax.servlet.http.HttpSession#getValue(java.lang.String) * @see javax.servlet.http.HttpSession#getValue(java.lang.String)
*/ */
public Object getValue(String name) { public Object getValue(String name) {
return getKeyAtribute(name); return getKeyAttribute(name);
} }
/* (non-Javadoc) /* (non-Javadoc)