hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

typo: xforwarderfor -> xforwardedfor

Browse Source
This commit is contained in:
Ivan Masár
2016-10-31 14:21:13 +01:00
parent 5ff4ccfedc
commit c92b1d8009
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-rest/src/main/java/org/dspace/rest/FilteredCollectionsResource.java
View File

@@ -164,7 +164,7 @@ public class FilteredCollectionsResource extends Resource {
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public org.dspace.rest.common.FilteredCollection getCollection(@PathParam("collection_id") String collection_id, @QueryParam("expand") String expand, public org.dspace.rest.common.FilteredCollection getCollection(@PathParam("collection_id") String collection_id, @QueryParam("expand") String expand,
@QueryParam("limit") @DefaultValue("1000") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset, @QueryParam("limit") @DefaultValue("1000") Integer limit, @QueryParam("offset") @DefaultValue("0") Integer offset,
@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("xforwarderfor") String xforwarderfor, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@QueryParam("filters") @DefaultValue("is_item") String filters, @QueryParam("filters") @DefaultValue("is_item") String filters,
@Context HttpHeaders headers, @Context HttpServletRequest request, @Context ServletContext servletContext) { @Context HttpHeaders headers, @Context HttpServletRequest request, @Context ServletContext servletContext) {
org.dspace.core.Context context = null; org.dspace.core.Context context = null;
@@ -177,7 +177,7 @@ public class FilteredCollectionsResource extends Resource {
org.dspace.content.Collection collection = collectionService.findByIdOrLegacyId(context, collection_id); org.dspace.content.Collection collection = collectionService.findByIdOrLegacyId(context, collection_id);
if(authorizeService.authorizeActionBoolean(context, collection, org.dspace.core.Constants.READ)) { if(authorizeService.authorizeActionBoolean(context, collection, org.dspace.core.Constants.READ)) {
writeStats(collection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(collection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers, request, context);
retColl = new org.dspace.rest.common.FilteredCollection(collection, servletContext, filters, expand, context, limit, offset); retColl = new org.dspace.rest.common.FilteredCollection(collection, servletContext, filters, expand, context, limit, offset);
} else { } else {
throw new WebApplicationException(Response.Status.UNAUTHORIZED); throw new WebApplicationException(Response.Status.UNAUTHORIZED);

4
dspace-rest/src/main/java/org/dspace/rest/FilteredItemsResource.java
View File

@@ -102,7 +102,7 @@ public class FilteredItemsResource extends Resource {
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public org.dspace.rest.common.ItemFilter getItemQuery(@QueryParam("expand") String expand, public org.dspace.rest.common.ItemFilter getItemQuery(@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("xforwarderfor") String xforwarderfor, @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
@QueryParam("filters") @DefaultValue("is_item,all_filters") String filters, @QueryParam("filters") @DefaultValue("is_item,all_filters") String filters,
@QueryParam("query_field[]") @DefaultValue("dc.title") List<String> query_field, @QueryParam("query_field[]") @DefaultValue("dc.title") List<String> query_field,
@QueryParam("query_op[]") @DefaultValue("exists") List<String> query_op, @QueryParam("query_op[]") @DefaultValue("exists") List<String> query_op,
@@ -135,7 +135,7 @@ public class FilteredItemsResource extends Resource {
Iterator<org.dspace.content.Item> childItems = itemService.findByMetadataQuery(context, listFieldList, query_op, query_val, uuids, regexClause, offset, limit); Iterator<org.dspace.content.Item> childItems = itemService.findByMetadataQuery(context, listFieldList, query_op, query_val, uuids, regexClause, offset, limit);
int count = itemFilterSet.processSaveItems(context, servletContext, childItems, true, expand); int count = itemFilterSet.processSaveItems(context, servletContext, childItems, true, expand);
writeStats(siteService.findSite(context), UsageEvent.Action.VIEW, user_ip, user_agent, xforwarderfor, headers, request, context); writeStats(siteService.findSite(context), UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers, request, context);
result.annotateQuery(query_field, query_op, query_val); result.annotateQuery(query_field, query_op, query_val);
result.setUnfilteredItemCount(count); result.setUnfilteredItemCount(count);
context.complete(); context.complete();

2
dspace-rest/src/main/java/org/dspace/rest/FiltersResource.java
View File

@@ -43,7 +43,7 @@ public class FiltersResource
@GET @GET
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public ItemFilter[] getFilters(@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent, public ItemFilter[] getFilters(@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
{ {

2
dspace-rest/src/main/java/org/dspace/rest/HierarchyResource.java
View File

@@ -66,7 +66,7 @@ public class HierarchyResource extends Resource {
@GET @GET
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public HierarchySite getHierarchy( public HierarchySite getHierarchy(
@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 UnsupportedEncodingException, WebApplicationException { @Context HttpHeaders headers, @Context HttpServletRequest request) throws UnsupportedEncodingException, WebApplicationException {
org.dspace.core.Context context = null; org.dspace.core.Context context = null;

20
dspace-rest/src/main/java/org/dspace/rest/MetadataRegistryResource.java
View File

@@ -87,7 +87,7 @@ public class MetadataRegistryResource extends Resource
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public MetadataSchema[] getSchemas(@QueryParam("expand") @DefaultValue("fields") String expand, public MetadataSchema[] getSchemas(@QueryParam("expand") @DefaultValue("fields") 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
{ {
@@ -148,7 +148,7 @@ public class MetadataRegistryResource extends Resource
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public MetadataSchema getSchema(@PathParam("schema_prefix") String schemaPrefix, @QueryParam("expand") @DefaultValue("fields") String expand, public MetadataSchema getSchema(@PathParam("schema_prefix") String schemaPrefix, @QueryParam("expand") @DefaultValue("fields") 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
{ {
@@ -212,10 +212,10 @@ public class MetadataRegistryResource extends Resource
@PathParam("element") String element, @PathParam("element") String element,
@QueryParam("expand") String expand, @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
{ {
return getMetadataFieldQualified(schemaPrefix, element, "", expand, user_ip, user_agent, xforwarderfor, headers, request); return getMetadataFieldQualified(schemaPrefix, element, "", expand, user_ip, user_agent, xforwardedfor, headers, request);
} }
/** /**
@@ -244,11 +244,11 @@ public class MetadataRegistryResource extends Resource
@Path("/schema/{schema_prefix}/metadata-fields/{element}/{qualifier}") @Path("/schema/{schema_prefix}/metadata-fields/{element}/{qualifier}")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
public MetadataField getMetadataFieldQualified(@PathParam("schema_prefix") String schemaPrefix, public MetadataField getMetadataFieldQualified(@PathParam("schema_prefix") String schemaPrefix,
@PathParam("element") String element, @PathParam("element") String element,
@PathParam("qualifier") @DefaultValue("") String qualifier, @PathParam("qualifier") @DefaultValue("") String qualifier,
@QueryParam("expand") String expand, @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
{ {
@@ -317,7 +317,7 @@ public class MetadataRegistryResource extends Resource
public MetadataField getMetadataField(@PathParam("field_id") Integer fieldId, public MetadataField getMetadataField(@PathParam("field_id") Integer fieldId,
@QueryParam("expand") @DefaultValue("parentSchema") String expand, @QueryParam("expand") @DefaultValue("parentSchema") 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
{ {