Mike Kolesnik has uploaded a new change for review. Change subject: engine: Delete getChangeablePropertiesList() ......................................................................
engine: Delete getChangeablePropertiesList() Since Change-Id: I3734abc8a99ebcfdd8e8c8ea8c6b3a674a139f10 there is no one calling this method anymore so deleting it and all related implementations. Change-Id: I6057dfb759de9eabfdef433c2e0adbd1d6a1d7f5 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AdUser.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdcQueryable.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsNetworkInterface.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ad_groups.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/bookmarks.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Job.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Step.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonIVdcQueryableMixIn.java 27 files changed, 1 insertion(+), 256 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/10459/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AdUser.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AdUser.java index a5c6be6..46d133d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AdUser.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AdUser.java @@ -1,7 +1,6 @@ package org.ovirt.engine.core.common.businessentities; import java.io.Serializable; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -159,11 +158,6 @@ @Override public Object getQueryableId() { return getUserId(); - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return null; } public String getGroupIds() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java index f722455..fdb6df8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java @@ -346,11 +346,6 @@ return getaudit_log_id(); } - @Override - public java.util.ArrayList<String> getChangeablePropertiesList() { - return new java.util.ArrayList<String>(); - } - public void setProcessed(boolean processed) { this.processed = processed; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java index b2df31b..06ce8da 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java @@ -1,7 +1,5 @@ package org.ovirt.engine.core.common.businessentities; -import java.util.ArrayList; - import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; @@ -98,11 +96,6 @@ @Override public Object getQueryableId() { return getId(); - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return null; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java index 9862209..01168c9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java @@ -1,8 +1,6 @@ package org.ovirt.engine.core.common.businessentities; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; import javax.persistence.Column; import javax.persistence.Entity; @@ -402,15 +400,6 @@ @Override public Object getQueryableId() { return getuser_id(); - } - - private static final ArrayList<String> _vmProperties = new ArrayList<String>( - Arrays.asList(new String[] { "name", "surname", "username", "groups", "session_count", "IsLogedin", - "LastAdminCheckStatus" })); - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return _vmProperties; } public void setLastAdminCheckStatus(boolean val) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java index 9558db4..5847172 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java @@ -1,7 +1,6 @@ package org.ovirt.engine.core.common.businessentities; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import org.ovirt.engine.core.compat.Guid; @@ -11,13 +10,6 @@ public class DiskImage extends DiskImageBase implements INotifyPropertyChanged, IImage { private static final long serialVersionUID = 1533416252250153306L; - - private static final ArrayList<String> _diskImageProperties = new ArrayList<String>( - Arrays.asList(new String[] { "active", "creation_date", "last_modified_date", "actual_size", - "description", "internal_drive_mapping", "appList", "it_guid", "vm_guid", "ParentId", - "imageStatus", "lastModified", "storage_id", "vm_snapshot_id", "storage_path", "image_group_id", - "storage_pool_id", "boot", "volume_type", "volume_format", "disk_interface", "wipe_after_delete", - "propagate_errors", "read_rate", "write_rate", "ActualSize", "QuotaId" })); private ArrayList<String> storagesNames; // TODO why do we have two fields like this? @@ -362,11 +354,6 @@ @Override public Object getQueryableId() { return getImageId(); - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return _diskImageProperties; } public ArrayList<DiskImage> getSnapshots() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdcQueryable.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdcQueryable.java index c4d1c2d..5a382a6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdcQueryable.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdcQueryable.java @@ -2,17 +2,13 @@ import java.io.Serializable; -import org.ovirt.engine.core.compat.*; +import org.ovirt.engine.core.compat.NotImplementedException; public class IVdcQueryable implements Serializable { private static final long serialVersionUID = 4622458656586042539L; public Object getQueryableId() { throw new NotImplementedException("QueryableId not overridden in type"); - } - - public java.util.ArrayList<String> getChangeablePropertiesList() { - throw new NotImplementedException("ChangeablePropertiesList not overridden in type"); } public IVdcQueryable() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java index 57d3fd4..18ab8f3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java @@ -209,15 +209,6 @@ return getId(); } - private static final java.util.ArrayList<String> _networkProperties = new java.util.ArrayList<String>( - java.util.Arrays.asList(new String[] { "addr", "description", "name", "subnet", "type", "vlan_id", - "Status", "stp", "storage_pool_id", "gateway", "is_display", "mtu" })); - - @Override - public java.util.ArrayList<String> getChangeablePropertiesList() { - return _networkProperties; - } - @Override public String toString() { StringBuilder builder = new StringBuilder(); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java index 6fb81d7..f8aa933 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java @@ -1,8 +1,5 @@ package org.ovirt.engine.core.common.businessentities; -import java.util.ArrayList; -import java.util.Arrays; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -27,8 +24,6 @@ @TypeDef(name = "guid", typeClass = GuidType.class) public class Role extends IVdcQueryable implements INotifyPropertyChanged, BusinessEntity<Guid> { private static final long serialVersionUID = 1487620954798772886L; - private static final ArrayList<String> _event_subscriberProperties = new ArrayList<String>( - Arrays.asList(new String[] { "id", "name", "description", "is_readonly" })); @Size(max = BusinessEntitiesDefinitions.GENERAL_MAX_SIZE) @Column(name = "description", length = BusinessEntitiesDefinitions.GENERAL_MAX_SIZE) @@ -109,11 +104,6 @@ if (type != other.type) return false; return true; - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return _event_subscriberProperties; } public String getdescription() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java index ec2b225..296deb2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java @@ -1,6 +1,5 @@ package org.ovirt.engine.core.common.businessentities; -import java.util.ArrayList; import java.util.Date; import org.ovirt.engine.core.compat.Guid; @@ -100,11 +99,6 @@ @Override public Object getQueryableId() { return getId(); - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return null; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java index 101dbefe..b2fb3a3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java @@ -1189,28 +1189,6 @@ return getId(); } - private static final java.util.ArrayList<String> _vdsProperties = - new java.util.ArrayList<String>( - java.util.Arrays.asList(new String[] { "vds_name", "status", "usage_cpu_percent", - "usage_mem_percent", - "usage_network_percent", "mem_commited", "vm_count", "vm_active", "host_name", - "vds_group_name", - "vds_type", "CpuName", "vds_group_id", "net_config_dirty", "spm_status", "pm_enabled", - "pm_user", - "pm_password", "pm_type", "pm_port", "pm_options", "vms_cores_count", "ksm_state", - "mem_shared", - "Version", "vds_group_compatibility_version", "UniqueId", "TransparentHugePagesState", - "swap_total", - "PmOptionsMap", "swap_free", "mem_shared_percent", "ManagmentIp", - "supported_cluster_levels", "ContainingHooks", "NonOperationalReason", - "host_os", "kernel_version", "spice_version", "kvm_version", "libvirt_version", "storage_pool_id", - "physical_mem_mb" })); - - @Override - public java.util.ArrayList<String> getChangeablePropertiesList() { - return _vdsProperties; - } - private VdsSpmStatus _spm_status = VdsSpmStatus.forValue(0); public VdsSpmStatus getspm_status() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java index 2c4577f..58407fd 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java @@ -243,17 +243,6 @@ return getId(); } - private static final java.util.ArrayList<String> _vmProperties = new java.util.ArrayList<String>( - java.util.Arrays.asList(new String[] { "name", "description", "cpu_name", - "cpu_over_commit_duration_minutes", "low_utilization", "high_utilization", "selection_algorithm", - "max_vds_memory_over_commit", "storage_pool_id", "countThreadsAsCores", "compatibility_version", - "TransparentHugepages", "MigrateOnError" })); - - @Override - public java.util.ArrayList<String> getChangeablePropertiesList() { - return _vmProperties; - } - public void setMigrateOnError(MigrateOnErrorOptions migrateOnError) { this.migrateOnError = migrateOnError; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java index ab03998..d325fc9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java @@ -2,7 +2,6 @@ import java.io.Serializable; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -1417,28 +1416,6 @@ @Override public Object getQueryableId() { return getId(); - } - - private static final ArrayList<String> vmProperties = new ArrayList<String>( - Arrays.asList(new String[] { "vm_name", "status", "usage_cpu_percent", - "usage_mem_percent", "usage_network_percent", "run_on_vds", "run_on_vds_name", - "vm_description", "vds_group_id", "vds_group_name", "vm_ip", - "guest_cur_user_name", - "console_cur_user_name", - "DiskSize", "vm_os", "num_of_monitors", "roundedElapsedTime", - "vm_mem_size_mb", "vm_domain", "dedicated_vm_for_vds", - "guest_requested_memory", "is_stateless", "is_initialized", "display", - "display_type", "default_display_type", "run_on_vds", "app_list", "time_zone", - "display_secure_port", "IsConfigured", "is_auto_suspend", "auto_startup", - "display_ip", "priority", "default_boot_sequence", "iso_path", "VmPoolId", - "num_of_sockets", "cpu_per_socket", "vds_group_compatibility_version", - "usb_policy", "vmt_guid", "vmt_name", "initrd_url", "kernel_url", - "kernel_params", "VmPauseStatus", "CustomProperties", "MigrationSupport", "num_of_cpus", - "MinAllocatedMem", "smartcardEnabled" })); - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return vmProperties; } /** diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsNetworkInterface.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsNetworkInterface.java index de798f6..7723301 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsNetworkInterface.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsNetworkInterface.java @@ -1,8 +1,6 @@ package org.ovirt.engine.core.common.businessentities; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; import javax.validation.constraints.Pattern; @@ -17,13 +15,6 @@ @ValidNetworkConfiguration public class VdsNetworkInterface extends NetworkInterface<VdsNetworkStatistics> { private static final long serialVersionUID = -6347816237220936283L; - - private static final ArrayList<String> _changeablePropertiesList = - new ArrayList<String>(Arrays.asList(new String[] { - "Id", "Name", "MacAddress", "NetworkName", "Type", "Speed", "Statistics", "VdsId", "VdsName", - "BootProtocol", "Address", "Subnet", "Gateway", "VlanId", "Bonded", "BondName", "BondType", - "BondOptions" - })); private NGuid vdsId; private String vdsName; @@ -274,11 +265,6 @@ @Override public Object getQueryableId() { return id; - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return _changeablePropertiesList; } public int getMtu() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java index 7190876..e459d1e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java @@ -1,6 +1,5 @@ package org.ovirt.engine.core.common.businessentities; -import java.util.ArrayList; import java.util.Map; import org.ovirt.engine.core.compat.Guid; @@ -96,11 +95,6 @@ @Override public Object getQueryableId() { return getId(); - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return null; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java index 2c0ba7c..df4e870 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java @@ -1,8 +1,5 @@ package org.ovirt.engine.core.common.businessentities; -import java.util.ArrayList; -import java.util.Arrays; - import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; @@ -37,12 +34,6 @@ */ private boolean linked = true; private boolean portMirroring; - - private static final ArrayList<String> _changeablePropertiesList = - new ArrayList<String>(Arrays.asList(new String[] { - "Id", "Name", "MacAddress", "NetworkName", "Type", "Speed", "Statistics", "VmId", "VmName", - "VmTemplateId", "PortMirroring", "Linked" - })); public VmNetworkInterface() { super(new VmNetworkStatistics(), VmInterfaceType.pv.getValue()); @@ -109,11 +100,6 @@ @Override public Object getQueryableId() { return id; - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return _changeablePropertiesList; } public boolean isActive() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java index 5529caa..bba7261 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java @@ -1,7 +1,5 @@ package org.ovirt.engine.core.common.businessentities; -import java.util.ArrayList; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -244,12 +242,6 @@ @Override public Object getQueryableId() { return getId(); - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - // Actual implementation is TBD - return null; } public String getCpuPinning() { 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 3471d0d..0e031fb 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,7 +1,6 @@ package org.ovirt.engine.core.common.businessentities; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -36,13 +35,6 @@ @TypeDef(name = "guid", typeClass = GuidType.class) public class VmTemplate extends VmBase { private static final long serialVersionUID = -522552511046744989L; - - private static final ArrayList<String> _vmProperties = new ArrayList<String>( - Arrays.asList(new String[] { "name", "domain", "child_count", "description", - "default_display_type", "mem_size_mb", "vds_group_name", "status", "time_zone", "num_of_monitors", - "vds_group_id", "usb_policy", "num_of_sockets", "cpu_per_socket", "os", "is_auto_suspend", - "auto_startup", "priority", "default_boot_sequence", "is_stateless", "iso_path", "initrd_url", - "kernel_url", "kernel_params", "smartcardEnabled", "deleteProtected" })); @Transient private List<VmNetworkInterface> _Interfaces = new ArrayList<VmNetworkInterface>(); @@ -212,11 +204,6 @@ @Override public Object getQueryableId() { return getId(); - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return _vmProperties; } public double getActualDiskSize() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ad_groups.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ad_groups.java index 3058cf5..57ab41e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ad_groups.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ad_groups.java @@ -1,7 +1,6 @@ package org.ovirt.engine.core.common.businessentities; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; import javax.persistence.Column; @@ -16,7 +15,6 @@ import org.hibernate.annotations.TypeDef; import org.ovirt.engine.core.common.businessentities.mapping.GuidType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.NotImplementedException; @Entity @Table(name = "ad_groups") @@ -124,11 +122,6 @@ @Override public Object getQueryableId() { return getid(); - } - - @Override - public ArrayList<String> getChangeablePropertiesList() { - throw new NotImplementedException(); } public void setDistinguishedName(String distinguishedName) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/bookmarks.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/bookmarks.java index bb210ae..3364f71 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/bookmarks.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/bookmarks.java @@ -116,14 +116,6 @@ return getbookmark_id(); } - private static final java.util.ArrayList<String> _bookmarkProperties = new java.util.ArrayList<String>( - java.util.Arrays.asList(new String[] { "bookmark_name", "bookmark_value" })); - - @Override - public java.util.ArrayList<String> getChangeablePropertiesList() { - return _bookmarkProperties; - } - // public event PropertyChangedEventHandler PropertyChanged; protected void OnPropertyChanged(PropertyChangedEventArgs e) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java index cae0786..6582794 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.TypeDef; import org.hibernate.validator.constraints.Email; - import org.ovirt.engine.core.common.businessentities.mapping.GuidType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.INotifyPropertyChanged; @@ -163,15 +162,6 @@ public Object getQueryableId() { return StringFormat.format("%1$s%2$s%3$s%4$s", id.eventUpName, id.methodId, id.subscriberId, id.tagName == null ? "" : id.tagName); - } - - private static final java.util.ArrayList<String> _event_subscriberProperties = new java.util.ArrayList<String>( - java.util.Arrays.asList(new String[] { "event_up_name", "method_id", "method_address", "subscriber_id", - "tag_name" })); - - @Override - public java.util.ArrayList<String> getChangeablePropertiesList() { - return _event_subscriberProperties; } protected void OnPropertyChanged(PropertyChangedEventArgs e) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java index 7bfc8f1..ae28e52 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java @@ -89,11 +89,6 @@ return getId(); } - @Override - public ArrayList<String> getChangeablePropertiesList() { - return new java.util.ArrayList<String>(); - } - public Guid getad_element_id() { return this.adElementId; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java index 6e374d9..b6fb431 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_domains.java @@ -1,7 +1,5 @@ package org.ovirt.engine.core.common.businessentities; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Set; import javax.persistence.Transient; @@ -288,15 +286,6 @@ public void setLastTimeUsedAsMaster(long lastTimeUsedAsMaster) { _staticData.setLastTimeUsedAsMaster(lastTimeUsedAsMaster); - } - - private static final ArrayList<String> _spProperties = new ArrayList<String>( - Arrays.asList("storage_name", "status", "used_disk_size", "available_disk_size", - "committed_disk_size", "storage_domain_type", "storage_domain_shared_status", "storage")); - - @Override - public ArrayList<String> getChangeablePropertiesList() { - return _spProperties; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java index c6c051c..16ea604 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java @@ -201,15 +201,6 @@ return getId(); } - private static final java.util.ArrayList<String> _spProperties = new java.util.ArrayList<String>( - java.util.Arrays.asList(new String[] { "name", "description", "status", "storage_pool_type", - "compatibility_version" })); - - @Override - public java.util.ArrayList<String> getChangeablePropertiesList() { - return _spProperties; - } - public String getLVER() { return LVER; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java index 9a57e4c..d6a86f0 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vm_pools.java @@ -329,14 +329,4 @@ public Object getQueryableId() { return getvm_pool_id(); } - - private static final java.util.ArrayList<String> _poolProperties = new java.util.ArrayList<String>( - java.util.Arrays.asList(new String[] { "vm_pool_name", "vm_pool_description", "vm_pool_type", - "vm_running_count", "vm_assigned_count", "vds_group_name", "prestarted_vms" })); - - @Override - public java.util.ArrayList<String> getChangeablePropertiesList() { - return _poolProperties; - } - } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Job.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Job.java index 1cce556..dd2b93a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Job.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Job.java @@ -191,11 +191,6 @@ } @Override - public ArrayList<String> getChangeablePropertiesList() { - return new ArrayList<String>(); - } - - @Override public Object getQueryableId() { return id; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Step.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Step.java index 344d92b..17db4ef 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Step.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Step.java @@ -168,11 +168,6 @@ } @Override - public ArrayList<String> getChangeablePropertiesList() { - return new ArrayList<String>(); - } - - @Override public Object getQueryableId() { return id; } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonIVdcQueryableMixIn.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonIVdcQueryableMixIn.java index bbb9eff..2d67278 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonIVdcQueryableMixIn.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonIVdcQueryableMixIn.java @@ -12,7 +12,4 @@ @JsonIgnore public abstract Object getQueryableId(); - - @JsonIgnore - public abstract java.util.ArrayList<String> getChangeablePropertiesList(); } -- To view, visit http://gerrit.ovirt.org/10459 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6057dfb759de9eabfdef433c2e0adbd1d6a1d7f5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
