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

Fixed a bug in dealing with PUT/update

Browse Source
This commit is contained in:
Jon Brisbin
2012-04-18 11:23:57 -05:00
parent 8d316a0c32
commit 1f3e8ef58c
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
View File

@@ -392,11 +392,11 @@ public class RepositoryRestController implements InitializingBean {
} else {
final MediaType incomingMediaType = request.getHeaders().getContentType();
try {
if (request.getMethod() == HttpMethod.POST) {
final Object incoming = readIncoming(request, incomingMediaType, typeMeta.domainClass);
if (null == incoming) {
model.addAttribute(STATUS, HttpStatus.BAD_REQUEST);
} else {
final Object incoming = readIncoming(request, incomingMediaType, typeMeta.domainClass);
if (null == incoming) {
model.addAttribute(STATUS, HttpStatus.BAD_REQUEST);
} else {
if (request.getMethod() == HttpMethod.POST) {
typeMeta.entityMetadata.id(serId, incoming);
Object savedEntity = repo.save(entity);
String savedId = typeMeta.entityInfo.getId(savedEntity).toString();
@@ -405,23 +405,19 @@ public class RepositoryRestController implements InitializingBean {
headers.set(LOCATION, selfUri.toString());
model.addAttribute(HEADERS, headers);
model.addAttribute(STATUS, HttpStatus.CREATED);
}
} else {
final Map incoming = readIncoming(request, incomingMediaType, Map.class);
if (null == incoming) {
model.addAttribute(STATUS, HttpStatus.BAD_REQUEST);
} else {
for (Map.Entry<String, Attribute> entry : typeMeta.entityMetadata.embeddedAttributes().entrySet()) {
String name = entry.getKey();
if (incoming.containsKey(name)) {
typeMeta.entityMetadata.set(name, incoming.get(name), entity);
Object o = typeMeta.entityMetadata.get(name, incoming);
if (null != o) {
typeMeta.entityMetadata.set(name, o, entity);
}
}
repo.save(entity);
model.addAttribute(STATUS, HttpStatus.NO_CONTENT);
}
}
} catch (IOException e) {
model.addAttribute(STATUS, HttpStatus.BAD_REQUEST);
LOG.error(e.getMessage(), e);