Arik Hadas has uploaded a new change for review. Change subject: core: cleanup Handler classes ......................................................................
core: cleanup Handler classes Change the visibility of ObjectIdentityChecker instance in VmHandler, VdsHander and VmTemplateHandler to private and replace direct access to this field from outside of those classes, with delegation methods calls Change-Id: I9dbea95ff90f0fc638c2f109578e932bc964e8f9 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java 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 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 7 files changed, 23 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/11536/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java index 65145fa..8ad8b4f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java @@ -298,7 +298,7 @@ } protected boolean areUpdatedFieldsLegal() { - return VmHandler.mUpdateVmsStatic.IsUpdateValid(getVm().getStaticData(), + return VmHandler.IsUpdateValid(getVm().getStaticData(), getParameters().getVmStaticData(), getVm().getStatus()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java index 2ed4465..c56f380 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java @@ -63,7 +63,7 @@ .getCanDoActionMessages()) && IsDomainLegal(getParameters().getVmTemplateData().getDomain(), getReturnValue() .getCanDoActionMessages())) { - returnValue = VmTemplateHandler.mUpdateVmTemplate.IsUpdateValid(mOldTemplate, getVmTemplate()); + returnValue = VmTemplateHandler.IsUpdateValid(mOldTemplate, getVmTemplate()); if (!returnValue) { addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_UPDATE_ILLEGAL_FIELD); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java index 62d9fa3..9e340b2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java @@ -21,7 +21,7 @@ public class VdsHandler extends BaseHandler { private static Log log = LogFactory.getLog(VdsHandler.class); - public static ObjectIdentityChecker mUpdateVdsStatic; + private static ObjectIdentityChecker mUpdateVdsStatic; /** * Initialize static list containers, for identity and permission check. The initialization should be executed diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java index b964955..8a88b9b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java @@ -53,6 +53,8 @@ new HashMap<VmPropertiesUtils.ValidationFailureReason, String>(); private static final Map<VmPropertiesUtils.ValidationFailureReason, String> failureReasonsToFormatMessages = new HashMap<VmPropertiesUtils.ValidationFailureReason, String>(); + private static ObjectIdentityChecker mUpdateVmsStatic; + static { failureReasonsToVdcBllMessagesMap.put(ValidationFailureReason.DUPLICATE_KEY, VdcBllMessages.ACTION_TYPE_FAILED_INVALID_CUSTOM_VM_PROPERTIES_DUPLICATE_KEYS.name()); @@ -65,8 +67,6 @@ failureReasonsToFormatMessages.put(ValidationFailureReason.INCORRECT_VALUE, "$WrongValueKeys %1$s"); } - - public static ObjectIdentityChecker mUpdateVmsStatic; /** * Initialize static list containers, for identity and permission check. The initialization should be executed @@ -97,6 +97,14 @@ "predefinedProperties", "customProperties" })); } + public static boolean IsUpdateValid(VmStatic source, VmStatic destination, VMStatus status) { + return mUpdateVmsStatic.IsUpdateValid(source, destination, status); + } + + public static boolean IsUpdateValid(VmStatic source, VmStatic destination) { + return mUpdateVmsStatic.IsUpdateValid(source, destination); + } + /** * Verifies the add vm command . * diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java index 39d6647..6fd0b49 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java @@ -18,7 +18,7 @@ public class VmTemplateHandler { public static Guid BlankVmTemplateId = new Guid(); public static String BlankVmTemplateName = "Blank"; - public static ObjectIdentityChecker mUpdateVmTemplate; + private static ObjectIdentityChecker mUpdateVmTemplate; /** * Initialize static list containers, for identity and permission check. The initialization should be executed @@ -40,6 +40,10 @@ }); } + public static boolean IsUpdateValid(VmTemplate source, VmTemplate destination) { + return mUpdateVmTemplate.IsUpdateValid(source, destination); + } + public static void UpdateDisksFromDb(VmTemplate vmt) { vmt.getDiskMap().clear(); vmt.getDiskImageMap().clear(); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java index 1986ab6..4994315 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java @@ -81,10 +81,10 @@ VmStatic dest = new VmStatic(); dest.setVmName(RandomUtils.instance().nextString(10)); - System.out.println(VmHandler.mUpdateVmsStatic.IsUpdateValid(src, dest, VMStatus.Up)); + System.out.println(VmHandler.IsUpdateValid(src, dest, VMStatus.Up)); assertTrue("Update should be valid for different names", - VmHandler.mUpdateVmsStatic.IsUpdateValid(src, dest)); + VmHandler.IsUpdateValid(src, dest)); } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java index fe15f9e..85624d5 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java @@ -25,7 +25,7 @@ dest.setname(RandomUtils.instance().nextString(10)); assertTrue("Update should be valid for different names", - VmTemplateHandler.mUpdateVmTemplate.IsUpdateValid(src, dest)); + VmTemplateHandler.IsUpdateValid(src, dest)); } @Test @@ -37,7 +37,7 @@ dest.setQuotaEnforcementType(QuotaEnforcementTypeEnum.HARD_ENFORCEMENT); assertTrue("Update should be valid for different quota enforcement types", - VmTemplateHandler.mUpdateVmTemplate.IsUpdateValid(src, dest)); + VmTemplateHandler.IsUpdateValid(src, dest)); } @Test @@ -49,6 +49,6 @@ dest.setQuotaDefault(false); assertTrue("Update should be valid for different quota default statuses", - VmTemplateHandler.mUpdateVmTemplate.IsUpdateValid(src, dest)); + VmTemplateHandler.IsUpdateValid(src, dest)); } } -- To view, visit http://gerrit.ovirt.org/11536 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9dbea95ff90f0fc638c2f109578e932bc964e8f9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
