mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-10 11:33:11 +00:00
reformat to DSpace style guidelines.
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
* The contents of this file are subject to the license and copyright
|
||||
* detailed in the LICENSE and NOTICE files at the root of the source
|
||||
* tree and available online at
|
||||
*
|
||||
* <p>
|
||||
* http://www.dspace.org/license/
|
||||
*/
|
||||
package org.dspace.app.rest;
|
||||
@@ -61,7 +61,7 @@ public class IdentifierRestController implements InitializingBean {
|
||||
List<Link> links = new ArrayList<Link>();
|
||||
|
||||
Link l = new Link("/api", "pid");
|
||||
links.add ( l );
|
||||
links.add(l);
|
||||
}
|
||||
|
||||
@RequestMapping(method = RequestMethod.GET, value = "/{prefix}/{suffix}")
|
||||
@@ -79,25 +79,21 @@ public class IdentifierRestController implements InitializingBean {
|
||||
|
||||
try {
|
||||
dso = identifierService.resolve(context, prefix + "/" + suffix);
|
||||
if ( dso != null ) {
|
||||
if (dso != null) {
|
||||
DSpaceObjectRest dsor = convertDSpaceObject(dso);
|
||||
URI link = linkTo(dsor.getController(), dsor.getCategory(),
|
||||
English.plural(dsor.getType()))
|
||||
.slash(dsor.getId()).toUri();
|
||||
response.setStatus ( HttpServletResponse.SC_FOUND );
|
||||
response.sendRedirect ( link.toString() );
|
||||
}
|
||||
else {
|
||||
response.setStatus ( HttpServletResponse.SC_NOT_FOUND );
|
||||
}
|
||||
}
|
||||
catch (IdentifierNotFoundException e ) {
|
||||
response.setStatus(HttpServletResponse.SC_FOUND);
|
||||
response.sendRedirect(link.toString());
|
||||
} else {
|
||||
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
|
||||
}
|
||||
catch (IdentifierNotResolvableException e) {
|
||||
} catch (IdentifierNotFoundException e) {
|
||||
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
|
||||
}
|
||||
finally {
|
||||
} catch (IdentifierNotResolvableException e) {
|
||||
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
|
||||
} finally {
|
||||
log.info("DBG " + "aborting context");
|
||||
context.abort();
|
||||
}
|
||||
|
Reference in New Issue
Block a user