From 8ec4780625fb317a90dfdac2850598756d98f82e Mon Sep 17 00:00:00 2001 From: Bill Tantzen Date: Thu, 1 Nov 2018 12:31:16 -0500 Subject: [PATCH] DS-4050 Search method returns 204 NoContent or 200 with an empty page if no result. --- .../java/org/dspace/app/rest/RestResourceController.java | 6 +----- .../java/org/dspace/app/rest/EPersonRestRepositoryIT.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/RestResourceController.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/RestResourceController.java index 864383d687..b956215f9e 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/RestResourceController.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/RestResourceController.java @@ -924,11 +924,7 @@ public class RestResourceController implements InitializingBean { result = assembler.toResource(resources, link); } else { if (searchResult == null) { - try { - response.sendError(HttpServletResponse.SC_NOT_FOUND); - } catch (IOException e) { - throw new RuntimeException(e.getMessage(), e); - } + response.setStatus(HttpServletResponse.SC_NO_CONTENT); return null; } DSpaceResource dsResource = repository.wrapResource((T) searchResult); diff --git a/dspace-spring-rest/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java b/dspace-spring-rest/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java index ab84107706..c7aef88e84 100644 --- a/dspace-spring-rest/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java +++ b/dspace-spring-rest/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java @@ -338,7 +338,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest { String authToken = getAuthToken(admin.getEmail(), password); getClient(authToken).perform(get("/api/eperson/epersons/search/byEmail") .param("email", "undefined@undefined.com")) - .andExpect(status().isNotFound()); + .andExpect(status().isNoContent()); } @Test