Shahar Havivi has uploaded a new change for review. Change subject: findbugs: fixing boxing-unboxing issues ......................................................................
findbugs: fixing boxing-unboxing issues Change-Id: Ibcec12523c2d09b15c2322e3b82ee47e27d03836 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VmStatisticalQuery.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java 11 files changed, 15 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/13974/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java index 904cc43..73d4130 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultipleActionsRunner.java @@ -177,7 +177,7 @@ ExecutionHandler.prepareCommandForMonitoring(command, command.getActionType(), command.isInternalExecution(), - new Boolean(hasCorrelationIdMap.get(command.getCommandId()))); + hasCorrelationIdMap.get(command.getCommandId())); } ThreadLocalParamsContainer.setCorrelationId(command.getCorrelationId()); command.executeAction(); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java index ee32bcc..e7fd87a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java @@ -201,7 +201,7 @@ } public void setTotalDiskSize(Integer value) { - value = (value == null) ? 0 : value; + value = (value == null) ? new Integer(0) : value; if (!totalDiskSize.equals(value)) { totalDiskSize = value; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java index 0d84a40..acef3e1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java @@ -1182,7 +1182,7 @@ setCpuSys(vmStatistics.getcpu_sys()); setCpuUser(vmStatistics.getcpu_user()); if ((getCpuSys() != null) && (getCpuUser() != null)) { - Double percent = (getCpuSys() + getCpuUser()) / new Double(vm.getNumOfCpus()); + Double percent = (getCpuSys() + getCpuUser()) / vm.getNumOfCpus(); setUsageCpuPercent(percent.intValue()); if (getUsageCpuPercent() != null && getUsageCpuPercent() > 100) { setUsageCpuPercent(100); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java index dc91ce3..3027405 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java @@ -94,7 +94,7 @@ .addValue("volume_id", brick.getVolumeId()) .addValue("server_id", brick.getServerId()) .addValue("brick_dir", brick.getBrickDirectory()) - .addValue("brick_order", (brick.getBrickOrder() == null) ? 0 : brick.getBrickOrder()) + .addValue("brick_order", (brick.getBrickOrder() == null) ? new Integer(0) : brick.getBrickOrder()) .addValue("status", EnumUtils.nameOrNull(brick.getStatus())); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VmStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VmStatisticalQuery.java index a3a45c8..b9da037 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VmStatisticalQuery.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VmStatisticalQuery.java @@ -28,8 +28,9 @@ VmStatistics s = entity.getStatisticsData(); long mem = entity.getMemSizeMb() * Mb; long memUsedByCent = s.getusage_mem_percent()==null ? 0 : mem * s.getusage_mem_percent(); - Double cpuUser = s.getcpu_user()==null ? 0 : s.getcpu_user(); - Double cpuSys = s.getcpu_sys()==null ? 0 : s.getcpu_sys(); + Double zero = 0.0; + Double cpuUser = s.getcpu_user()==null ? zero : s.getcpu_user(); + Double cpuSys = s.getcpu_sys()==null ? zero : s.getcpu_sys(); return asList(setDatum(clone(MEM_CONFIG), mem), setDatum(clone(MEM_USED), (int)(memUsedByCent/100)), setDatum(clone(CPU_GUEST), cpuUser), diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java index ecf6f4c..aa5dd4c 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java @@ -441,7 +441,7 @@ if (value != null) { ParamData paramData = (ParamData) value; header.setValue(paramData.getValue()); - header.setRequired(paramData.getRequired() == null ? false : paramData.getRequired()); + header.setRequired(paramData.getRequired() == null ? new Boolean(false) : paramData.getRequired()); } link.getRequest().getHeaders().getHeaders().add(header); @@ -462,7 +462,7 @@ param.setType(urlParamData.getType()); param.setContext(urlParamData.getContext()); param.setValue(urlParamData.getValue()); - param.setRequired(urlParamData.getRequired()==null ? false : urlParamData.getRequired()); + param.setRequired(urlParamData.getRequired()==null ? new Boolean(false) : urlParamData.getRequired()); } ps.getParameters().add(param); } diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java index dce4257..73983b9 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java @@ -406,7 +406,7 @@ model.setDomain(domain); } MemoryPolicy policy = new MemoryPolicy(); - policy.setGuaranteed(new Long(entity.getMinAllocatedMem()) * BYTES_PER_MB); + policy.setGuaranteed(new Long(entity.getMinAllocatedMem() * BYTES_PER_MB)); model.setMemoryPolicy(policy); model.setTimezone(TimeZoneMapping.getJava(entity.getTimeZone())); if (!StringUtils.isEmpty(entity.getCustomProperties())) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index 48dd32e..5c555ee 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -1805,7 +1805,8 @@ } } - vm.setUsageNetworkPercent((vm.getUsageNetworkPercent() > 100) ? 100 : vm.getUsageNetworkPercent()); + Integer maxPercent = 100; + vm.setUsageNetworkPercent((vm.getUsageNetworkPercent() > maxPercent) ? maxPercent : vm.getUsageNetworkPercent()); addVmInterfaceStatisticsToList(vm.getInterfaces()); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java index df7356b..067535e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java @@ -682,7 +682,7 @@ */ private static Double assignDoubleValueWithNullProtection(XmlRpcStruct input, String name) { Double doubleValue = AssignDoubleValue(input, name); - return (doubleValue == null ? 0.0 : doubleValue); + return (doubleValue == null ? new Double(0.0) : doubleValue); } private static Integer AssignIntValue(XmlRpcStruct input, String name) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index cb836ed..d7ee67e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -774,7 +774,7 @@ { return 100; } - return ((Integer) source).intValue(); + return source; } }; GetConfigFromCache( diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java index 19b0e99..a047c4c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java @@ -28,7 +28,7 @@ getDescription().setEntity(getNetwork().getDescription()); getIsStpEnabled().setEntity(getNetwork().getStp()); getHasVLanTag().setEntity(getNetwork().getVlanId() != null); - getVLanTag().setEntity((getNetwork().getVlanId() == null ? 0 : getNetwork().getVlanId())); + getVLanTag().setEntity((getNetwork().getVlanId() == null ? new Integer(0) : getNetwork().getVlanId())); initMtu(); initIsVm(); } -- To view, visit http://gerrit.ovirt.org/13974 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibcec12523c2d09b15c2322e3b82ee47e27d03836 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
