Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-517 - Null query results are now translated into 404.

Browse Source 
We now explicitly handle null query execution results by returning 404 Not Found.
This commit is contained in:
Oliver Gierke
2015-04-13 11:39:59 +02:00
parent 47d369608b
commit 9a77f20bf4
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/AbstractRepositoryRestController.java
View File

@@ -100,11 +100,13 @@ class AbstractRepositoryRestController {
if (source instanceof Iterable) {
return toResources((Iterable<?>) source, assembler, baseLink);
} else if (source == null || ClassUtils.isPrimitiveOrWrapper(source.getClass())) {
} else if (source == null) {
throw new ResourceNotFoundException();
} else if (ClassUtils.isPrimitiveOrWrapper(source.getClass())) {
return source;
} else {
return assembler.toFullResource(source);
}
return assembler.toFullResource(source);
}
protected Resources<? extends Resource<Object>> entitiesToResources(Page<Object> page,

12
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/mongodb/MongoWebTests.java
View File

@@ -315,4 +315,16 @@ public class MongoWebTests extends CommonWebTests {
mvc.perform(get(link.expand(profile.getId()).getHref())).//
andExpect(status().isOk());
}
/**
* @see DATAREST-517
*/
@Test
public void returnsNotFoundIfQueryExecutionDoesNotReturnResult() throws Exception {
Link link = client.discoverUnique("profiles", "search", "findById");
mvc.perform(get(link.expand("").getHref())).//
andExpect(status().isNotFound());
}
}