Skip to content

CLOUDSTACK-10359: Change the inconsistent method names. #2591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 2 commits into from
Apr 23, 2018
Merged

CLOUDSTACK-10359: Change the inconsistent method names. #2591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e97128e
CLOUDSTACK-10359: Change the inconsistent method names.
Kui-Liu Apr 22, 2018
02f51cb
Add the missing changes of all usages of method getIsSystem.
Kui-Liu Apr 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public String getHostTag() {
return hostTag;
}

public Boolean getIsSystem() {
public Boolean isSystem() {
Copy link
Contributor

@nitin-maharana nitin-maharana Apr 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will give the compilation error, as the changes in all usages are missing.

Copy link
Contributor Author

@Kui-Liu Kui-Liu Apr 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, how about now?

return isSystem == null ? false : isSystem;
}

Expand All @@ -210,7 +210,7 @@ public String getDeploymentPlanner() {
return deploymentPlanner;
}

public boolean getCustomized() {
public boolean isCustomized() {
return (cpuNumber == null || memory == null || cpuSpeed == null);
}

Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down