Arik Hadas has uploaded a new change for review.
Change subject: core: cleanup in RunVmParams
......................................................................
core: cleanup in RunVmParams
1. Rename methods & fields that had '_' in the middle of their name
to the standard convention in Java
2. Remove the '_' prefix from several class fields
3. Set the class fields from within the constructor with their setter
methods, just to be consistent (some were set directly and some by
their setter methods before)
Change-Id: Iebc0d1a33b991e444f0639978bb08ccd5eade350
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RunVmParams.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
4 files changed, 52 insertions(+), 52 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/22222/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
index 9b90d13..daf82be 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
@@ -53,9 +53,9 @@
protected void initVm() {
super.initVm();
- getVm().setInitrdUrl(getParameters().getinitrd_url());
- getVm().setKernelUrl(getParameters().getkernel_url());
- getVm().setKernelParams(getParameters().getkernel_params());
+ getVm().setInitrdUrl(getParameters().getInitrdUrl());
+ getVm().setKernelUrl(getParameters().getKernelUrl());
+ getVm().setKernelParams(getParameters().getKernelParams());
getVm().setCustomProperties(getParameters().getCustomProperties());
if (getParameters().getBootSequence() != null) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RunVmParams.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RunVmParams.java
index 047b6b6..2dc26fc 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RunVmParams.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RunVmParams.java
@@ -10,12 +10,12 @@
private static final long serialVersionUID = 3311307677963231320L;
private BootSequence _bootSequence;
- private String _diskPath;
- private boolean _kvmEnable;
- private Boolean _runAndPause;
- private Boolean _useVnc;
- private boolean _acpiEnable;
- private Boolean _win2kHackEnable;
+ private String diskPath;
+ private boolean kvmEnable;
+ private Boolean runAndPause;
+ private Boolean useVnc;
+ private boolean acpiEnable;
+ private Boolean win2kHackEnable;
private String customProperties;
private String privateFloppyPath;
private String privateClientIp;
@@ -23,9 +23,9 @@
private Guid _destinationVdsId;
private InitializationType privateInitializationType;
private Boolean privateRunAsStateless;
- private String initrd_url;
- private String kernel_url;
- private String kernel_params;
+ private String initrdUrl;
+ private String kernelUrl;
+ private String kernelParams;
private VmPayload payload;
private boolean balloonEnabled;
private int cpuShares;
@@ -37,22 +37,22 @@
Boolean runAndPause, Boolean useVnc, boolean acpiEnable, boolean
win2kHackEnable,
String clientIp, boolean runAsStateless) {
super(vmId);
- _bootSequence = bootSequence;
- _diskPath = diskPath;
- _kvmEnable = kvmEnable;
- _runAndPause = runAndPause;
- _useVnc = useVnc;
- _acpiEnable = acpiEnable;
- _win2kHackEnable = win2kHackEnable;
+ setBootSequence(bootSequence);
+ setDiskPath(diskPath);
+ setKvmEnable(kvmEnable);
+ setRunAndPause(runAndPause);
+ setUseVnc(useVnc);
+ setAcpiEnable(acpiEnable);
+ setWin2kHackEnable(win2kHackEnable);
setClientIp(clientIp);
setRunAsStateless(runAsStateless);
}
public RunVmParams(Guid vmId) {
super(vmId);
- _diskPath = "";
- _kvmEnable = true;
- _acpiEnable = true;
+ diskPath = "";
+ kvmEnable = true;
+ acpiEnable = true;
}
public RunVmParams(Guid vmId, String clientIp) {
@@ -89,51 +89,51 @@
}
public String getDiskPath() {
- return _diskPath;
+ return diskPath;
}
public void setDiskPath(String value) {
- _diskPath = value;
+ diskPath = value;
}
public boolean getKvmEnable() {
- return _kvmEnable;
+ return kvmEnable;
}
public void setKvmEnable(boolean value) {
- _kvmEnable = value;
+ kvmEnable = value;
}
public Boolean getRunAndPause() {
- return _runAndPause;
+ return runAndPause;
}
public void setRunAndPause(Boolean value) {
- _runAndPause = value;
+ runAndPause = value;
}
public Boolean getUseVnc() {
- return _useVnc;
+ return useVnc;
}
public void setUseVnc(Boolean value) {
- _useVnc = value;
+ useVnc = value;
}
public boolean getAcpiEnable() {
- return _acpiEnable;
+ return acpiEnable;
}
public void setAcpiEnable(boolean value) {
- _acpiEnable = value;
+ acpiEnable = value;
}
public Boolean getWin2kHackEnable() {
- return _win2kHackEnable;
+ return win2kHackEnable;
}
public void setWin2kHackEnable(Boolean value) {
- _win2kHackEnable = value;
+ win2kHackEnable = value;
}
public String getClientIp() {
@@ -168,28 +168,28 @@
privateRunAsStateless = value;
}
- public String getinitrd_url() {
- return this.initrd_url;
+ public String getInitrdUrl() {
+ return this.initrdUrl;
}
- public void setinitrd_url(String value) {
- this.initrd_url = value;
+ public void setInitrdUrl(String value) {
+ this.initrdUrl = value;
}
- public String getkernel_url() {
- return this.kernel_url;
+ public String getKernelUrl() {
+ return this.kernelUrl;
}
- public void setkernel_url(String value) {
- this.kernel_url = value;
+ public void setKernelUrl(String value) {
+ this.kernelUrl = value;
}
- public String getkernel_params() {
- return this.kernel_params;
+ public String getKernelParams() {
+ return this.kernelParams;
}
- public void setkernel_params(String value) {
- this.kernel_params = value;
+ public void setKernelParams(String value) {
+ this.kernelParams = value;
}
public VmPayload getVmPayload() {
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
index 054a97b..a1ab6c3 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
@@ -514,13 +514,13 @@
params.setBootSequence(map(vm.getOs().getBoot(), null));
}
if (vm.getOs().isSetKernel()) {
- params.setkernel_url(vm.getOs().getKernel());
+ params.setKernelUrl(vm.getOs().getKernel());
}
if (vm.getOs().isSetInitrd()) {
- params.setinitrd_url(vm.getOs().getInitrd());
+ params.setInitrdUrl(vm.getOs().getInitrd());
}
if (vm.getOs().isSetCmdline()) {
- params.setkernel_params(vm.getOs().getCmdline());
+ params.setKernelParams(vm.getOs().getCmdline());
}
}
if (vm.isSetDomain() && vm.getDomain().isSetName()) {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
index 8c32155..e433566 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
@@ -671,15 +671,15 @@
// kernel params
if (getKernel_path().getEntity() != null)
{
- params.setkernel_url((String) getKernel_path().getEntity());
+ params.setKernelUrl((String) getKernel_path().getEntity());
}
if (getKernel_parameters().getEntity() != null)
{
- params.setkernel_params((String)
getKernel_parameters().getEntity());
+ params.setKernelParams((String)
getKernel_parameters().getEntity());
}
if (getInitrd_path().getEntity() != null)
{
- params.setinitrd_url((String) getInitrd_path().getEntity());
+ params.setInitrdUrl((String) getInitrd_path().getEntity());
}
// Sysprep params
--
To view, visit http://gerrit.ovirt.org/22222
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebc0d1a33b991e444f0639978bb08ccd5eade350
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
