Allon Mureinik has uploaded a new change for review.
Change subject: core: rename VmTemplateHandler methods
......................................................................
core: rename VmTemplateHandler methods
Renamed methods to adhere to proper Java naming conventions.
Change-Id: I8bbce4a8491ddbec3aec90655e7d7f2f3ab013d3
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmTemplatesQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTemplatesRelatedToQuotaIdQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplateQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByImageGuidQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesFromStorageDomainQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.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/VmTemplateHandler.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmTemplateHandlerTest.java
19 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/22143/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
index eb37fda..e16468c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
@@ -190,7 +190,7 @@
protected void initTemplateDisks() {
if (vmDisksSource != null) {
- VmTemplateHandler.UpdateDisksFromDb(vmDisksSource);
+ VmTemplateHandler.updateDisksFromDb(vmDisksSource);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
index 6c09e92..ec8731e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
@@ -515,7 +515,7 @@
if (isVmInDb) {
VmHandler.unLockVm(getVm());
}
- VmTemplateHandler.UnLockVmTemplate(getVmTemplateId());
+ VmTemplateHandler.unlockVmTemplate(getVmTemplateId());
}
private VmTemplate reloadVmTemplateFromDB() {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
index 6e1cba5..675ba69 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
@@ -108,7 +108,7 @@
BaseConditionFieldAutoCompleter.tagsHandler = mTagsHandler;
VmHandler.init();
VdsHandler.init();
- VmTemplateHandler.Init();
+ VmTemplateHandler.init();
log.info("Completed initializing handlers");
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
index 4656b02..c971c32 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
@@ -76,7 +76,7 @@
protected void initTemplate() {
if (getVmTemplate() != null) {
- VmTemplateHandler.UpdateDisksFromDb(getVmTemplate());
+ VmTemplateHandler.updateDisksFromDb(getVmTemplate());
}
}
@@ -150,7 +150,7 @@
}
getReturnValue().setCanDoAction(!isAtLeastOneVMCreationFailed);
setSucceeded(!isAtLeastOneVMCreationFailed);
-
VmTemplateHandler.UnLockVmTemplate(getParameters().getVmStaticData().getVmtGuid());
+
VmTemplateHandler.unlockVmTemplate(getParameters().getVmStaticData().getVmtGuid());
getCompensationContext().resetCompensation();
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java
index 53eab40..05611ac 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java
@@ -177,7 +177,7 @@
Map<Guid, KeyValuePairCompat<String, List<Guid>>> metaDictionary =
new HashMap<Guid, KeyValuePairCompat<String,
List<Guid>>>();
OvfDataUpdater.getInstance().loadTemplateData(getVmTemplate());
- VmTemplateHandler.UpdateDisksFromDb(getVmTemplate());
+ VmTemplateHandler.updateDisksFromDb(getVmTemplate());
// update the target (export) domain
OvfDataUpdater.getInstance().buildMetadataDictionaryForTemplate(getVmTemplate(),
metaDictionary);
OvfDataUpdater.getInstance().executeUpdateVmInSpmCommand(getVmTemplate().getStoragePoolId(),
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmTemplatesQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmTemplatesQuery.java
index f5116ac..f6742d1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmTemplatesQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmTemplatesQuery.java
@@ -15,7 +15,7 @@
List<VmTemplate> retval =
getDbFacade().getVmTemplateDao().getAll(getUserID(),
getParameters().isFiltered());
for (VmTemplate template : retval) {
- VmTemplateHandler.UpdateDisksFromDb(template);
+ VmTemplateHandler.updateDisksFromDb(template);
}
getQueryReturnValue().setReturnValue(retval);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTemplatesRelatedToQuotaIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTemplatesRelatedToQuotaIdQuery.java
index bcc5653..edd6424 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTemplatesRelatedToQuotaIdQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTemplatesRelatedToQuotaIdQuery.java
@@ -16,7 +16,7 @@
List<VmTemplate> vmTemplates =
getDbFacade().getVmTemplateDao().getAllTemplatesRelatedToQuotaId(getParameters().getId());
for (VmTemplate vmTemplate : vmTemplates) {
- VmTemplateHandler.UpdateDisksFromDb(vmTemplate);
+ VmTemplateHandler.updateDisksFromDb(vmTemplate);
}
getQueryReturnValue().setReturnValue(vmTemplates);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplateQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplateQuery.java
index 2d4d03b..31019ab 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplateQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplateQuery.java
@@ -19,7 +19,7 @@
vmt = DbFacade.getInstance().getVmTemplateDao()
.get(getParameters().getId(), getUserID(),
getParameters().isFiltered());
}
- VmTemplateHandler.UpdateDisksFromDb(vmt);
+ VmTemplateHandler.updateDisksFromDb(vmt);
getQueryReturnValue().setReturnValue(vmt);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByImageGuidQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByImageGuidQuery.java
index b3b18a4..7c9041b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByImageGuidQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByImageGuidQuery.java
@@ -26,6 +26,6 @@
}
protected void updateDisksFromDb(VmTemplate t) {
- VmTemplateHandler.UpdateDisksFromDb(t);
+ VmTemplateHandler.updateDisksFromDb(t);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesFromStorageDomainQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesFromStorageDomainQuery.java
index 2fec8cd..109b651 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesFromStorageDomainQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesFromStorageDomainQuery.java
@@ -23,7 +23,7 @@
getUserID(),
getParameters().isFiltered());
for (VmTemplate template : returnValue) {
- VmTemplateHandler.UpdateDisksFromDb(template);
+ VmTemplateHandler.updateDisksFromDb(template);
java.util.Collections.sort(template.getDiskList(), new
DiskImageByDiskAliasComparator());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
index 2118f2f..0e1f2f1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
@@ -407,7 +407,7 @@
@Override
protected void endMoveOrCopyCommand() {
- VmTemplateHandler.UnLockVmTemplate(getVmTemplateId());
+ VmTemplateHandler.unlockVmTemplate(getVmTemplateId());
endActionOnAllImageGroups();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
index d798f57..28ab5bb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
@@ -98,7 +98,7 @@
protected List<DiskImage> getTemplateDisks() {
if (_templateDisks == null && getVmTemplate() != null) {
- VmTemplateHandler.UpdateDisksFromDb(getVmTemplate());
+ VmTemplateHandler.updateDisksFromDb(getVmTemplate());
_templateDisks = getVmTemplate().getDiskList();
}
return _templateDisks;
@@ -273,7 +273,7 @@
if (getVmTemplate() != null) {
VmDeviceUtils.setVmDevices(getVmTemplate());
incrementDbGeneration();
- VmTemplateHandler.UnLockVmTemplate(getVmTemplateId());
+ VmTemplateHandler.unlockVmTemplate(getVmTemplateId());
}
else {
setCommandShouldBeLogged(false);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
index 109706d..f4b71be 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
@@ -201,7 +201,7 @@
}
protected void updateTemplateDisksFromDb(VmTemplate template) {
- VmTemplateHandler.UpdateDisksFromDb(template);
+ VmTemplateHandler.updateDisksFromDb(template);
}
protected void updateVmDisksFromDb(VM vm) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java
index 805ffeb..d1a60f3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java
@@ -270,7 +270,7 @@
removeTemplateFromDb();
} else {
// unlock template
- VmTemplateHandler.UnLockVmTemplate(getVmTemplateId());
+ VmTemplateHandler.unlockVmTemplate(getVmTemplateId());
}
setSucceeded(true);
} catch (RuntimeException e) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
index 36c339a..0b8deb4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
@@ -215,7 +215,7 @@
public List<VmTemplate> filter(final List<VmTemplate> data) {
for (IVdcQueryable vmt_helper : data) {
VmTemplate vmt = (VmTemplate) vmt_helper;
- VmTemplateHandler.UpdateDisksFromDb(vmt);
+ VmTemplateHandler.updateDisksFromDb(vmt);
}
return data;
}
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 3bcb53b..3c1fb50 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
@@ -58,7 +58,7 @@
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST);
}
- VmTemplateHandler.UpdateDisksFromDb(mOldTemplate);
+ VmTemplateHandler.updateDisksFromDb(mOldTemplate);
if (mOldTemplate.getStatus() == VmTemplateStatus.Locked) {
return failCanDoAction(VdcBllMessages.VM_TEMPLATE_IS_LOCKED);
}
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 5c4f531..b455b2a 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
@@ -29,9 +29,9 @@
* Initialize static list containers, for identity and permission check.
The initialization should be executed
* before calling ObjectIdentityChecker.
*
- * @see Backend#InitHandlers
+ * @see Backend#initHandlers()
*/
- public static void Init() {
+ public static void init() {
final Class<?>[] inspectedClassNames = new Class<?>[] { VmBase.class,
VmTemplate.class };
mUpdateVmTemplate = new ObjectIdentityChecker(VmTemplateHandler.class);
@@ -49,7 +49,7 @@
return mUpdateVmTemplate.IsUpdateValid(source, destination);
}
- public static void UpdateDisksFromDb(VmTemplate vmt) {
+ public static void updateDisksFromDb(VmTemplate vmt) {
vmt.getDiskTemplateMap().clear();
vmt.getDiskImageMap().clear();
vmt.getDiskList().clear();
@@ -78,15 +78,15 @@
TransactionSupport.executeInNewTransaction(new
TransactionMethod<Void>() {
@Override
public Void runInTransaction() {
- SetVmTemplateStatus(vmTemplateGuid, VmTemplateStatus.Locked,
compensationContext);
+ setVmTemplateStatus(vmTemplateGuid, VmTemplateStatus.Locked,
compensationContext);
compensationContext.stateChanged();
return null;
}
});
}
- public static void UnLockVmTemplate(Guid vmTemplateGuid) {
- SetVmTemplateStatus(vmTemplateGuid, VmTemplateStatus.OK, null);
+ public static void unlockVmTemplate(Guid vmTemplateGuid) {
+ setVmTemplateStatus(vmTemplateGuid, VmTemplateStatus.OK, null);
}
/**
@@ -100,7 +100,7 @@
* The compensation context for saving the old status (can be
<code>null</code> if the old status is not
* required to be saved).
*/
- private static void SetVmTemplateStatus(
+ private static void setVmTemplateStatus(
Guid vmTemplateGuid, VmTemplateStatus status, CompensationContext
compensationContext) {
VmTemplate vmTemplate =
DbFacade.getInstance().getVmTemplateDao().get(vmTemplateGuid);
if (vmTemplate != null) {
@@ -111,7 +111,7 @@
DbFacade.getInstance().getVmTemplateDao().update(vmTemplate);
} else {
log.warnFormat(
- "VmTemplateHandler::SetVmTemplateStatus: vmTemplate is
null, not setting status '{0}' to vmTemplate",
+ "VmTemplateHandler::setVmTemplateStatus: vmTemplate is
null, not setting status '{0}' to vmTemplate",
status);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
index 99ac590..1961666 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/AddVmTemplateInterfaceCommand.java
@@ -57,7 +57,7 @@
return false;
}
- VmTemplateHandler.UpdateDisksFromDb(getVmTemplate());
+ VmTemplateHandler.updateDisksFromDb(getVmTemplate());
if (!VmCommand.checkPciAndIdeLimit(getVmTemplate().getNumOfMonitors(),
Collections.<VmNic>singletonList(getParameters().getInterface()),
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 aa466f5..92c5915 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
@@ -13,7 +13,7 @@
@Before
public void setUp() {
- VmTemplateHandler.Init();
+ VmTemplateHandler.init();
}
@Test
--
To view, visit http://gerrit.ovirt.org/22143
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bbce4a8491ddbec3aec90655e7d7f2f3ab013d3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
