Allon Mureinik has uploaded a new change for review. Change subject: core: Remove member init in the VDS parameters ......................................................................
core: Remove member init in the VDS parameters Since the upgrade to GWT 2.5.1, we've seen several cases of GWT pruning member initialization. To prevent these (and future) bugs, this series of patches removes all such initializations from the packages that should be compiled by GWT. These initialization are either moved to the appropriate constructor(s), or removed them completely if they are redundant. Constants with the wrong modifiers are amended to have static final, and are allowed to be initialized directly. As a side bonus, this patch offers a minor performance improvement, as some of these members are now only initialized once instead of twice (once in the member initialization and then again via a constructor parameter). This patch takes care of the VDS command parameter classes. Change-Id: Ib0be55ee582924809c072252110b5e14b1914ea4 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/AllStorageAndImageIdVDSCommandParametersBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeactivateStorageDomainVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FenceVdsVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceListVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImageDomainsListVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImagesListVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageConnectionsListVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetIsoListParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetStorageDomainsListVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IsVmDuringInitiatingVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MigrateVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MomPolicyVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RefreshStoragePoolVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVMVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMTaskGuidBaseVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVdsStatusVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmStatusVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainIdParametersBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StoragePoolDomainAndGroupIdBaseVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageServerConnectionManagementVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/TargetDomainImageGroupVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSParametersBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ValidateStorageDomainVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsAndVmIDVDSParametersBase.java 36 files changed, 114 insertions(+), 59 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/18137/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/AllStorageAndImageIdVDSCommandParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/AllStorageAndImageIdVDSCommandParametersBase.java index d2b2bf3..af2486f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/AllStorageAndImageIdVDSCommandParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/AllStorageAndImageIdVDSCommandParametersBase.java @@ -9,13 +9,14 @@ _imageId = imageId; } - private Guid _imageId = Guid.Empty; + private Guid _imageId; public Guid getImageId() { return _imageId; } public AllStorageAndImageIdVDSCommandParametersBase() { + _imageId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java index 6698799..185fb46 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java @@ -21,9 +21,10 @@ } public ConnectStoragePoolVDSCommandParameters() { + privateMasterDomainId = Guid.Empty; } - private Guid privateMasterDomainId = Guid.Empty; + private Guid privateMasterDomainId; public Guid getMasterDomainId() { return privateMasterDomainId; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java index 3ca2c42..d14f8b7 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java @@ -23,7 +23,7 @@ setPreallocate(preallocate); } - private Guid privatedstImageGroupId = Guid.Empty; + private Guid privatedstImageGroupId; public Guid getdstImageGroupId() { return privatedstImageGroupId; @@ -33,7 +33,7 @@ privatedstImageGroupId = value; } - private Guid privateVmId = Guid.Empty; + private Guid privateVmId; public Guid getVmId() { return privateVmId; @@ -43,7 +43,7 @@ privateVmId = value; } - private Guid privateDstImageId = Guid.Empty; + private Guid privateDstImageId; public Guid getDstImageId() { return privateDstImageId; @@ -63,7 +63,7 @@ privateImageDescription = value; } - private Guid privateDstStorageDomainId = Guid.Empty; + private Guid privateDstStorageDomainId; public Guid getDstStorageDomainId() { return privateDstStorageDomainId; @@ -73,7 +73,7 @@ privateDstStorageDomainId = value; } - private CopyVolumeType privateCopyVolumeType = CopyVolumeType.forValue(0); + private CopyVolumeType privateCopyVolumeType; public CopyVolumeType getCopyVolumeType() { return privateCopyVolumeType; @@ -83,7 +83,7 @@ privateCopyVolumeType = value; } - private VolumeFormat privateVolumeFormat = VolumeFormat.forValue(0); + private VolumeFormat privateVolumeFormat; public VolumeFormat getVolumeFormat() { return privateVolumeFormat; @@ -93,7 +93,7 @@ privateVolumeFormat = value; } - private VolumeType privatePreallocate = VolumeType.forValue(0); + private VolumeType privatePreallocate; public VolumeType getPreallocate() { return privatePreallocate; @@ -124,6 +124,12 @@ } public CopyImageVDSCommandParameters() { + privatedstImageGroupId = Guid.Empty; + privateDstImageId = Guid.Empty; + privateDstStorageDomainId = Guid.Empty; + privateVmId = Guid.Empty; + privateVolumeFormat = VolumeFormat.UNUSED0; + privatePreallocate = VolumeType.Unassigned; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java index 8b10c0f..5332f23 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java @@ -17,7 +17,7 @@ } private long _imageSizeInBytes; - private VolumeType _imageType = VolumeType.forValue(0); + private VolumeType _imageType; public long getImageSizeInBytes() { return _imageSizeInBytes; @@ -27,7 +27,7 @@ return _imageType; } - private VolumeFormat privateVolumeFormat = VolumeFormat.forValue(0); + private VolumeFormat privateVolumeFormat; public VolumeFormat getVolumeFormat() { return privateVolumeFormat; @@ -37,7 +37,7 @@ privateVolumeFormat = value; } - private Guid privateNewImageID = Guid.Empty; + private Guid privateNewImageID; public Guid getNewImageID() { return privateNewImageID; @@ -58,6 +58,9 @@ } public CreateImageVDSCommandParameters() { + _imageType = VolumeType.Unassigned; + privateVolumeFormat = VolumeFormat.UNUSED0; + privateNewImageID = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java index 758141d..4a9b087 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java @@ -14,8 +14,8 @@ setSourceImageGroupId(sourceImageGroupId); } - private Guid _imageId = Guid.Empty; - private Guid privateSourceImageGroupId = Guid.Empty; + private Guid _imageId; + private Guid privateSourceImageGroupId; public Guid getImageId() { return _imageId; @@ -30,6 +30,8 @@ } public CreateSnapshotVDSCommandParameters() { + _imageId = Guid.Empty; + privateSourceImageGroupId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java index 09ac6ae..7dced81 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java @@ -6,7 +6,7 @@ import org.ovirt.engine.core.compat.Guid; public class CreateStoragePoolVDSCommandParameters extends VdsIdVDSCommandParametersBase { - private Guid privateStoragePoolId = Guid.Empty; + private Guid privateStoragePoolId; public Guid getStoragePoolId() { return privateStoragePoolId; @@ -16,7 +16,7 @@ privateStoragePoolId = value; } - private StorageType privateStorageType = StorageType.forValue(0); + private StorageType privateStorageType; public StorageType getStorageType() { return privateStorageType; @@ -36,7 +36,7 @@ privateStoragePoolName = value; } - private Guid privateMasterDomainId = Guid.Empty; + private Guid privateMasterDomainId; public Guid getMasterDomainId() { return privateMasterDomainId; @@ -78,6 +78,9 @@ } public CreateStoragePoolVDSCommandParameters() { + privateStoragePoolId = Guid.Empty; + privateStorageType = StorageType.UNKNOWN; + privateMasterDomainId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeactivateStorageDomainVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeactivateStorageDomainVDSCommandParameters.java index 0a9377e..87e23f6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeactivateStorageDomainVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeactivateStorageDomainVDSCommandParameters.java @@ -3,7 +3,7 @@ import org.ovirt.engine.core.compat.Guid; public class DeactivateStorageDomainVDSCommandParameters extends ActivateStorageDomainVDSCommandParameters { - private Guid privateMasterStorageDomainId = Guid.Empty; + private Guid privateMasterStorageDomainId; public Guid getMasterStorageDomainId() { return privateMasterStorageDomainId; @@ -31,6 +31,7 @@ } public DeactivateStorageDomainVDSCommandParameters() { + privateMasterStorageDomainId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FenceVdsVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FenceVdsVDSCommandParameters.java index 5fb443e..dea35af 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FenceVdsVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FenceVdsVDSCommandParameters.java @@ -23,8 +23,8 @@ private String _type; private String _user; private String _password; - private String _options = ""; - private FenceActionType _action = FenceActionType.forValue(0); + private String _options; + private FenceActionType _action; public Guid getTargetVdsID() { return _targetVdsId; @@ -59,6 +59,8 @@ } public FenceVdsVDSCommandParameters() { + _options = ""; + _action = FenceActionType.Restart; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceListVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceListVDSCommandParameters.java index 78f0479..9a3fda9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceListVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceListVDSCommandParameters.java @@ -9,7 +9,7 @@ setStorageType(storageType); } - private StorageType privateStorageType = StorageType.forValue(0); + private StorageType privateStorageType; public StorageType getStorageType() { return privateStorageType; @@ -20,6 +20,7 @@ } public GetDeviceListVDSCommandParameters() { + privateStorageType = StorageType.UNKNOWN; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImageDomainsListVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImageDomainsListVDSCommandParameters.java index f945eea..deee2b6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImageDomainsListVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImageDomainsListVDSCommandParameters.java @@ -8,7 +8,7 @@ setImageGroupId(imageGroupId); } - private Guid privateImageGroupId = Guid.Empty; + private Guid privateImageGroupId; public Guid getImageGroupId() { return privateImageGroupId; @@ -19,6 +19,7 @@ } public GetImageDomainsListVDSCommandParameters() { + privateImageGroupId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImagesListVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImagesListVDSCommandParameters.java index 0911e52..e23eddd 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImagesListVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImagesListVDSCommandParameters.java @@ -8,7 +8,7 @@ setStorageDomainId(sdUUID); } - private Guid storageDomainId = Guid.Empty; + private Guid storageDomainId; public Guid getStorageDomainId() { return storageDomainId; @@ -19,6 +19,7 @@ } public GetImagesListVDSCommandParameters() { + storageDomainId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageConnectionsListVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageConnectionsListVDSCommandParameters.java index 280f407..096f27e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageConnectionsListVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageConnectionsListVDSCommandParameters.java @@ -3,7 +3,7 @@ import org.ovirt.engine.core.compat.Guid; public class GetStorageConnectionsListVDSCommandParameters extends VdsIdVDSCommandParametersBase { - private Guid privateStoragePoolId = Guid.Empty; + private Guid privateStoragePoolId; public Guid getStoragePoolId() { return privateStoragePoolId; @@ -19,6 +19,7 @@ } public GetStorageConnectionsListVDSCommandParameters() { + privateStoragePoolId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetIsoListParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetIsoListParameters.java index 405b1cc..6f79d21 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetIsoListParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetIsoListParameters.java @@ -8,7 +8,7 @@ setStoragePoolId(storagePoolId); } - private Guid privateStoragePoolId = Guid.Empty; + private Guid privateStoragePoolId; public Guid getStoragePoolId() { return privateStoragePoolId; @@ -19,6 +19,7 @@ } public HSMGetIsoListParameters() { + privateStoragePoolId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetStorageDomainsListVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetStorageDomainsListVDSCommandParameters.java index bf5e2a8..679b5ec 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetStorageDomainsListVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetStorageDomainsListVDSCommandParameters.java @@ -14,7 +14,7 @@ setPath(path); } - private Guid privateStoragePoolId = Guid.Empty; + private Guid privateStoragePoolId; public Guid getStoragePoolId() { return privateStoragePoolId; @@ -24,7 +24,7 @@ privateStoragePoolId = value; } - private StorageType privateStorageType = StorageType.forValue(0); + private StorageType privateStorageType; public StorageType getStorageType() { return privateStorageType; @@ -34,7 +34,7 @@ privateStorageType = value; } - private StorageDomainType privateStorageDomainType = StorageDomainType.forValue(0); + private StorageDomainType privateStorageDomainType; public StorageDomainType getStorageDomainType() { return privateStorageDomainType; @@ -55,6 +55,9 @@ } public HSMGetStorageDomainsListVDSCommandParameters() { + privateStoragePoolId = Guid.Empty; + privateStorageType = StorageType.UNKNOWN; + privateStorageDomainType = StorageDomainType.Master; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java index 36ae85b..9beeb05 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java @@ -8,7 +8,7 @@ setTaskId(taskId); } - private Guid privateTaskId = Guid.Empty; + private Guid privateTaskId; public Guid getTaskId() { return privateTaskId; @@ -19,6 +19,7 @@ } public HSMTaskGuidBaseVDSCommandParameters() { + privateTaskId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java index 2b43fef..3d2d38f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java @@ -3,14 +3,16 @@ import org.ovirt.engine.core.compat.Guid; public class IrsBaseVDSCommandParameters extends VDSParametersBase { - private Guid storagePoolId = Guid.Empty; + private Guid storagePoolId; private boolean ignoreFailoverLimit; public IrsBaseVDSCommandParameters(Guid storagePoolId) { setStoragePoolId(storagePoolId); } - public IrsBaseVDSCommandParameters() { } + public IrsBaseVDSCommandParameters() { + storagePoolId = Guid.Empty; + } public Guid getStoragePoolId() { return storagePoolId; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IsVmDuringInitiatingVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IsVmDuringInitiatingVDSCommandParameters.java index cb6a8b8..75dbd35 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IsVmDuringInitiatingVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IsVmDuringInitiatingVDSCommandParameters.java @@ -7,13 +7,14 @@ _vmId = vmId; } - private Guid _vmId = Guid.Empty; + private Guid _vmId; public Guid getVmId() { return _vmId; } public IsVmDuringInitiatingVDSCommandParameters() { + _vmId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java index 0c34b09..0010538 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java @@ -3,7 +3,7 @@ import org.ovirt.engine.core.compat.Guid; public class MergeSnapshotsVDSCommandParameters extends AllStorageAndImageIdVDSCommandParametersBase { - private Guid _imageId2 = Guid.Empty; + private Guid _imageId2; public MergeSnapshotsVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid vmId, Guid imageGroupId, Guid imageId, Guid imageId2, boolean postZero) { @@ -17,7 +17,7 @@ return _imageId2; } - private Guid privateVmId = Guid.Empty; + private Guid privateVmId; public Guid getVmId() { return privateVmId; @@ -38,6 +38,8 @@ } public MergeSnapshotsVDSCommandParameters() { + _imageId2 = Guid.Empty; + privateVmId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MigrateVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MigrateVDSCommandParameters.java index 7b6dbd7..060f9d9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MigrateVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MigrateVDSCommandParameters.java @@ -7,7 +7,7 @@ private String _srcHost; private Guid _dstVdsId; private String _dstHost; - private MigrationMethod _migrationMethod = MigrationMethod.forValue(0); + private MigrationMethod _migrationMethod; private Boolean tunnelMigration; private String dstQemu; @@ -47,6 +47,7 @@ } public MigrateVDSCommandParameters() { + _migrationMethod = MigrationMethod.OFFLINE; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MomPolicyVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MomPolicyVDSParameters.java index a401908..ed90b6e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MomPolicyVDSParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MomPolicyVDSParameters.java @@ -6,7 +6,7 @@ * Parameters used to fine tune MoM policy */ public class MomPolicyVDSParameters extends VdsIdVDSCommandParametersBase { - private boolean enableBalloon = false; + private boolean enableBalloon; public MomPolicyVDSParameters(VDS vds, boolean enableBalloon) { super(vds.getId()); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java index ac1ffa9..625bda6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java @@ -4,7 +4,7 @@ import org.ovirt.engine.core.compat.Guid; public class MoveImageGroupVDSCommandParameters extends TargetDomainImageGroupVDSCommandParameters { - private Guid privateVmId = Guid.Empty; + private Guid privateVmId; public Guid getVmId() { return privateVmId; @@ -14,7 +14,7 @@ privateVmId = value; } - private ImageOperation privateOp = ImageOperation.forValue(0); + private ImageOperation privateOp; public ImageOperation getOp() { return privateOp; @@ -54,6 +54,8 @@ } public MoveImageGroupVDSCommandParameters() { + privateVmId = Guid.Empty; + privateOp = ImageOperation.Unassigned; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java index 1740d7e..b1ded83 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java @@ -21,11 +21,12 @@ private String gateway; private boolean stp; private String bondingOptions; - private NetworkBootProtocol bootProtocol = NetworkBootProtocol.NONE; + private NetworkBootProtocol bootProtocol; private boolean vmNetwork; private Network network; public NetworkVdsmVDSCommandParameters() { + bootProtocol = NetworkBootProtocol.NONE; } public NetworkVdsmVDSCommandParameters(Guid vdsId, String networkName, Integer vlanId, String bondName, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java index fd607a1..84d31c3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java @@ -16,7 +16,7 @@ privateVdsSpmId = value; } - private Guid privateStoragePoolId = Guid.Empty; + private Guid privateStoragePoolId; public Guid getStoragePoolId() { return privateStoragePoolId; @@ -36,7 +36,7 @@ privateStoragePoolName = value; } - private Guid privateMasterDomainId = Guid.Empty; + private Guid privateMasterDomainId; public Guid getMasterDomainId() { return privateMasterDomainId; @@ -79,13 +79,15 @@ } public ReconstructMasterVDSCommandParameters() { + privateStoragePoolId = Guid.Empty; + privateMasterDomainId = Guid.Empty; } @Override public String toString() { return String.format("%s, vdsSpmId = %d, storagePoolId = %s, " - + "storagePoolName = %s, masterDomainId = %s, masterVersion = %s, " - + "domainsList = [%s]", + + "storagePoolName = %s, masterDomainId = %s, masterVersion = %s, " + + "domainsList = [%s]", super.toString(), getVdsSpmId(), getStoragePoolId(), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RefreshStoragePoolVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RefreshStoragePoolVDSCommandParameters.java index 44c0aca..e78f8f9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RefreshStoragePoolVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RefreshStoragePoolVDSCommandParameters.java @@ -10,7 +10,7 @@ setMasterVersion(masterVersion); } - private Guid privateMasterStorageDomainId = Guid.Empty; + private Guid privateMasterStorageDomainId; public Guid getMasterStorageDomainId() { return privateMasterStorageDomainId; @@ -31,6 +31,7 @@ } public RefreshStoragePoolVDSCommandParameters() { + privateMasterStorageDomainId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVMVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVMVDSCommandParameters.java index 7e5d9e3..144fe68 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVMVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVMVDSCommandParameters.java @@ -13,7 +13,7 @@ setStorageDomainId(storageDomainId); } - private Guid privateVmGuid = Guid.Empty; + private Guid privateVmGuid; public Guid getVmGuid() { return privateVmGuid; @@ -24,6 +24,7 @@ } public RemoveVMVDSCommandParameters() { + privateVmGuid = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMTaskGuidBaseVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMTaskGuidBaseVDSCommandParameters.java index 6258405..a8f98cc 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMTaskGuidBaseVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMTaskGuidBaseVDSCommandParameters.java @@ -8,7 +8,7 @@ setTaskId(taskId); } - private Guid privateTaskId = Guid.Empty; + private Guid privateTaskId; public Guid getTaskId() { return privateTaskId; @@ -19,6 +19,7 @@ } public SPMTaskGuidBaseVDSCommandParameters() { + privateTaskId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVdsStatusVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVdsStatusVDSCommandParameters.java index bbddc22..641fbb5 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVdsStatusVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVdsStatusVDSCommandParameters.java @@ -5,12 +5,13 @@ import org.ovirt.engine.core.compat.Guid; public class SetVdsStatusVDSCommandParameters extends VdsIdVDSCommandParametersBase { - private VDSStatus _status = VDSStatus.forValue(0); - private NonOperationalReason nonOperationalReason = NonOperationalReason.NONE; + private VDSStatus _status; + private NonOperationalReason nonOperationalReason; public SetVdsStatusVDSCommandParameters(Guid vdsId, VDSStatus status) { super(vdsId); _status = status; + nonOperationalReason = NonOperationalReason.NONE; } public SetVdsStatusVDSCommandParameters(Guid vdsId, VDSStatus status, NonOperationalReason nonOperationalReason) { @@ -23,6 +24,8 @@ } public SetVdsStatusVDSCommandParameters() { + _status = VDSStatus.Unassigned; + nonOperationalReason = NonOperationalReason.NONE; } public NonOperationalReason getNonOperationalReason() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmStatusVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmStatusVDSCommandParameters.java index 91579e0..38d4f20 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmStatusVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmStatusVDSCommandParameters.java @@ -4,8 +4,8 @@ import org.ovirt.engine.core.compat.Guid; public class SetVmStatusVDSCommandParameters extends VDSParametersBase { - private Guid _vmId = Guid.Empty; - private VMStatus _status = VMStatus.forValue(0); + private Guid _vmId; + private VMStatus _status; public SetVmStatusVDSCommandParameters(Guid vmId, VMStatus status) { _vmId = vmId; @@ -21,6 +21,8 @@ } public SetVmStatusVDSCommandParameters() { + _vmId = Guid.Empty; + _status = VMStatus.Down; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java index e132b81..463852b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java @@ -23,7 +23,7 @@ this.storagePoolFormatType = storagePoolFormatType; } - private RecoveryMode privateRecoveryMode = RecoveryMode.forValue(0); + private RecoveryMode privateRecoveryMode; public RecoveryMode getRecoveryMode() { return privateRecoveryMode; @@ -44,6 +44,7 @@ } public SpmStartVDSCommandParameters() { + privateRecoveryMode = RecoveryMode.Manual; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainIdParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainIdParametersBase.java index 39c8feb..03ca82d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainIdParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainIdParametersBase.java @@ -7,14 +7,16 @@ */ public class StorageDomainIdParametersBase extends IrsBaseVDSCommandParameters { - private Guid privateStorageDomainId = Guid.Empty; + private Guid privateStorageDomainId; protected StorageDomainIdParametersBase(Guid storagePoolId) { super(storagePoolId); + privateStorageDomainId = Guid.Empty; } protected StorageDomainIdParametersBase() { super(); + privateStorageDomainId = Guid.Empty; } public Guid getStorageDomainId() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StoragePoolDomainAndGroupIdBaseVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StoragePoolDomainAndGroupIdBaseVDSCommandParameters.java index 326dc15..e2e00ae 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StoragePoolDomainAndGroupIdBaseVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StoragePoolDomainAndGroupIdBaseVDSCommandParameters.java @@ -10,7 +10,7 @@ setImageGroupId(imageGroupId); } - private Guid privateImageGroupId = Guid.Empty; + private Guid privateImageGroupId; public Guid getImageGroupId() { return privateImageGroupId; @@ -21,6 +21,7 @@ } public StoragePoolDomainAndGroupIdBaseVDSCommandParameters() { + privateImageGroupId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageServerConnectionManagementVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageServerConnectionManagementVDSParameters.java index e9317b4..74b14d8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageServerConnectionManagementVDSParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageServerConnectionManagementVDSParameters.java @@ -7,7 +7,7 @@ import org.ovirt.engine.core.compat.Guid; public class StorageServerConnectionManagementVDSParameters extends GetStorageConnectionsListVDSCommandParameters { - private StorageType privateStorageType = StorageType.forValue(0); + private StorageType privateStorageType; public StorageType getStorageType() { return privateStorageType; @@ -35,6 +35,7 @@ } public StorageServerConnectionManagementVDSParameters() { + privateStorageType = StorageType.UNKNOWN; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/TargetDomainImageGroupVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/TargetDomainImageGroupVDSCommandParameters.java index 97e2624..385f05e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/TargetDomainImageGroupVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/TargetDomainImageGroupVDSCommandParameters.java @@ -4,7 +4,7 @@ public class TargetDomainImageGroupVDSCommandParameters extends StoragePoolDomainAndGroupIdBaseVDSCommandParameters { - private Guid privateDstDomainId = Guid.Empty; + private Guid privateDstDomainId; public TargetDomainImageGroupVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, @@ -15,6 +15,7 @@ } public TargetDomainImageGroupVDSCommandParameters() { + privateDstDomainId = Guid.Empty; } public Guid getDstDomainId() { @@ -30,4 +31,3 @@ return String.format("%s, dstDomainId = %s", super.toString(), getDstDomainId()); } } - diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSParametersBase.java index 8f94dda..b6ec459 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSParametersBase.java @@ -2,9 +2,10 @@ public class VDSParametersBase { - private boolean runAsync = true; + private boolean runAsync; public VDSParametersBase() { + runAsync = true; } public boolean getRunAsync() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ValidateStorageDomainVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ValidateStorageDomainVDSCommandParameters.java index 3603ceb..5722333 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ValidateStorageDomainVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ValidateStorageDomainVDSCommandParameters.java @@ -3,7 +3,7 @@ import org.ovirt.engine.core.compat.Guid; public class ValidateStorageDomainVDSCommandParameters extends VdsIdVDSCommandParametersBase { - private Guid privateStorageDomainId = Guid.Empty; + private Guid privateStorageDomainId; public Guid getStorageDomainId() { return privateStorageDomainId; @@ -19,6 +19,7 @@ } public ValidateStorageDomainVDSCommandParameters() { + privateStorageDomainId = Guid.Empty; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsAndVmIDVDSParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsAndVmIDVDSParametersBase.java index 14ae8f3..49bfed5 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsAndVmIDVDSParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsAndVmIDVDSParametersBase.java @@ -3,7 +3,7 @@ import org.ovirt.engine.core.compat.Guid; public class VdsAndVmIDVDSParametersBase extends VdsIdVDSCommandParametersBase { - private Guid _vmId = Guid.Empty; + private Guid _vmId; public VdsAndVmIDVDSParametersBase(Guid vdsId, Guid vmId) { super(vdsId); @@ -15,6 +15,7 @@ } public VdsAndVmIDVDSParametersBase() { + _vmId = Guid.Empty; } @Override -- To view, visit http://gerrit.ovirt.org/18137 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0be55ee582924809c072252110b5e14b1914ea4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
