simplify code

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java

@@ -26,16 +26,17 @@
 
 import javax.inject.Inject;
 
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
 import org.apache.cloudstack.api.ApiConstants.HostDetails;
 import org.apache.cloudstack.api.response.GpuResponse;
 import org.apache.cloudstack.api.response.HostForMigrationResponse;
 import org.apache.cloudstack.api.response.HostResponse;
 import org.apache.cloudstack.api.response.VgpuResponse;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.ha.HAResource;
+import org.apache.cloudstack.ha.dao.HAConfigDao;
 import org.apache.cloudstack.outofbandmanagement.dao.OutOfBandManagementDao;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
 
 import com.cloud.api.ApiDBUtils;
 import com.cloud.api.query.vo.HostJoinVO;
@@ -52,9 +53,6 @@
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 
-import org.apache.cloudstack.ha.HAResource;
-import org.apache.cloudstack.ha.dao.HAConfigDao;
-
 @Component
 public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements HostJoinDao {
     public static final Logger s_logger = Logger.getLogger(HostJoinDaoImpl.class);
@@ -184,12 +182,11 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet<HostDetails> detail
 
                 hostResponse.setHypervisorVersion(host.getHypervisorVersion());
 
-                Float cpuWithOverprovisioning = host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId());
+                final float clusterCpuOvercommitRatio = NumbersUtil.parseFloat(_clusterDetailsDao.findDetail(host.getClusterId(), "cpuOvercommitRatio").getValue(), ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId()));
+                Float cpuWithOverprovisioning = host.getCpus() * host.getSpeed() * clusterCpuOvercommitRatio;
                 String cpuAlloc = decimalFormat.format(((float)cpu / cpuWithOverprovisioning * 100f)) + "%";
                 hostResponse.setCpuAllocated(cpuAlloc);
-                final float clusterCpuOvercommitRatio = NumbersUtil.parseFloat(_clusterDetailsDao.findDetail(host.getClusterId(), "cpuOvercommitRatio").getValue(), ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId()));
-                String cpuWithOverprovisioningStr = Float.toString(host.getCpus() * host.getSpeed() * clusterCpuOvercommitRatio);
-                hostResponse.setCpuWithOverprovisioning(cpuWithOverprovisioningStr);
+                hostResponse.setCpuWithOverprovisioning(Float.toString(host.getCpus() * host.getSpeed() * clusterCpuOvercommitRatio));
             }
 
             if (details.contains(HostDetails.all) || details.contains(HostDetails.stats)) {
@@ -335,12 +332,11 @@ public HostForMigrationResponse newHostForMigrationResponse(HostJoinVO host, Enu
 
                 hostResponse.setHypervisorVersion(host.getHypervisorVersion());
 
-                Float cpuWithOverprovisioning = new Float(host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId()));
-                String cpuAlloc = decimalFormat.format(((float)cpu / cpuWithOverprovisioning * 100f)).toString() + "%";
-                hostResponse.setCpuAllocated(cpuAlloc);
                 final float clusterCpuOvercommitRatio = NumbersUtil.parseFloat(_clusterDetailsDao.findDetail(host.getClusterId(), "cpuOvercommitRatio").getValue(), ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId()));
-                String cpuWithOverprovisioningStr = Float.toString(host.getCpus() * host.getSpeed() * clusterCpuOvercommitRatio);
-                hostResponse.setCpuWithOverprovisioning(cpuWithOverprovisioningStr);
+                Float cpuWithOverprovisioning = host.getCpus() * host.getSpeed() * clusterCpuOvercommitRatio;
+                String cpuAlloc = decimalFormat.format(((float)cpu / cpuWithOverprovisioning * 100f)) + "%";
+                hostResponse.setCpuAllocated(cpuAlloc);
+                hostResponse.setCpuWithOverprovisioning(Float.toString(host.getCpus() * host.getSpeed() * clusterCpuOvercommitRatio));
             }
 
             if (details.contains(HostDetails.all) || details.contains(HostDetails.stats)) {