From e97128ec6097aec0530e8e4585fa01666ccba3aa Mon Sep 17 00:00:00 2001 From: Kui LIU Date: Sun, 22 Apr 2018 12:31:42 +0200 Subject: [PATCH 1/2] CLOUDSTACK-10359: Change the inconsistent method names. The two methods are named "getXXX". The two method are checking the status of variables. "getCustomized" is not as intuitive as "isCustomized". "getIsSystem" is not as intuitive as "isSystem" as well. --- .../api/command/admin/offering/CreateServiceOfferingCmd.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java index 0bde79bbd7b0..41e5fc9021da 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java @@ -194,7 +194,7 @@ public String getHostTag() { return hostTag; } - public Boolean getIsSystem() { + public Boolean isSystem() { return isSystem == null ? false : isSystem; } @@ -210,7 +210,7 @@ public String getDeploymentPlanner() { return deploymentPlanner; } - public boolean getCustomized() { + public boolean isCustomized() { return (cpuNumber == null || memory == null || cpuSpeed == null); } From 02f51cb0c51f423ec1ec5be1a543fa68a02a5bd7 Mon Sep 17 00:00:00 2001 From: Kui LIU Date: Sun, 22 Apr 2018 19:36:37 +0200 Subject: [PATCH 2/2] Add the missing changes of all usages of method getIsSystem. --- .../com/cloud/configuration/ConfigurationManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index 80642f513759..7f41d43e0692 100755 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2279,7 +2279,7 @@ public ServiceOffering createServiceOffering(final CreateServiceOfferingCmd cmd) Boolean isCustomizedIops; - if (cmd.getIsSystem()) { + if (cmd.isSystem()) { if (vmTypeString == null || VirtualMachine.Type.DomainRouter.toString().toLowerCase().equals(vmTypeString)) { vmType = VirtualMachine.Type.DomainRouter; allowNetworkRate = true; @@ -2328,7 +2328,7 @@ public ServiceOffering createServiceOffering(final CreateServiceOfferingCmd cmd) } } - return createServiceOffering(userId, cmd.getIsSystem(), vmType, cmd.getServiceOfferingName(), cpuNumber, memory, cpuSpeed, cmd.getDisplayText(), + return createServiceOffering(userId, cmd.isSystem(), vmType, cmd.getServiceOfferingName(), cpuNumber, memory, cpuSpeed, cmd.getDisplayText(), cmd.getProvisioningType(), localStorageRequired, offerHA, limitCpuUse, volatileVm, cmd.getTags(), cmd.getDomainId(), cmd.getHostTag(), cmd.getNetworkRate(), cmd.getDeploymentPlanner(), cmd.getDetails(), isCustomizedIops, cmd.getMinIops(), cmd.getMaxIops(), cmd.getBytesReadRate(), cmd.getBytesWriteRate(), cmd.getIopsReadRate(), cmd.getIopsWriteRate(), cmd.getHypervisorSnapshotReserve());