apply change method name

Author: GaOrtiga

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -1237,9 +1237,9 @@ public UserVm upgradeVirtualMachine(UpgradeVMCmd cmd) throws ResourceAllocationE
     protected void updateInstanceDetails (Map<String, String> details, VirtualMachine vmInstance, Long newServiceOfferingId) {
         ServiceOfferingVO currentServiceOffering = serviceOfferingDao.findByIdIncludingRemoved(vmInstance.getId(), vmInstance.getServiceOfferingId());
         ServiceOfferingVO newServiceOffering = serviceOfferingDao.findById(newServiceOfferingId);
-        updateInstanceDetailsWithCurrentValue(newServiceOffering.getSpeed(), details, VmDetailConstants.CPU_SPEED, currentServiceOffering.getSpeed());
-        updateInstanceDetailsWithCurrentValue(newServiceOffering.getRamSize(), details, VmDetailConstants.MEMORY, currentServiceOffering.getRamSize());
-        updateInstanceDetailsWithCurrentValue(newServiceOffering.getCpu(), details, VmDetailConstants.CPU_NUMBER, currentServiceOffering.getCpu());
+        updateInstanceDetailsKeepCurrentValueIfNull(newServiceOffering.getSpeed(), details, VmDetailConstants.CPU_SPEED, currentServiceOffering.getSpeed());
+        updateInstanceDetailsKeepCurrentValueIfNull(newServiceOffering.getRamSize(), details, VmDetailConstants.MEMORY, currentServiceOffering.getRamSize());
+        updateInstanceDetailsKeepCurrentValueIfNull(newServiceOffering.getCpu(), details, VmDetailConstants.CPU_NUMBER, currentServiceOffering.getCpu());
     }
 
     /**
@@ -1251,7 +1251,7 @@ protected void updateInstanceDetails (Map<String, String> details, VirtualMachin
      * @param currentValue     the current value of the detail constant
      */
 
-    protected void updateInstanceDetailsWithCurrentValue(Integer newValue, Map<String, String> details, String detailsConstant, Integer currentValue) {
+    protected void updateInstanceDetailsKeepCurrentValueIfNull(Integer newValue, Map<String, String> details, String detailsConstant, Integer currentValue) {
         if (newValue == null && details.get(detailsConstant) == null) {
             String currentValueString = String.valueOf(currentValue);
             s_logger.debug(String.format("[%s] was not specified, keeping the current value: [%s].", detailsConstant, currentValueString));

server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java

@@ -1406,11 +1406,11 @@ public void testRestoreVirtualMachineWithVMSnapshots() throws ResourceUnavailabl
     }
 
     @Test
-    public void updateInstanceDetailsWithCurrentValueTestDetailsConstantIsNotNullDoNothing() {
+    public void updateInstanceDetailsKeepCurrentValueIfNullTestDetailsConstantIsNotNullDoNothing() {
         int currentValue = 123;
 
         for (String detailsConstant : detailsConstants) {
-            userVmManagerImpl.updateInstanceDetailsWithCurrentValue(null, customParameters, detailsConstant, currentValue);
+            userVmManagerImpl.updateInstanceDetailsKeepCurrentValueIfNull(null, customParameters, detailsConstant, currentValue);
         }
 
         Assert.assertEquals(customParameters.get(VmDetailConstants.MEMORY), "2048");
@@ -1419,12 +1419,12 @@ public void updateInstanceDetailsWithCurrentValueTestDetailsConstantIsNotNullDoN
     }
 
     @Test
-    public void updateInstanceDetailsWithCurrentValueTestNewValueIsNotNullDoNothing() {
+    public void updateInstanceDetailsKeepCurrentValueIfNullTestNewValueIsNotNullDoNothing() {
         Map<String, String> details = new HashMap<>();
         int currentValue = 123;
 
         for (String detailsConstant : detailsConstants) {
-            userVmManagerImpl.updateInstanceDetailsWithCurrentValue(321, details, detailsConstant, currentValue);
+            userVmManagerImpl.updateInstanceDetailsKeepCurrentValueIfNull(321, details, detailsConstant, currentValue);
         }
 
         Assert.assertNull(details.get(VmDetailConstants.MEMORY));
@@ -1433,12 +1433,12 @@ public void updateInstanceDetailsWithCurrentValueTestNewValueIsNotNullDoNothing(
     }
 
     @Test
-    public void updateInstanceDetailsWithCurrentValueTestBothValuesAreNullKeepCurrentValue() {
+    public void updateInstanceDetailsKeepCurrentValueIfNullTestBothValuesAreNullKeepCurrentValue() {
         Map<String, String> details = new HashMap<>();
         int currentValue = 123;
 
         for (String detailsConstant : detailsConstants) {
-            userVmManagerImpl.updateInstanceDetailsWithCurrentValue(null, details, detailsConstant, currentValue);
+            userVmManagerImpl.updateInstanceDetailsKeepCurrentValueIfNull(null, details, detailsConstant, currentValue);
         }
 
         Assert.assertEquals(details.get(VmDetailConstants.MEMORY), String.valueOf(currentValue));
@@ -1447,11 +1447,11 @@ public void updateInstanceDetailsWithCurrentValueTestBothValuesAreNullKeepCurren
     }
 
     @Test
-    public void updateInstanceDetailsWithCurrentValueTestNeitherValueIsNullDoNothing() {
+    public void updateInstanceDetailsKeepCurrentValueIfNullTestNeitherValueIsNullDoNothing() {
         int currentValue = 123;
 
         for (String detailsConstant : detailsConstants) {
-            userVmManagerImpl.updateInstanceDetailsWithCurrentValue(321, customParameters, detailsConstant, currentValue);
+            userVmManagerImpl.updateInstanceDetailsKeepCurrentValueIfNull(321, customParameters, detailsConstant, currentValue);
         }
 
         Assert.assertEquals(customParameters.get(VmDetailConstants.MEMORY), "2048");
@@ -1467,8 +1467,8 @@ public void updateInstanceDetailsTestAllConstantsAreUpdated() {
         Mockito.doReturn(serviceOffering).when(_serviceOfferingDao).findByIdIncludingRemoved(Mockito.anyLong(), Mockito.anyLong());
         userVmManagerImpl.updateInstanceDetails(null, vmInstanceMock, 0l);
 
-        Mockito.verify(userVmManagerImpl).updateInstanceDetailsWithCurrentValue(Mockito.any(), Mockito.any(), Mockito.eq(VmDetailConstants.CPU_SPEED), Mockito.any());
-        Mockito.verify(userVmManagerImpl).updateInstanceDetailsWithCurrentValue(Mockito.any(), Mockito.any(), Mockito.eq(VmDetailConstants.MEMORY), Mockito.any());
-        Mockito.verify(userVmManagerImpl).updateInstanceDetailsWithCurrentValue(Mockito.any(), Mockito.any(), Mockito.eq(VmDetailConstants.CPU_NUMBER), Mockito.any());
+        Mockito.verify(userVmManagerImpl).updateInstanceDetailsKeepCurrentValueIfNull(Mockito.any(), Mockito.any(), Mockito.eq(VmDetailConstants.CPU_SPEED), Mockito.any());
+        Mockito.verify(userVmManagerImpl).updateInstanceDetailsKeepCurrentValueIfNull(Mockito.any(), Mockito.any(), Mockito.eq(VmDetailConstants.MEMORY), Mockito.any());
+        Mockito.verify(userVmManagerImpl).updateInstanceDetailsKeepCurrentValueIfNull(Mockito.any(), Mockito.any(), Mockito.eq(VmDetailConstants.CPU_NUMBER), Mockito.any());
     }
 }