Roy Golan has submitted this change and it was merged. Change subject: core: Consolidate EditableField Annotations ...................................................................... core: Consolidate EditableField Annotations This patch combines the EditableField, EditableOnVmStatusField, EditableOnTemplate, EditableOnVm, and EditableOnHostedEngine annotations into the EditableVmField annotation. It also combines the EditableField and EditableOnVdsStatusField annotations into the EditableVdsField annotation. These changes are meant to make proper usage of the annotations easier and the resulting code easier to read and understand. Change-Id: Iac377ee408d0e711a2cf3b3e72460814aa3183f8 Bug-Url: https://bugzilla.redhat.com/1326512 Signed-off-by: Phillip Bailey <phbailey(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VdsHandlerTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EditableField.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EditableHostedEngineField.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EditableOnTemplate.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EditableOnVdsStatus.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EditableOnVmStatusField.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EditableVdsField.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EditableVmField.java R backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EditableVmTemplateField.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/pm/FenceAgent.java 20 files changed, 482 insertions(+), 259 deletions(-) Approvals: Jenkins CI: Passed CI tests Roy Golan: Looks good to me, approved Phillip Bailey: Verified -- To view, visit https://gerrit.ovirt.org/54725 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac377ee408d0e711a2cf3b3e72460814aa3183f8 Gerrit-PatchSet: 16 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Phillip Bailey <phbailey(a)redhat.com&gt; Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com&gt; Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com&gt; Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com&gt; Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com&gt; Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com&gt; Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com&gt; Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com&gt; Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Shmuel Leib Melamud <smelamud(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;