hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2253 from tantz001/DS-4050

Browse Source 
DS-4050 Search method returns 204 NoContent or 200 for empty page if no result.
This commit is contained in:
Andrea Bollini
2018-12-13 22:54:01 +01:00
committed by GitHub
parent c4ab55f6f5 8ec4780625
commit 43bfdbb3ff
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-spring-rest/src/main/java/org/dspace/app/rest/RestResourceController.java
View File

@@ -932,11 +932,7 @@ public class RestResourceController implements InitializingBean {
result = assembler.toResource(resources, link); result = assembler.toResource(resources, link);
} else { } else {
if (searchResult == null) { if (searchResult == null) {
try { response.setStatus(HttpServletResponse.SC_NO_CONTENT);
response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (IOException e) {
throw new RuntimeException(e.getMessage(), e);
}
return null; return null;
} }
DSpaceResource<T> dsResource = repository.wrapResource((T) searchResult); DSpaceResource<T> dsResource = repository.wrapResource((T) searchResult);

2
dspace-spring-rest/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java
View File

@@ -338,7 +338,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
String authToken = getAuthToken(admin.getEmail(), password); String authToken = getAuthToken(admin.getEmail(), password);
getClient(authToken).perform(get("/api/eperson/epersons/search/byEmail") getClient(authToken).perform(get("/api/eperson/epersons/search/byEmail")
.param("email", "undefined@undefined.com")) .param("email", "undefined@undefined.com"))
.andExpect(status().isNotFound()); .andExpect(status().isNoContent());
} }
@Test @Test