Allon Mureinik has submitted this change and it was merged. Change subject: core: Remove GetVdsHooksById2Query ...................................................................... core: Remove GetVdsHooksById2Query GetVdsHooksByIdQuery and GetVdsHooksById2Query are completely identical except for the usage of different APIs of VdsHooksParser. Since GetVdsHooksById is not used anywhere, it is removed, and GetVdsHooksById2 loses it "2" and get a name the better suits conventions (not to mention common sense). This patch includes: 1. Removing the old GetVdsHooksByIdQuery class and renaming GetVdsHooksById2Query to take its place. 2. Removing the old GetVdsHooksById constant in the VdsQueryTye enum, and renaming GetVdsHooksById2 to take its place. 3. Clearing up the VdsHooksParser class from methods with "2" in their name - either by removing unused methods, or by renaming them to a more sensible name. 4. Removing the TestVdsHooks class, as it only tested the removed methods. Change-Id: I1890f429a12cbf7e42727b7360a85ebb1b07b5b0 Signed-off-by: Allon Mureinik <amureini(a)redhat.com&gt; --- D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsHooksById2Query.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsHooksByIdQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResourceTest.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/vdshooks/VdsHooksParser.java D backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/vdshooks/TestVdsHooks.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostHooksListModel.java 8 files changed, 8 insertions(+), 173 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/13607 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1890f429a12cbf7e42727b7360a85ebb1b07b5b0 Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com&gt; Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt;