Hello Arik Hadas,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/12928
to review the following change.
Change subject: restapi: remove unneeded fetch of template disk entity
......................................................................
restapi: remove unneeded fetch of template disk entity
Remove unneeded call to AbstractBackendCollectionResource#getEntity from
BackendTemplateDisksResource#performRemove, as this method is already
called from AbstractBackendCollectionResource#remove before to ensure
the entity exists, and that's the only flow in which
BackendTemplateDisksResource#performRemove should be called.
Change-Id: Iae1f12ad70371127fd4dceddf302798fa8b750b4
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResourceTest.java
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/12928/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResource.java
index ff19512..e1cc4e7 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResource.java
@@ -37,7 +37,6 @@
@Override
protected Response performRemove(String id) {
- getEntity(id); //will throw 404 if entity not found.
return performAction(VdcActionType.RemoveDisk, new
RemoveDiskParameters(asGuid(id)));
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResourceTest.java
index db7cca2..d21c014 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResourceTest.java
@@ -151,7 +151,7 @@
@Test
public void testRemove() throws Exception {
- setUpGetEntityExpectations(2);
+ setUpGetEntityExpectations(1);
setUriInfo(setUpActionExpectations(VdcActionType.RemoveDisk,
RemoveDiskParameters.class,
new String[] { "EntityId" },
@@ -211,7 +211,7 @@
}
protected void doTestBadRemove(boolean canDo, boolean success, String
detail) throws Exception {
- setUpGetEntityExpectations(2);
+ setUpGetEntityExpectations(1);
setUriInfo(setUpActionExpectations(VdcActionType.RemoveDisk,
RemoveDiskParameters.class,
new String[] { "EntityId" },
--
To view, visit http://gerrit.ovirt.org/12928
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae1f12ad70371127fd4dceddf302798fa8b750b4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Pasternak <mpast...@redhat.com>
Gerrit-Reviewer: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
