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

DATAREST-661 - Fixed non-existant resource detection for PATCH requests.

Browse Source 
PATCH requests to non existing resource now correctly return 404 Not Found as PersistentEntityResourceHandlerMethodArgumentResolver.read(…) now correctly throws the ResourceNotFoundException.
This commit is contained in:
Oliver Gierke
2015-08-28 10:51:27 +02:00
parent e38909c9cf
commit ea70ba51f4
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/PersistentEntityResourceHandlerMethodArgumentResolver.java
View File

@@ -155,7 +155,7 @@ public class PersistentEntityResourceHandlerMethodArgumentResolver implements Ha
if (request.isPatchRequest() && converter instanceof MappingJackson2HttpMessageConverter) { if (request.isPatchRequest() && converter instanceof MappingJackson2HttpMessageConverter) {
if (objectToUpdate == null) { if (objectToUpdate == null) {
new ResourceNotFoundException(); throw new ResourceNotFoundException();
} }
ObjectMapper mapper = ((MappingJackson2HttpMessageConverter) converter).getObjectMapper(); ObjectMapper mapper = ((MappingJackson2HttpMessageConverter) converter).getObjectMapper();

27
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/CommonWebTests.java
View File

@@ -21,6 +21,9 @@ import static org.junit.Assume.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
import net.minidev.json.JSONArray;
import java.net.URI;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -29,6 +32,7 @@ import net.minidev.json.JSONArray;
import org.junit.Test; import org.junit.Test;
import org.springframework.hateoas.Link; import org.springframework.hateoas.Link;
import org.springframework.hateoas.MediaTypes; import org.springframework.hateoas.MediaTypes;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.ResultActions;
@@ -207,4 +211,27 @@ public abstract class CommonWebTests extends AbstractWebIntegrationTests {
mvc.perform(get("/index.html")).// mvc.perform(get("/index.html")).//
andExpect(status().isNotFound()); andExpect(status().isNotFound());
} }
/**
* @see DATAREST-661
*/
@Test
public void patchToNonExistingResourceReturnsNotFound() throws Exception {
String rel = expectedRootLinkRels().iterator().next();
String uri = client.discoverUnique(rel).expand().getHref().concat("/");
String id = "4711";
Integer status = null;
do {
// Try to find non existing resource
uri = uri.concat(id);
status = mvc.perform(get(URI.create(uri))).andReturn().getResponse().getStatus();
} while (status != HttpStatus.NOT_FOUND.value());
// PATCH to non-existing resource
mvc.perform(patch(URI.create(uri))).andExpect(status().isNotFound());
}
} }