From 7d1e86c6938dc23b9382e26ab63199f29dfe922b Mon Sep 17 00:00:00 2001 From: Andrew Wood Date: Mon, 7 Dec 2020 16:28:09 -0500 Subject: [PATCH] 3078 Change EntityTypeLabelRestController get by label to return REST resource --- .../org/dspace/app/rest/EntityTypeLabelRestController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/EntityTypeLabelRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/EntityTypeLabelRestController.java index 14d01b8c76..0729754172 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/EntityTypeLabelRestController.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/EntityTypeLabelRestController.java @@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse; import org.dspace.app.rest.converter.ConverterService; import org.dspace.app.rest.model.EntityTypeRest; +import org.dspace.app.rest.model.hateoas.EntityTypeResource; import org.dspace.app.rest.utils.ContextUtil; import org.dspace.app.rest.utils.Utils; import org.dspace.content.EntityType; @@ -51,15 +52,15 @@ public class EntityTypeLabelRestController { protected Utils utils; @GetMapping("/label/{entity-type-label}") - public EntityTypeRest get(HttpServletRequest request, HttpServletResponse response, - @PathVariable("entity-type-label") String label) { + public EntityTypeResource get(HttpServletRequest request, HttpServletResponse response, + @PathVariable("entity-type-label") String label) { Context context = ContextUtil.obtainContext(request); try { EntityType entityType = this.entityTypeService.findByEntityType(context, label); if (entityType == null) { throw new ResourceNotFoundException("There was no entityType found with label: " + label); } - return converter.toRest(entityType, utils.obtainProjection()); + return converter.toResource(converter.toRest(entityType, utils.obtainProjection())); } catch (SQLException e) { throw new RuntimeException(e.getMessage(), e); }