Allon Mureinik has uploaded a new change for review. Change subject: engine: Remove Number constructors ......................................................................
engine: Remove Number constructors Since Numbers are immutable, there is no reason to unbox, autobox or force construction of new objects of those types - their value can, instead, be used directly. This patch fixes multiple FindBugs inspections around this issue. Change-Id: I334513e25abee1f9bfd71c575767c54cc96bc87c Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/QuotaDAOTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/AbstractRefreshManager.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java 6 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/18653/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java index 96e8478..bc3dc9e 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java @@ -123,8 +123,8 @@ status); GlusterServerService srvc3 = new GlusterServerService(); srvc3.setMessage("test-msg3"); - srvc3.setPid(new Integer("10000")); - srvc3.setPort(new Integer("20000")); + srvc3.setPid(10000); + srvc3.setPort(20000); srvc3.setServerId(serverId); srvc3.setServiceId(Guid.newGuid()); srvc3.setServiceName("srvc3"); @@ -157,8 +157,8 @@ GlusterServerService srvc1 = new GlusterServerService(); srvc1.setMessage("test-msg1"); - srvc1.setPid(new Integer("10000")); - srvc1.setPort(new Integer("20000")); + srvc1.setPid(10000); + srvc1.setPort(20000); srvc1.setServerId(serverId); srvc1.setServiceId((status == GlusterServiceStatus.RUNNING) ? startedServiceId1 : stoppedServiceId1); srvc1.setServiceName("srvc1"); @@ -168,8 +168,8 @@ GlusterServerService srvc2 = new GlusterServerService(); srvc2.setMessage("test-msg2"); - srvc2.setPid(new Integer("30000")); - srvc2.setPort(new Integer("40000")); + srvc2.setPid(30000); + srvc2.setPort(40000); srvc2.setServerId(serverId); srvc2.setServiceId((status == GlusterServiceStatus.RUNNING) ? startedServiceId2 : stoppedServiceId2); srvc2.setServiceName("srvc2"); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/QuotaDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/QuotaDAOTest.java index 6743d03..f895ee0 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/QuotaDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/QuotaDAOTest.java @@ -233,12 +233,12 @@ for (QuotaVdsGroup quotaVdsGroup : quotaVdsGroupList) { if (quotaVdsGroup.getQuotaVdsGroupId() .equals(new Guid("68c96e11-0aad-4e3a-9091-12897b7f2388"))) { - assertEquals(quotaVdsGroup.getVirtualCpu(), new Integer("10")); + assertEquals(quotaVdsGroup.getVirtualCpu(), Integer.valueOf(10)); assertEquals(quotaVdsGroup.getMemSizeMB(), unlimited); } else if (quotaVdsGroup.getQuotaVdsGroupId() .equals(new Guid("68c96e11-0aad-4e3a-9091-12897b7f2389"))) { - assertEquals(quotaVdsGroup.getVirtualCpu(), new Integer("1000")); + assertEquals(quotaVdsGroup.getVirtualCpu(), Integer.valueOf(1000)); assertEquals(quotaVdsGroup.getMemSizeMB(), unlimited); } } @@ -355,7 +355,7 @@ String quotaName = "New Temporary name"; List<QuotaVdsGroup> quotaVdsGroupList = getQuotaVdsGroup(getSpecificQuotaVdsGroup(quotaGeneralToSpecific.getId())); - Long newStorageLimit = new Long("2345"); + Long newStorageLimit = 2345L; // Check before the update, that the fields are not equal. assertEquals(quotaName.equals(quotaGeneralToSpecific.getQuotaName()), false); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java index f88a324..a19b686 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RepoFileMetaDataDAOTest.java @@ -171,7 +171,7 @@ .getRepoListForStorageDomain(FixturesTool.SHARED_ISO_STORAGE_DOAMIN_FOR_SP2_AND_SP3, ImageFileType.Floppy); - long minLastRefreshed = new Long("9999999999999").longValue(); + long minLastRefreshed = 9999999999999L; for (RepoImage fileMD : listOfFloppyFiles) { long fileLastRefreshed = fileMD.getLastRefreshed(); if (fileLastRefreshed < minLastRefreshed) { diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java index 4d2fc88..8019f79 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java @@ -42,8 +42,8 @@ @Override protected org.ovirt.engine.core.common.businessentities.VM getInverse(VmStatic to) { VmStatistics statistics = new VmStatistics(); - statistics.setcpu_user(new Double(10L)); - statistics.setcpu_sys(new Double(20L)); + statistics.setcpu_user(10.0); + statistics.setcpu_sys(20.0); VmDynamic dynamic = new VmDynamic(); dynamic.setStatus(VMStatus.Up); dynamic.setBootSequence(to.getDefaultBootSequence()); @@ -52,7 +52,7 @@ new org.ovirt.engine.core.common.businessentities.VM(to, dynamic, statistics); - ret.setUsageMemPercent(Integer.valueOf(50)); + ret.setUsageMemPercent(50); return ret; } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/AbstractRefreshManager.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/AbstractRefreshManager.java index 1594b9c..cf264ee 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/AbstractRefreshManager.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/AbstractRefreshManager.java @@ -174,7 +174,7 @@ String refreshRate = clientStorage.getLocalItem(getRefreshRateItemKey()); try { - return new Integer(refreshRate).intValue(); + return Integer.parseInt(refreshRate); } catch (NumberFormatException e) { return getDefaultRefreshRate(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java index f053b6c..a7ee7dc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java @@ -542,7 +542,7 @@ if (clusterPolicy.getFilterPositionMap() != null) { obj.setFilterPositionMap(new HashMap<Guid, Integer>()); for (Entry<Guid, Integer> entry : clusterPolicy.getFilterPositionMap().entrySet()) { - obj.getFilterPositionMap().put(entry.getKey(), new Integer(entry.getValue())); + obj.getFilterPositionMap().put(entry.getKey(), entry.getValue()); } } if (clusterPolicy.getFunctions() != null) { -- To view, visit http://gerrit.ovirt.org/18653 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I334513e25abee1f9bfd71c575767c54cc96bc87c 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
