-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Fix grammar, spelling, word casing, whitespace #9132
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
b28eccb
3574cdc
fba6bf5
287b40f
79a8b92
8ac51b7
0c81a31
177d355
f104bd5
403b87d
e9b5c9d
02d59c0
1dba0f8
6d95003
cfcc791
c7fb37f
eea90fc
a4368eb
3e90ab6
c76a7f4
b1f1816
c7b4698
25603ee
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -91,7 +91,7 @@ public Long getApiResourceId() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| VirtualMachine instance = _mgr.destroySystemVM(this); | ||||||
| if (instance != null) { | ||||||
| SystemVmResponse response = _responseGenerator.createSystemVmResponse(instance); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -105,7 +105,7 @@ public boolean isForced() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| VirtualMachine result = _mgr.rebootSystemVM(this); | ||||||
| if (result != null) { | ||||||
| SystemVmResponse response = _responseGenerator.createSystemVmResponse(result); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -98,7 +98,7 @@ public long getEntityOwnerId() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() { | ||||||
| CallContext.current().setEventDetails("SystemVm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("SystemVM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
|
||||||
| ServiceOffering serviceOffering = _entityMgr.findById(ServiceOffering.class, serviceOfferingId); | ||||||
| if (serviceOffering == null) { | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -102,7 +102,7 @@ public Long getApiResourceId() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| VirtualMachine instance = _mgr.startSystemVM(getId()); | ||||||
| if (instance != null) { | ||||||
| SystemVmResponse response = _responseGenerator.createSystemVmResponse(instance); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -108,7 +108,7 @@ public boolean isForced() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() throws ResourceUnavailableException, ConcurrentOperationException { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| VirtualMachine result = _mgr.stopSystemVM(this); | ||||||
| if (result != null) { | ||||||
| SystemVmResponse response = _responseGenerator.createSystemVmResponse(result); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -87,7 +87,7 @@ public long getEntityOwnerId() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
|
||||||
| ServiceOffering serviceOffering = _entityMgr.findById(ServiceOffering.class, serviceOfferingId); | ||||||
| if (serviceOffering == null) { | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -96,7 +96,7 @@ public Long getApiResourceId() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() throws ResourceUnavailableException, ConcurrentOperationException { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| try { | ||||||
| UserVm result = _userVmService.expungeVm(this.getId()); | ||||||
|
|
||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -114,7 +114,7 @@ public ApiCommandResourceType getApiResourceType() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + getVirtualMachineId() + " ISO ID: " + getId()); | ||||||
| CallContext.current().setEventDetails("VM Id: " + getVirtualMachineId() + " ISO ID: " + getId()); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| boolean result = _templateService.attachIso(id, virtualMachineId, isForced()); | ||||||
| if (result) { | ||||||
| UserVm userVm = _responseGenerator.findUserVmById(virtualMachineId); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -167,7 +167,7 @@ public ApiCommandResourceType getApiResourceType() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Network Id: " + this._uuidMgr.getUuid(Network.class, getNetworkId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Network Id: " + this._uuidMgr.getUuid(Network.class, getNetworkId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| UserVm result = _userVmService.addNicToVirtualMachine(this); | ||||||
| ArrayList<VMDetails> dc = new ArrayList<VMDetails>(); | ||||||
| dc.add(VMDetails.valueOf("nics")); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -91,7 +91,7 @@ public boolean isVolumeOrSnapshotProvided() { | |||||
| public void execute() { | ||||||
| UserVm result; | ||||||
|
|
||||||
| CallContext.current().setEventDetails("Vm Id: " + getEntityUuid()); | ||||||
| CallContext.current().setEventDetails("VM Id: " + getEntityUuid()); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| if (getStartVm()) { | ||||||
| try { | ||||||
| result = _userVmService.startVirtualMachine(this); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -131,7 +131,7 @@ public Long getApiResourceId() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() throws ResourceUnavailableException, ConcurrentOperationException { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| UserVm result = _userVmService.destroyVm(this); | ||||||
|
|
||||||
| UserVmResponse response = new UserVmResponse(); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -115,7 +115,7 @@ public Long getApiResourceId() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| UserVm result; | ||||||
| result = _userVmService.rebootVirtualMachine(this); | ||||||
| if (result !=null){ | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -103,7 +103,7 @@ public long getEntityOwnerId() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Nic Id: " + this._uuidMgr.getUuid(Nic.class, getNicId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Nic Id: " + this._uuidMgr.getUuid(Nic.class, getNicId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| UserVm result = _userVmService.removeNicFromVirtualMachine(this); | ||||||
| ArrayList<VMDetails> dc = new ArrayList<VMDetails>(); | ||||||
| dc.add(VMDetails.valueOf("nics")); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -124,7 +124,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE | |||||
| } else { | ||||||
| logger.debug(String.format("Resetting VM [%s] password to password defined by user.", vm.getUuid())); | ||||||
| } | ||||||
| CallContext.current().setEventDetails("Vm Id: " + getId()); | ||||||
| CallContext.current().setEventDetails("VM Id: " + getId()); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| UserVm result = _userVmService.resetVMPassword(this, password); | ||||||
| if (result != null){ | ||||||
| UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -152,7 +152,7 @@ public Long getApiResourceId() { | |||||
| @Override | ||||||
| public void execute() throws ResourceUnavailableException, InsufficientCapacityException { | ||||||
|
|
||||||
| CallContext.current().setEventDetails("Vm Id: " + getId()); | ||||||
| CallContext.current().setEventDetails("VM Id: " + getId()); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| UserVm result = _userVmService.resetVMSSHKey(this); | ||||||
|
|
||||||
| if (result != null) { | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -143,7 +143,7 @@ public Long getApiResourceId() { | |||||
| @Override | ||||||
| public void execute() throws ResourceUnavailableException, InsufficientCapacityException { | ||||||
|
|
||||||
| CallContext.current().setEventDetails("Vm Id: " + getId()); | ||||||
| CallContext.current().setEventDetails("VM Id: " + getId()); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| UserVm result = _userVmService.resetVMUserData(this); | ||||||
|
|
||||||
| if (result != null) { | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -97,7 +97,7 @@ public String getEventDescription() { | |||||
| public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, | ||||||
| ResourceAllocationException { | ||||||
| UserVm result; | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| result = _userVmService.restoreVM(this); | ||||||
| if (result != null) { | ||||||
| UserVmResponse response = _responseGenerator.createUserVmResponse(getResponseView(), "virtualmachine", result).get(0); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -177,7 +177,7 @@ public Long getApiResourceId() { | |||||
| @Override | ||||||
| public void execute() { | ||||||
| try { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
|
||||||
| UserVm result; | ||||||
| result = _userVmService.startVirtualMachine(this); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -115,7 +115,7 @@ public boolean isForced() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() throws ServerApiException, ConcurrentOperationException { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| UserVm result; | ||||||
|
|
||||||
| result = _userVmService.stopVirtualMachine(getId(), isForced()); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -104,7 +104,7 @@ public long getEntityOwnerId() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Nic Id: " + this._uuidMgr.getUuid(Nic.class, getNicId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getVmId()) + " Nic Id: " + this._uuidMgr.getUuid(Nic.class, getNicId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| UserVm result = _userVmService.updateDefaultNicForVirtualMachine(this); | ||||||
| ArrayList<VMDetails> dc = new ArrayList<VMDetails>(); | ||||||
| dc.add(VMDetails.valueOf("nics")); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -300,7 +300,7 @@ public long getEntityOwnerId() { | |||||
|
|
||||||
| @Override | ||||||
| public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException { | ||||||
| CallContext.current().setEventDetails("Vm Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
| CallContext.current().setEventDetails("VM Id: " + this._uuidMgr.getUuid(VirtualMachine.class, getId())); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| UserVm result = null; | ||||||
| try { | ||||||
| result = _userVmService.updateVirtualMachine(this); | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -134,7 +134,7 @@ private ServiceVirtualMachine createServiceVM(DataCenter zone, Account owner, Vi | |||||
| } catch (InsufficientCapacityException ex) { | ||||||
| throw new CloudRuntimeException("Insufficient capacity", ex); | ||||||
| } | ||||||
| CallContext.current().setEventDetails("Vm Id: " + svm.getId()); | ||||||
| CallContext.current().setEventDetails("VM ID: " + svm.getId()); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @FelipeM525 , 'ID' is an acronym for 'identification' according to english rules it should be capatalised. Am I correct @jbampton ?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I agree with capitalizing both letters, but, regardless of what convention we use (both capitalized or not), there should be a convention. Currently, this PR, that has a focus on fixing word casing inconsistencies, is doing the opposite, by changing some instances of
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. well, agree to disagree. I am happy to conform to conventions, but these are completely unnecessary and gratuit. I am leaving this with the embedded English speaker(s) ;) |
||||||
| return svm; | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.