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

reformat to DSpace style guidelines.

Browse Source
This commit is contained in:
Bill Tantzen
2018-05-10 15:32:48 -05:00
parent 76d60c2e94
commit 195bc622e9
1 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
dspace-spring-rest/src/main/java/org/dspace/app/rest/IdentifierRestController.java
View File

@@ -2,7 +2,7 @@
* The contents of this file are subject to the license and copyright * 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 * detailed in the LICENSE and NOTICE files at the root of the source
* tree and available online at * tree and available online at
* * <p>
* http://www.dspace.org/license/ * http://www.dspace.org/license/
*/ */
package org.dspace.app.rest; package org.dspace.app.rest;
@@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.RestController;
public class IdentifierRestController implements InitializingBean { public class IdentifierRestController implements InitializingBean {
private static final Logger log = private static final Logger log =
Logger.getLogger(IdentifierRestController.class); Logger.getLogger(IdentifierRestController.class);
@Autowired @Autowired
DiscoverableEndpointsService discoverableEndpointsService; DiscoverableEndpointsService discoverableEndpointsService;
@@ -58,49 +58,45 @@ public class IdentifierRestController implements InitializingBean {
@Override @Override
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() throws Exception {
List<Link> links = new ArrayList<Link>(); List<Link> links = new ArrayList<Link>();
Link l = new Link("/api", "pid"); Link l = new Link("/api", "pid");
links.add ( l ); links.add(l);
} }
@RequestMapping(method = RequestMethod.GET, value = "/{prefix}/{suffix}") @RequestMapping(method = RequestMethod.GET, value = "/{prefix}/{suffix}")
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void getDSObyIdentifier(@PathVariable String prefix, public void getDSObyIdentifier(@PathVariable String prefix,
@PathVariable String suffix, @PathVariable String suffix,
HttpServletResponse response, HttpServletResponse response,
HttpServletRequest request) HttpServletRequest request)
throws IOException, SQLException { throws IOException, SQLException {
DSpaceObject dso = null; DSpaceObject dso = null;
Context context = ContextUtil.obtainContext(request); Context context = ContextUtil.obtainContext(request);
IdentifierService identifierService = IdentifierServiceFactory IdentifierService identifierService = IdentifierServiceFactory
.getInstance().getIdentifierService(); .getInstance().getIdentifierService();
try { try {
dso = identifierService.resolve(context, prefix + "/" + suffix); dso = identifierService.resolve(context, prefix + "/" + suffix);
if ( dso != null ) { if (dso != null) {
DSpaceObjectRest dsor = convertDSpaceObject(dso); DSpaceObjectRest dsor = convertDSpaceObject(dso);
URI link = linkTo(dsor.getController(), dsor.getCategory(), URI link = linkTo(dsor.getController(), dsor.getCategory(),
English.plural(dsor.getType())) English.plural(dsor.getType()))
.slash(dsor.getId()).toUri(); .slash(dsor.getId()).toUri();
response.setStatus ( HttpServletResponse.SC_FOUND ); response.setStatus(HttpServletResponse.SC_FOUND);
response.sendRedirect ( link.toString() ); response.sendRedirect(link.toString());
} } else {
else { response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setStatus ( HttpServletResponse.SC_NOT_FOUND ); }
} } catch (IdentifierNotFoundException e) {
} response.setStatus(HttpServletResponse.SC_NOT_FOUND);
catch (IdentifierNotFoundException e ) { } catch (IdentifierNotResolvableException e) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND); response.setStatus(HttpServletResponse.SC_NOT_FOUND);
} } finally {
catch (IdentifierNotResolvableException e) { log.info("DBG " + "aborting context");
response.setStatus(HttpServletResponse.SC_NOT_FOUND); context.abort();
} }
finally {
log.info("DBG " + "aborting context");
context.abort();
}
} }
/** /**