Allon Mureinik has uploaded a new change for review. Change subject: core: Remove member init in the query parameters ......................................................................
core: Remove member init in the query 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 query parameter classes. Change-Id: Ic89595cd4e26b7fca901d62ba57f4cfdf29c12b1 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetDeviceListQueryParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetExistingStorageDomainListParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListByStoragePoolIdParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParametersBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetNewVdsFenceStatusParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetPermissionsForObjectParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmTemplateParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SearchParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainAndPoolQueryParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainQueryParametersBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterHookContentQueryParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterHookQueryParameters.java 17 files changed, 42 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/18135/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java index 795954a..126c0e8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java @@ -4,7 +4,7 @@ public class GetAllFromExportDomainQueryParameters extends VdcQueryParametersBase { private static final long serialVersionUID = 5436719744430725750L; - private Guid privateStoragePoolId = Guid.Empty; + private Guid privateStoragePoolId; public Guid getStoragePoolId() { return privateStoragePoolId; @@ -14,7 +14,7 @@ privateStoragePoolId = value; } - private Guid privateStorageDomainId = Guid.Empty; + private Guid privateStorageDomainId; public Guid getStorageDomainId() { return privateStorageDomainId; @@ -40,5 +40,6 @@ } public GetAllFromExportDomainQueryParameters() { + this (Guid.Empty, Guid.Empty); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java index 83639fb..2be04d0 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java @@ -1,6 +1,5 @@ package org.ovirt.engine.core.common.queries; - public class GetConfigurationValueParameters extends VdcQueryParametersBase { private static final long serialVersionUID = -5889171970595969719L; @@ -8,7 +7,7 @@ _configValue = cVal; } - private ConfigurationValues _configValue = ConfigurationValues.forValue(0); + private ConfigurationValues _configValue; public ConfigurationValues getConfigValue() { return _configValue; @@ -30,6 +29,7 @@ } public GetConfigurationValueParameters() { + _configValue = ConfigurationValues.MaxNumOfVmCpus; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetDeviceListQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetDeviceListQueryParameters.java index 18a2eed..ea90f97 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetDeviceListQueryParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetDeviceListQueryParameters.java @@ -5,7 +5,7 @@ public class GetDeviceListQueryParameters extends VdsIdParametersBase { private static final long serialVersionUID = -3909252459169512472L; - private StorageType privateStorageType = StorageType.forValue(0); + private StorageType privateStorageType; public StorageType getStorageType() { return privateStorageType; @@ -21,5 +21,6 @@ } public GetDeviceListQueryParameters() { + privateStorageType = StorageType.UNKNOWN; } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetExistingStorageDomainListParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetExistingStorageDomainListParameters.java index d6edec3..274ad51 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetExistingStorageDomainListParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetExistingStorageDomainListParameters.java @@ -7,7 +7,7 @@ public class GetExistingStorageDomainListParameters extends VdsIdParametersBase { private static final long serialVersionUID = 7478078947370484916L; - private StorageType privateStorageType = StorageType.forValue(0); + private StorageType privateStorageType; public StorageType getStorageType() { return privateStorageType; @@ -17,7 +17,7 @@ privateStorageType = value; } - private StorageDomainType privateStorageDomainType = StorageDomainType.forValue(0); + private StorageDomainType privateStorageDomainType; public StorageDomainType getStorageDomainType() { return privateStorageDomainType; @@ -62,5 +62,6 @@ } public GetExistingStorageDomainListParameters() { + this(null, StorageType.UNKNOWN, StorageDomainType.Master, null); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListByStoragePoolIdParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListByStoragePoolIdParameters.java index 6f4a597..20a1c69 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListByStoragePoolIdParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListByStoragePoolIdParameters.java @@ -3,11 +3,11 @@ import org.ovirt.engine.core.common.businessentities.ImageFileType; import org.ovirt.engine.core.compat.Guid; - public class GetImagesListByStoragePoolIdParameters extends GetImagesListParametersBase { private static final long serialVersionUID = 6098440434536241071L; public GetImagesListByStoragePoolIdParameters() { + setStoragePoolId(Guid.Empty); } public GetImagesListByStoragePoolIdParameters(Guid storagePoolId) { @@ -19,7 +19,7 @@ setStoragePoolId(storagePoolId); } - private Guid storagePoolId = Guid.Empty; + private Guid storagePoolId; public Guid getStoragePoolId() { return storagePoolId; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParameters.java index 3ee5549..9d1545b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParameters.java @@ -3,11 +3,11 @@ import org.ovirt.engine.core.common.businessentities.ImageFileType; import org.ovirt.engine.core.compat.Guid; - public class GetImagesListParameters extends GetImagesListParametersBase { private static final long serialVersionUID = 6098440434536241071L; public GetImagesListParameters() { + this(Guid.Empty); } public GetImagesListParameters(Guid storageDomainId) { @@ -19,7 +19,7 @@ setStorageDomainId(storageDomainId); } - private Guid storageDomainId = Guid.Empty; + private Guid storageDomainId; public Guid getStorageDomainId() { return storageDomainId; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParametersBase.java index 962a2ba..40ca1dc 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImagesListParametersBase.java @@ -6,9 +6,10 @@ public abstract class GetImagesListParametersBase extends VdcQueryParametersBase { private static final long serialVersionUID = 2562476365144558247L; private boolean forceRefresh; - private ImageFileType imageType = ImageFileType.All; + private ImageFileType imageType; public GetImagesListParametersBase() { + this (ImageFileType.All); } public GetImagesListParametersBase(ImageFileType imageType) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetNewVdsFenceStatusParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetNewVdsFenceStatusParameters.java index e9450d0..bca7a67 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetNewVdsFenceStatusParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetNewVdsFenceStatusParameters.java @@ -22,7 +22,7 @@ _vds_id = value; } - private Guid _storagePoolId = Guid.Empty; + private Guid _storagePoolId; public Guid getStoragePoolId() { return _storagePoolId; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetPermissionsForObjectParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetPermissionsForObjectParameters.java index 64904d1..e03a90f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetPermissionsForObjectParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetPermissionsForObjectParameters.java @@ -12,14 +12,16 @@ * True to get only the direct permission of an object. False - get implicit permissions on an object example - * implicit VM permissions will return the VM, its Cluster, its Datacenter and System permissions. */ - private boolean directOnly = true; + private boolean directOnly; private VdcObjectType vdcObjectType; public GetPermissionsForObjectParameters() { + directOnly = true; } public GetPermissionsForObjectParameters(Guid objectId) { + this(); this.objectId = objectId; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmTemplateParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmTemplateParameters.java index 8fc0ab3..f669183 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmTemplateParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmTemplateParameters.java @@ -5,7 +5,7 @@ public class GetVmTemplateParameters extends VdcQueryParametersBase { private static final long serialVersionUID = 8906662143775124331L; - private Guid _id = Guid.Empty; + private Guid _id; private String _name; public GetVmTemplateParameters(Guid id) { @@ -13,6 +13,7 @@ } public GetVmTemplateParameters(String name) { + this(Guid.Empty); _name = name; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java index e601d18..bd28dd4 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java @@ -80,7 +80,7 @@ privateVdsGroupId = value; } - private VDSType privateVdsType = VDSType.forValue(0); + private VDSType privateVdsType; public VDSType getVdsType() { return privateVdsType; @@ -113,5 +113,6 @@ } public RegisterVdsParameters() { + privateVdsType = VDSType.VDS; } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SearchParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SearchParameters.java index adedbc7..ea2d680 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SearchParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SearchParameters.java @@ -8,22 +8,24 @@ private static final long serialVersionUID = 2275481072329075722L; private String _searchPattern; - private SearchType _searchType = SearchType.forValue(0); - private int _maxCount = -1; - private long searchFrom = 0; - private boolean caseSensitive = true; + private SearchType _searchType; + private int _maxCount; + private long searchFrom; + private boolean caseSensitive; public SearchParameters() { + this (null, SearchType.VM, true); } public SearchParameters(String searchPattern, SearchType searchType) { - _searchType = searchType; - _searchPattern = searchPattern; + this (searchPattern, searchType, true); } public SearchParameters(String searchPattern, SearchType searchType, boolean caseSensitive) { - this(searchPattern, searchType); + _searchType = searchType; + _searchPattern = searchPattern; this.caseSensitive = caseSensitive; + _maxCount = -1; } public String getSearchPattern() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainAndPoolQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainAndPoolQueryParameters.java index 35578da..665c552 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainAndPoolQueryParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainAndPoolQueryParameters.java @@ -5,7 +5,7 @@ public class StorageDomainAndPoolQueryParameters extends StorageDomainQueryParametersBase { private static final long serialVersionUID = -1397159559995940530L; - private Guid privateStoragePoolId = Guid.Empty; + private Guid privateStoragePoolId; public Guid getStoragePoolId() { return privateStoragePoolId; @@ -21,5 +21,6 @@ } public StorageDomainAndPoolQueryParameters() { + privateStoragePoolId = Guid.Empty; } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainQueryParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainQueryParametersBase.java index 67f4967..2f64b78 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainQueryParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/StorageDomainQueryParametersBase.java @@ -5,7 +5,7 @@ public abstract class StorageDomainQueryParametersBase extends VdcQueryParametersBase { private static final long serialVersionUID = -1267869804833489615L; - private Guid privateStorageDomainId = Guid.Empty; + private Guid privateStorageDomainId; public Guid getStorageDomainId() { return privateStorageDomainId; @@ -20,5 +20,6 @@ } public StorageDomainQueryParametersBase() { + this(Guid.Empty); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java index 0d6b88c..c16673d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java @@ -17,15 +17,16 @@ /** * The boolean flag which provides if the session should be refreshed */ - private boolean refresh = true; + private boolean refresh; /** * The boolean flag which specifies if the query should be filtered * (e.g., according to user permissions as opposed to the default, which is running as admin) */ - private boolean isFiltered = false; + private boolean isFiltered; public VdcQueryParametersBase() { + refresh = true; } public String getSessionId() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterHookContentQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterHookContentQueryParameters.java index e239720..8dcb975 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterHookContentQueryParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterHookContentQueryParameters.java @@ -15,7 +15,7 @@ @NotNull(message = "VALIDATION.GLUSTER.GLUSTER_HOOK_ID.NOT_NULL") private Guid glusterHookId; - private Guid glusterServerId = null; + private Guid glusterServerId; public GlusterHookContentQueryParameters() { } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterHookQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterHookQueryParameters.java index 023e4cb..70896a2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterHookQueryParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/gluster/GlusterHookQueryParameters.java @@ -9,7 +9,7 @@ private Guid hookId; - private boolean includeServerHooks = false; + private boolean includeServerHooks; public GlusterHookQueryParameters() { } -- To view, visit http://gerrit.ovirt.org/18135 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic89595cd4e26b7fca901d62ba57f4cfdf29c12b1 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
