Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

Automated merge

Browse Source
This commit is contained in:
Johannes Schnatterer
2018-06-27 14:30:43 +02:00
parent cba5bf7ba4 9def0697fe
commit 2b2834b2a9
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceManagerAdapter.java
View File

@@ -14,6 +14,8 @@ import java.util.Collection;
import java.util.function.Function;
import java.util.function.Supplier;
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
/**
* Adapter from resource http endpoints to managers.
*
@@ -55,6 +57,9 @@ class ResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
return Response.status(Response.Status.NOT_FOUND).build();
}
MODEL_OBJECT changedModelObject = applyChanges.apply(existingModelObject);
if (!id.equals(changedModelObject.getId())) {
return Response.status(BAD_REQUEST).entity("illegal change of id").build();
}
return update(id, changedModelObject);
}
@@ -73,7 +78,7 @@ class ResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
*/
public Response create(DTO dto, Supplier<MODEL_OBJECT> modelObjectSupplier, Function<MODEL_OBJECT, String> uriCreator) throws IOException, EXCEPTION {
if (dto == null) {
return Response.status(400).build();
return Response.status(BAD_REQUEST).build();
}
MODEL_OBJECT modelObject = modelObjectSupplier.get();
manager.create(modelObject);