Martin Betak has uploaded a new change for review.
Change subject: engine: Remove duplicate properties of VmTemplate
......................................................................
engine: Remove duplicate properties of VmTemplate
Remove fields interfaces and diskList with corresponding accessor
methods duplicitly declared on VmTemplate while being inherited from
VmBase with no additional logic except for overriding said accessor
methods to the same implementation.
Change-Id: I765da987d21ddf7153715322be9b9156b2a0ddca
Signed-off-by: Martin Betak <mbe...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
2 files changed, 5 insertions(+), 31 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/19409/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
index b96f0d6..c1ca8cb 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
@@ -169,6 +169,7 @@
public VmBase() {
name = "";
+ interfaces = new ArrayList<VmNetworkInterface>();
diskList = new ArrayList<DiskImage>();
managedDeviceMap = new HashMap<Guid, VmDevice>();
unmanagedDeviceList = new ArrayList<VmDevice>();
@@ -327,6 +328,10 @@
return diskList;
}
+ public void setDiskList(ArrayList<DiskImage> diskList) {
+ this.diskList = diskList;
+ }
+
public Map<Guid, VmDevice> getManagedDeviceMap() {
return managedDeviceMap;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
index da366ab..2fcf93b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
@@ -1,16 +1,13 @@
package org.ovirt.engine.core.common.businessentities;
-import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import javax.validation.constraints.Size;
import javax.validation.groups.Default;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.ovirt.engine.core.common.businessentities.Disk.DiskStorageType;
-import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.validation.annotation.ValidI18NName;
@@ -21,8 +18,6 @@
public class VmTemplate extends VmBase implements
BusinessEntityWithStatus<Guid, VmTemplateStatus> {
private static final long serialVersionUID = -5238366659716600486L;
-
- private List<VmNetworkInterface> interfaces;
private int childCount;
@@ -38,8 +33,6 @@
private HashMap<Guid, DiskImage> diskImageMap;
- private ArrayList<DiskImage> diskList;
-
private HashMap<Guid, DiskImage> diskTemplateMap;
private double bootDiskSizeGB;
@@ -50,10 +43,8 @@
setNiceLevel(0);
setCpuShares(0);
diskTemplateMap = new HashMap<Guid, DiskImage>();
- interfaces = new ArrayList<VmNetworkInterface>();
status = VmTemplateStatus.OK;
diskImageMap = new HashMap<Guid, DiskImage>();
- diskList = new ArrayList<DiskImage>();
}
private boolean disabled;
@@ -102,9 +93,7 @@
createdByUserId);
diskTemplateMap = new HashMap<Guid, DiskImage>();
- interfaces = new ArrayList<VmNetworkInterface>();
diskImageMap = new HashMap<Guid, DiskImage>();
- diskList = new ArrayList<DiskImage>();
this.childCount = childCount;
setName(name);
@@ -144,16 +133,6 @@
public boolean isTrustedService() {
return trustedService;
- }
-
- @Override
- public List<VmNetworkInterface> getInterfaces() {
- return interfaces;
- }
-
- @Override
- public void setInterfaces(List<VmNetworkInterface> value) {
- interfaces = value;
}
public Guid getStoragePoolId() {
@@ -215,16 +194,6 @@
public void setDiskImageMap(HashMap<Guid, DiskImage> value) {
diskImageMap = value;
- }
-
- @Override
- @JsonIgnore
- public ArrayList<DiskImage> getDiskList() {
- return diskList;
- }
-
- public void setDiskList(ArrayList<DiskImage> disks) {
- diskList = disks;
}
@Override
--
To view, visit http://gerrit.ovirt.org/19409
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I765da987d21ddf7153715322be9b9156b2a0ddca
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Betak <mbe...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
