Vered Volansky has uploaded a new change for review. Change subject: core: use Java naming convention ......................................................................
core: use Java naming convention In CreateSnapshotCommand changed mnewCreatedDiskImage data member to newDiskImage. Also dropped the 'Created' for a shorter name, just as clear. Change-Id: I614acc66ff631202b786f65daa2451803304ba4d Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java 3 files changed, 43 insertions(+), 43 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/29257/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java index 4bb3468..968893a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java @@ -44,47 +44,47 @@ setDestinationImageId(Guid.newGuid()); } - mNewCreatedDiskImage = new DiskImage(); - mNewCreatedDiskImage.setImageId(getDestinationImageId()); - mNewCreatedDiskImage.setBoot(getParameters().getDiskInfo().isBoot()); - mNewCreatedDiskImage.setDiskInterface(getParameters().getDiskInfo().getDiskInterface()); - mNewCreatedDiskImage.setPropagateErrors(getParameters().getDiskInfo().getPropagateErrors()); - mNewCreatedDiskImage.setWipeAfterDelete(getParameters().getDiskInfo().isWipeAfterDelete()); - mNewCreatedDiskImage.setDiskAlias(getParameters().getDiskInfo().getDiskAlias()); - mNewCreatedDiskImage.setDiskDescription(getParameters().getDiskInfo().getDiskDescription()); - mNewCreatedDiskImage.setShareable(getParameters().getDiskInfo().isShareable()); - mNewCreatedDiskImage.setId(getImageGroupId()); - mNewCreatedDiskImage.setStoragePoolId(getParameters().getStoragePoolId()); - mNewCreatedDiskImage.setStorageIds(new ArrayList<Guid>(Arrays.asList(getParameters().getStorageDomainId()))); - mNewCreatedDiskImage.setSize(getParameters().getDiskInfo().getSize()); - mNewCreatedDiskImage.setVolumeType(getParameters().getDiskInfo().getVolumeType()); - mNewCreatedDiskImage.setvolumeFormat(getParameters().getDiskInfo().getVolumeFormat()); - mNewCreatedDiskImage.setDescription(""); - mNewCreatedDiskImage.setCreationDate(new Date()); - mNewCreatedDiskImage.setLastModified(new Date()); - mNewCreatedDiskImage.setActive(true); - mNewCreatedDiskImage.setImageStatus(ImageStatus.LOCKED); - mNewCreatedDiskImage.setVmSnapshotId(getParameters().getVmSnapshotId()); - mNewCreatedDiskImage.setQuotaId(getParameters().getQuotaId()); + newDiskImage = new DiskImage(); + newDiskImage.setImageId(getDestinationImageId()); + newDiskImage.setBoot(getParameters().getDiskInfo().isBoot()); + newDiskImage.setDiskInterface(getParameters().getDiskInfo().getDiskInterface()); + newDiskImage.setPropagateErrors(getParameters().getDiskInfo().getPropagateErrors()); + newDiskImage.setWipeAfterDelete(getParameters().getDiskInfo().isWipeAfterDelete()); + newDiskImage.setDiskAlias(getParameters().getDiskInfo().getDiskAlias()); + newDiskImage.setDiskDescription(getParameters().getDiskInfo().getDiskDescription()); + newDiskImage.setShareable(getParameters().getDiskInfo().isShareable()); + newDiskImage.setId(getImageGroupId()); + newDiskImage.setStoragePoolId(getParameters().getStoragePoolId()); + newDiskImage.setStorageIds(new ArrayList<Guid>(Arrays.asList(getParameters().getStorageDomainId()))); + newDiskImage.setSize(getParameters().getDiskInfo().getSize()); + newDiskImage.setVolumeType(getParameters().getDiskInfo().getVolumeType()); + newDiskImage.setvolumeFormat(getParameters().getDiskInfo().getVolumeFormat()); + newDiskImage.setDescription(""); + newDiskImage.setCreationDate(new Date()); + newDiskImage.setLastModified(new Date()); + newDiskImage.setActive(true); + newDiskImage.setImageStatus(ImageStatus.LOCKED); + newDiskImage.setVmSnapshotId(getParameters().getVmSnapshotId()); + newDiskImage.setQuotaId(getParameters().getQuotaId()); TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override public Void runInTransaction() { if (!getParameters().isShouldRemainIllegalOnFailedExecution()) { - addDiskImageToDb(mNewCreatedDiskImage, getCompensationContext()); + addDiskImageToDb(newDiskImage, getCompensationContext()); } else { - addDiskImageToDb(mNewCreatedDiskImage, null); - getCompensationContext().snapshotEntityStatus(mNewCreatedDiskImage.getImage(), ImageStatus.ILLEGAL); + addDiskImageToDb(newDiskImage, null); + getCompensationContext().snapshotEntityStatus(newDiskImage.getImage(), ImageStatus.ILLEGAL); } return null; } }); freeLock(); if (getParameters().isShouldRemainIllegalOnFailedExecution()) { - getReturnValue().setActionReturnValue(mNewCreatedDiskImage); + getReturnValue().setActionReturnValue(newDiskImage); } processImageInIrs(); - getReturnValue().setActionReturnValue(mNewCreatedDiskImage); + getReturnValue().setActionReturnValue(newDiskImage); setSucceeded(true); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java index 7f08161..d0a2d0c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java @@ -46,9 +46,9 @@ @Override protected VDSReturnValue performImageVdsmOperation() { setDestinationImageId(Guid.newGuid()); - mNewCreatedDiskImage = cloneDiskImage(getDestinationImageId()); - mNewCreatedDiskImage.setId(Guid.newGuid()); - Guid storagePoolID = mNewCreatedDiskImage.getStoragePoolId() != null ? mNewCreatedDiskImage + newDiskImage = cloneDiskImage(getDestinationImageId()); + newDiskImage.setId(Guid.newGuid()); + Guid storagePoolID = newDiskImage.getStoragePoolId() != null ? newDiskImage .getStoragePoolId() : Guid.Empty; VDSReturnValue vdsReturnValue = null; @@ -57,9 +57,9 @@ vdsReturnValue = runVdsCommand(VDSCommandType.CopyImage, new CopyImageVDSCommandParameters(storagePoolID, getParameters().getStorageDomainId(), getVmTemplateId(), getDiskImage().getId(), getImage().getImageId(), - mNewCreatedDiskImage.getId(), getDestinationImageId(), + newDiskImage.getId(), getDestinationImageId(), "", getDestinationStorageDomainId(), CopyVolumeType.LeafVol, - mNewCreatedDiskImage.getVolumeFormat(), mNewCreatedDiskImage.getVolumeType(), + newDiskImage.getVolumeFormat(), newDiskImage.getVolumeType(), getDiskImage().isWipeAfterDelete(), false)); } catch (VdcBLLException e) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java index 92a9737..aef5aa2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java @@ -33,7 +33,7 @@ @InternalCommandAttribute @NonTransactiveCommandAttribute public class CreateSnapshotCommand<T extends ImagesActionsParametersBase> extends BaseImagesCommand<T> { - protected DiskImage mNewCreatedDiskImage; + protected DiskImage newDiskImage; protected CreateSnapshotCommand(Guid commandId) { super(commandId); @@ -63,8 +63,8 @@ @Override public Void runInTransaction() { processOldImageFromDb(); - addDiskImageToDb(mNewCreatedDiskImage, getCompensationContext()); - setActionReturnValue(mNewCreatedDiskImage); + addDiskImageToDb(newDiskImage, getCompensationContext()); + setActionReturnValue(newDiskImage); setSucceeded(true); return null; } @@ -76,23 +76,23 @@ } protected Guid getDestinationStorageDomainId() { - return mNewCreatedDiskImage.getStorageIds() != null ? mNewCreatedDiskImage.getStorageIds().get(0) + return newDiskImage.getStorageIds() != null ? newDiskImage.getStorageIds().get(0) : Guid.Empty; } @Override protected VDSReturnValue performImageVdsmOperation() { setDestinationImageId(Guid.newGuid()); - mNewCreatedDiskImage = cloneDiskImage(getDestinationImageId()); - mNewCreatedDiskImage.setStorageIds(new ArrayList<Guid>(Arrays.asList(getDestinationStorageDomainId()))); - setStoragePoolId(mNewCreatedDiskImage.getStoragePoolId() != null ? mNewCreatedDiskImage.getStoragePoolId() + newDiskImage = cloneDiskImage(getDestinationImageId()); + newDiskImage.setStorageIds(new ArrayList<Guid>(Arrays.asList(getDestinationStorageDomainId()))); + setStoragePoolId(newDiskImage.getStoragePoolId() != null ? newDiskImage.getStoragePoolId() : Guid.Empty); getParameters().setStoragePoolId(getStoragePoolId()); // override volume type and volume format to sparse and cow according to // storage team request - mNewCreatedDiskImage.setVolumeType(VolumeType.Sparse); - mNewCreatedDiskImage.setvolumeFormat(VolumeFormat.COW); + newDiskImage.setVolumeType(VolumeType.Sparse); + newDiskImage.setvolumeFormat(VolumeFormat.COW); VDSReturnValue vdsReturnValue = null; try { @@ -106,8 +106,8 @@ getImageGroupId(), getImage().getImageId(), getDiskImage().getSize(), - mNewCreatedDiskImage.getVolumeType(), - mNewCreatedDiskImage.getVolumeFormat(), + newDiskImage.getVolumeType(), + newDiskImage.getVolumeFormat(), getDiskImage().getId(), getDestinationImageId(), "")); -- To view, visit http://gerrit.ovirt.org/29257 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I614acc66ff631202b786f65daa2451803304ba4d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
