Martin Betak has uploaded a new change for review. Change subject: dal: Remove duplicate fields in VM row mappers ......................................................................
dal: Remove duplicate fields in VM row mappers Removed duplicate fields that were specified both in AbstractVmRowMapper and its descendants VmStaticRowMapper and VmTemplateRowMapper. Also extracted fields found in both children back to AbstractVmRowMapper. Change-Id: Iab2a3bf9a0deb25b3950f75a351bde4b9e6fef74 Signed-off-by: Martin Betak <[email protected]> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/AbstractVmRowMapper.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDAODbFacade.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java 4 files changed, 12 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/29518/1 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/AbstractVmRowMapper.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/AbstractVmRowMapper.java index 365591f..f310981 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/AbstractVmRowMapper.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/AbstractVmRowMapper.java @@ -4,6 +4,8 @@ import java.sql.SQLException; import org.ovirt.engine.core.common.businessentities.BootSequence; +import org.ovirt.engine.core.common.businessentities.DisplayType; +import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.OriginType; import org.ovirt.engine.core.common.businessentities.SerialNumberPolicy; import org.ovirt.engine.core.common.businessentities.SsoMethod; @@ -11,6 +13,7 @@ import org.ovirt.engine.core.common.businessentities.VmBase; import org.ovirt.engine.core.common.businessentities.VmType; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.dao.BaseDAODbFacade; import org.springframework.jdbc.core.RowMapper; /** @@ -20,7 +23,11 @@ public abstract class AbstractVmRowMapper<T extends VmBase> implements RowMapper<T> { protected final void map(final ResultSet rs, final T entity) throws SQLException { + entity.setMemSizeMb(rs.getInt("mem_size_mb")); entity.setOsId(rs.getInt("os")); + entity.setNumOfMonitors(rs.getInt("num_of_monitors")); + entity.setSingleQxlPci(rs.getBoolean("single_qxl_pci")); + entity.setDefaultDisplayType(DisplayType.forValue(rs.getInt("default_display_type"))); entity.setDescription(rs.getString("description")); entity.setComment(rs.getString("free_text_comment")); entity.setCreationDate(DbFacadeUtils.fromDate(rs.getTimestamp("creation_date"))); @@ -55,6 +62,10 @@ entity.setBootMenuEnabled(rs.getBoolean("is_boot_menu_enabled")); entity.setSpiceFileTransferEnabled(rs.getBoolean("is_spice_file_transfer_enabled")); entity.setSpiceCopyPasteEnabled(rs.getBoolean("is_spice_copy_paste_enabled")); + entity.setMigrationSupport(MigrationSupport.forValue(rs.getInt("migration_support"))); + entity.setDedicatedVmForVds(BaseDAODbFacade.getGuid(rs, "dedicated_vm_for_vds")); + entity.setMinAllocatedMem(rs.getInt("min_allocated_mem")); + entity.setQuotaId(BaseDAODbFacade.getGuid(rs, "quota_id")); } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDAODbFacade.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDAODbFacade.java index b17fc06..373f410 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDAODbFacade.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDAODbFacade.java @@ -153,7 +153,7 @@ * @return a {@link Guid} representing the UUID in the column, or the default value if it was <code>null</code>. * @throws SQLException If resultSet does not contain columnName or its value cannot be cast to {@link UUID}. */ - protected static Guid getGuid(ResultSet resultSet, String columnName) throws SQLException { + public static Guid getGuid(ResultSet resultSet, String columnName) throws SQLException { return getGuid(resultSet, columnName, null); } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java index 07ad46c..7116e85 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStaticDAODbFacadeImpl.java @@ -6,8 +6,6 @@ import org.apache.commons.lang.NotImplementedException; import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.common.businessentities.DisplayType; -import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.NumaTuneMode; import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils; @@ -219,29 +217,19 @@ map(rs, entity); entity.setId(getGuidDefaultEmpty(rs, "vm_guid")); - entity.setMemSizeMb(rs.getInt("mem_size_mb")); entity.setVdsGroupId(getGuidDefaultEmpty(rs, "vds_group_id")); entity.setName(rs.getString("vm_name")); entity.setVmtGuid(getGuidDefaultEmpty(rs, "vmt_guid")); - entity.setNumOfMonitors(rs.getInt("num_of_monitors")); - entity.setSingleQxlPci(rs.getBoolean("single_qxl_pci")); entity.setInitialized(rs.getBoolean("is_initialized")); - entity.setDedicatedVmForVds(getGuid(rs, "dedicated_vm_for_vds")); - entity.setDefaultDisplayType(DisplayType.forValue(rs.getInt("default_display_type"))); - entity.setMigrationSupport(MigrationSupport.forValue(rs.getInt("migration_support"))); String predefinedProperties = rs.getString("predefined_properties"); String userDefinedProperties = rs.getString("userdefined_properties"); entity.setPredefinedProperties(predefinedProperties); entity.setUserDefinedProperties(userDefinedProperties); entity.setCustomProperties(VmPropertiesUtils.getInstance().customProperties(predefinedProperties, userDefinedProperties)); - entity.setMinAllocatedMem(rs.getInt("min_allocated_mem")); - entity.setQuotaId(getGuid(rs, "quota_id")); entity.setCpuPinning(rs.getString("cpu_pinning")); entity.setUseHostCpuFlags(rs.getBoolean("host_cpu_flags")); - entity.setTunnelMigration((Boolean) rs.getObject("tunnel_migration")); - entity.setVncKeyboardLayout(rs.getString("vnc_keyboard_layout")); entity.setInstanceTypeId(Guid.createGuidFromString(rs.getString("instance_type_id"))); entity.setImageTypeId(Guid.createGuidFromString(rs.getString("image_type_id"))); entity.setOriginalTemplateName(rs.getString("original_template_name")); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java index fb6cf5c..b37a9ad 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java @@ -9,10 +9,8 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.businessentities.ActionGroup; import org.ovirt.engine.core.common.businessentities.ArchitectureType; -import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.ImageType; import org.ovirt.engine.core.common.businessentities.InstanceType; -import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; import org.ovirt.engine.core.common.businessentities.VmEntityType; import org.ovirt.engine.core.common.businessentities.VmTemplate; @@ -295,27 +293,16 @@ entity.setId(getGuidDefaultEmpty(rs, "vmt_guid")); entity.setChildCount(rs.getInt("child_count")); - entity.setMemSizeMb(rs.getInt("mem_size_mb")); entity.setName(rs.getString("name")); - entity.setOsId(rs.getInt("os")); entity.setVdsGroupId(getGuid(rs, "vds_group_id")); - entity.setNumOfMonitors(rs.getInt("num_of_monitors")); - entity.setSingleQxlPci(rs.getBoolean("single_qxl_pci")); entity.setAllowConsoleReconnect(rs.getBoolean("allow_console_reconnect")); entity.setStatus(VmTemplateStatus.forValue(rs.getInt("status"))); entity.setVdsGroupName(rs.getString("vds_group_name")); entity.setStoragePoolId(getGuid(rs, "storage_pool_id")); entity.setStoragePoolName(rs.getString("storage_pool_name")); - entity.setDefaultDisplayType(DisplayType.forValue(rs.getInt("default_display_type"))); - entity.setQuotaId(getGuid(rs, "quota_id")); entity.setQuotaName(rs.getString("quota_name")); entity.setQuotaEnforcementType(QuotaEnforcementTypeEnum.forValue(rs.getInt("quota_enforcement_type"))); - entity.setMigrationSupport(MigrationSupport.forValue(rs.getInt("migration_support"))); - entity.setDedicatedVmForVds(getGuid(rs, "dedicated_vm_for_vds")); entity.setDisabled(rs.getBoolean("is_disabled")); - entity.setTunnelMigration((Boolean) rs.getObject("tunnel_migration")); - entity.setVncKeyboardLayout(rs.getString("vnc_keyboard_layout")); - entity.setMinAllocatedMem(rs.getInt("min_allocated_mem")); entity.setTrustedService(rs.getBoolean("trusted_service")); entity.setTemplateType(VmEntityType.valueOf(rs.getString("entity_type"))); entity.setClusterArch(ArchitectureType.forValue(rs.getInt("architecture"))); -- To view, visit http://gerrit.ovirt.org/29518 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab2a3bf9a0deb25b3950f75a351bde4b9e6fef74 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
