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

Fix endpoint registration in the root document

Browse Source
This commit is contained in:
Andrea Bollini
2018-05-18 19:13:12 +02:00
parent 17ad4050d2
commit d2ff33da6d
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -33,16 +33,23 @@ import org.dspace.identifier.service.IdentifierService;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.hateoas.Link; import org.springframework.hateoas.Link;
import org.springframework.hateoas.TemplateVariable;
import org.springframework.hateoas.TemplateVariables;
import org.springframework.hateoas.UriTemplate;
import org.springframework.hateoas.TemplateVariable.VariableType;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/api/pid") @RequestMapping("/api/" + IdentifierRestController.CATEGORY)
public class IdentifierRestController implements InitializingBean { public class IdentifierRestController implements InitializingBean {
public static final String CATEGORY = "pid";
private static final String REGEX_HANDLE = "^\\d+/\\d+$"; public static final String ACTION = "find";
public static final String PARAM = "id";
private static final Logger log = private static final Logger log =
Logger.getLogger(IdentifierRestController.class); Logger.getLogger(IdentifierRestController.class);
@@ -50,15 +57,22 @@ public class IdentifierRestController implements InitializingBean {
@Autowired @Autowired
private List<DSpaceObjectConverter> converters; private List<DSpaceObjectConverter> converters;
@Autowired
private DiscoverableEndpointsService discoverableEndpointsService;
@Override @Override
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() throws Exception {
List<Link> links = new ArrayList<Link>(); discoverableEndpointsService
.register(this,
Link l = new Link("/api/pid", "pid"); Arrays.asList(
links.add(l); new Link(
new UriTemplate("/api/" + CATEGORY + "/" + ACTION,
new TemplateVariables(
new TemplateVariable(PARAM, VariableType.REQUEST_PARAM))),
CATEGORY)));
} }
@RequestMapping(method = RequestMethod.GET, value = "/find", params = "id") @RequestMapping(method = RequestMethod.GET, value = ACTION, params = PARAM)
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void getDSObyIdentifier(HttpServletRequest request, public void getDSObyIdentifier(HttpServletRequest request,
HttpServletResponse response, HttpServletResponse response,
@@ -91,7 +105,7 @@ public class IdentifierRestController implements InitializingBean {
} }
/** /**
* * Convert a DSpaceObject in its REST representation using a suitable converter
*/ */
private DSpaceObjectRest convertDSpaceObject(DSpaceObject dspaceObject) { private DSpaceObjectRest convertDSpaceObject(DSpaceObject dspaceObject) {
for (DSpaceObjectConverter converter : converters) { for (DSpaceObjectConverter converter : converters) {