Martin Betak has uploaded a new change for review. Change subject: dal: Default Implementation of BatchMapper ......................................................................
dal: Default Implementation of BatchMapper Provide default implementation of MassOperationDao BatchMapper using createFullParameterSource which was the defacto override in almost all subclasses. As a consequence the Gluster Daos get the BatchMapper for free. Change-Id: Iaae33f64c060606e3eb854e6fbfc19d53a873521 Signed-off-by: Martin Betak <[email protected]> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDynamicDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/LunDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/MassOperationsGenericDaoDbFacade.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDeviceDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmJobDaoDbFacadeImpl.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/VmStatisticsDaoDbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoDbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterOptionDaoDbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNetworkStatisticsDaoDbFacadeImpl.java 14 files changed, 10 insertions(+), 216 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/29649/1 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDynamicDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDynamicDAODbFacadeImpl.java index 5cc81ce..5ef5272 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDynamicDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDynamicDAODbFacadeImpl.java @@ -67,26 +67,6 @@ return DiskImageDynamicRowMapper.instance; } - @Override - public MapSqlParameterMapper<DiskImageDynamic> getBatchMapper() { - return new MapSqlParameterMapper<DiskImageDynamic>() { - - @Override - public MapSqlParameterSource map(DiskImageDynamic entity) { - MapSqlParameterSource paramValue = new MapSqlParameterSource() - .addValue("image_id", entity.getId()) - .addValue("read_rate", entity.getread_rate()) - .addValue("write_rate", entity.getwrite_rate()) - .addValue("actual_size", entity.getactual_size()) - .addValue("read_latency_seconds", entity.getReadLatency()) - .addValue("write_latency_seconds", entity.getWriteLatency()) - .addValue("flush_latency_seconds", entity.getFlushLatency()); - - return paramValue; - } - }; - } - public MapSqlParameterMapper<Pair<Guid, DiskImageDynamic>> getBatchImageGroupMapper() { return new MapSqlParameterMapper<Pair<Guid, DiskImageDynamic>>() { diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/LunDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/LunDAODbFacadeImpl.java index b43d730..da62b99 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/LunDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/LunDAODbFacadeImpl.java @@ -5,7 +5,6 @@ import java.util.List; import org.ovirt.engine.core.common.businessentities.LUNs; -import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -136,16 +135,5 @@ .addValue("vendor_id", lun.getVendorId()) .addValue("product_id", lun.getProductId()) .addValue("device_size", lun.getDeviceSize()); - } - - @Override - public MapSqlParameterMapper<LUNs> getBatchMapper() { - return new MapSqlParameterMapper<LUNs>() { - - @Override - public MapSqlParameterSource map(LUNs lun) { - return createFullParametersMapper(lun); - } - }; } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/MassOperationsGenericDaoDbFacade.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/MassOperationsGenericDaoDbFacade.java index 3a5afca..b65a8ad 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/MassOperationsGenericDaoDbFacade.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/MassOperationsGenericDaoDbFacade.java @@ -9,6 +9,7 @@ import org.ovirt.engine.core.common.businessentities.BusinessEntity; import org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityComparator; import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; /** * Implementation for the {@link MassOperationsDao} which provides a default @@ -95,5 +96,12 @@ updateAllInBatch(getProcedureNameForUpdate(), entities, getBatchMapper()); } - public abstract MapSqlParameterMapper<T> getBatchMapper(); + public MapSqlParameterMapper<T> getBatchMapper() { + return new MapSqlParameterMapper<T>() { + @Override + public MapSqlParameterSource map(T entity) { + return createFullParametersMapper(entity); + } + }; + } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java index 3a91207..01a9b1d 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java @@ -16,7 +16,6 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.RpmVersion; import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils; -import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.serialization.json.JsonObjectDeserializer; @@ -187,18 +186,6 @@ getCallsHandler().executeModification("UpdateVdsDynamicPowerManagementPolicyFlag", parameterSource); - } - - @Override - public MapSqlParameterMapper<VdsDynamic> getBatchMapper() { - return new MapSqlParameterMapper<VdsDynamic>() { - - @Override - public MapSqlParameterSource map(VdsDynamic entity) { - return createFullParametersMapper(entity); - } - - }; } private MapSqlParameterSource createFullParametersMapperForSave(VdsDynamic vds) { diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDeviceDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDeviceDAODbFacadeImpl.java index ebd6851..3f7b836 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDeviceDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDeviceDAODbFacadeImpl.java @@ -222,30 +222,6 @@ getCallsHandler().executeModification("UpdateVmDeviceBootOrder", paramsForUpdate); } - @Override - public MapSqlParameterMapper<VmDevice> getBatchMapper() { - return new MapSqlParameterMapper<VmDevice>() { - @Override - public MapSqlParameterSource map(VmDevice entity) { - MapSqlParameterSource paramValue = new MapSqlParameterSource() - .addValue("device_id", entity.getDeviceId()) - .addValue("vm_id", entity.getVmId()) - .addValue("address", entity.getAddress()) - .addValue("alias", entity.getAlias()) - .addValue("type", entity.getType()) - .addValue("is_managed", entity.getIsManaged()) - .addValue("is_plugged", entity.getIsPlugged()) - .addValue("is_readonly", entity.getIsReadOnly()) - .addValue("spec_params", entity.getSpecParams()) - .addValue("boot_order", entity.getBootOrder()) - .addValue("snapshot_id", entity.getSnapshotId()) - .addValue("device", entity.getDevice()); - - return paramValue; - } - }; - } - public MapSqlParameterMapper<VmDevice> getBootOrderBatchMapper() { return new MapSqlParameterMapper<VmDevice>() { @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java index 34c8fc2..ecf7fb0 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java @@ -16,7 +16,6 @@ import org.ovirt.engine.core.common.businessentities.VmPauseStatus; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils; -import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -197,61 +196,6 @@ entity.setExitReason(exitReason); entity.setGuestCpuCount(rs.getInt("guest_cpu_count")); return entity; - } - }; - } - - @Override - public MapSqlParameterMapper<VmDynamic> getBatchMapper() { - return new MapSqlParameterMapper<VmDynamic>() { - @Override - public MapSqlParameterSource map(VmDynamic entity) { - MapSqlParameterSource paramValue = new MapSqlParameterSource() - .addValue("guest_cur_user_name", entity.getGuestCurrentUserName()) - .addValue("console_cur_user_name", entity.getConsoleCurrentUserName()) - .addValue("guest_last_login_time", entity.getGuestLastLoginTime()) - .addValue("guest_last_logout_time", entity.getGuestLastLogoutTime()) - .addValue("console_user_id", entity.getConsoleUserId()) - .addValue("guest_os", entity.getGuestOs()) - .addValue("migrating_to_vds", entity.getMigratingToVds()) - .addValue("run_on_vds", entity.getRunOnVds()) - .addValue("status", entity.getStatus()) - .addValue("vm_guid", entity.getId()) - .addValue("vm_host", entity.getVmHost()) - .addValue("vm_ip", entity.getVmIp()) - .addValue("last_start_time", entity.getLastStartTime()) - .addValue("last_stop_time", entity.getLastStopTime()) - .addValue("vm_pid", entity.getVmPid()) - .addValue("vm_fqdn", entity.getVmFQDN()) - .addValue("app_list", entity.getAppList()) - .addValue("display", entity.getDisplay()) - .addValue("acpi_enable", entity.getAcpiEnable()) - .addValue("session", entity.getSession()) - .addValue("display_ip", entity.getDisplayIp()) - .addValue("display_type", entity.getDisplayType()) - .addValue("kvm_enable", entity.getKvmEnable()) - .addValue("boot_sequence", entity.getBootSequence()) - .addValue("display_secure_port", entity.getDisplaySecurePort()) - .addValue("utc_diff", entity.getUtcDiff()) - .addValue("last_vds_run_on", entity.getLastVdsRunOn()) - .addValue("client_ip", entity.getClientIp()) - .addValue("guest_requested_memory", entity.getGuestRequestedMemory()) - .addValue("hibernation_vol_handle", entity.getHibernationVolHandle()) - .addValue("exit_status", entity.getExitStatus()) - .addValue("pause_status", entity.getPauseStatus()) - .addValue("exit_message", entity.getExitMessage()) - .addValue("hash", entity.getHash()) - .addValue("guest_agent_nics_hash", entity.getGuestAgentNicsHash()) - .addValue("last_watchdog_event", entity.getLastWatchdogEvent()) - .addValue("last_watchdog_action", entity.getLastWatchdogAction()) - .addValue("is_run_once", entity.isRunOnce()) - .addValue("cpu_name", entity.getCpuName()) - .addValue("current_cd", entity.getCurrentCd()) - .addValue("reason", entity.getStopReason()) - .addValue("exit_reason", entity.getExitReason()) - .addValue("guest_cpu_count", entity.getGuestCpuCount()); - - return paramValue; } }; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmJobDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmJobDaoDbFacadeImpl.java index 8f0d156..f3ef660 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmJobDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmJobDaoDbFacadeImpl.java @@ -11,7 +11,6 @@ import org.ovirt.engine.core.common.businessentities.VmJobState; import org.ovirt.engine.core.common.businessentities.VmJobType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -119,15 +118,5 @@ entity.setJobType(jobType); return entity; } - } - - @Override - public MapSqlParameterMapper<VmJob> getBatchMapper() { - return new MapSqlParameterMapper<VmJob>() { - @Override - public MapSqlParameterSource map(VmJob entity) { - return createFullParametersMapper(entity); - } - }; } } 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 197f74a..70485c9 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 @@ -154,7 +154,7 @@ /** * JDBC row mapper for VM static */ - private static class VMStaticRowMapper extends AbstractVmRowMapper<VmStatic> { + protected static class VMStaticRowMapper extends AbstractVmRowMapper<VmStatic> { public static final VMStaticRowMapper instance = new VMStaticRowMapper(); @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStatisticsDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStatisticsDaoDbFacadeImpl.java index 83b3c6c..12e6054 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStatisticsDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmStatisticsDaoDbFacadeImpl.java @@ -7,7 +7,6 @@ import org.apache.commons.lang.NotImplementedException; import org.ovirt.engine.core.common.businessentities.VmStatistics; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -69,27 +68,6 @@ .getObject("disks_usage")); entity.setId(getGuidDefaultEmpty(rs, "vm_guid")); return entity; - } - }; - } - - @Override - public MapSqlParameterMapper<VmStatistics> getBatchMapper() { - return new MapSqlParameterMapper<VmStatistics>() { - @Override - public MapSqlParameterSource map(VmStatistics entity) { - MapSqlParameterSource paramValue = new MapSqlParameterSource() - .addValue("cpu_sys", entity.getcpu_sys()) - .addValue("cpu_user", entity.getcpu_user()) - .addValue("elapsed_time", entity.getelapsed_time()) - .addValue("usage_cpu_percent", entity.getusage_cpu_percent()) - .addValue("usage_mem_percent", entity.getusage_mem_percent()) - .addValue("migration_progress_percent", entity.getMigrationProgressPercent()) - .addValue("usage_network_percent", entity.getusage_network_percent()) - .addValue("disks_usage", entity.getDisksUsage()) - .addValue("vm_guid", entity.getId()); - - return paramValue; } }; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoDbFacadeImpl.java index 2558f8b..30170b2 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoDbFacadeImpl.java @@ -12,8 +12,6 @@ import org.ovirt.engine.core.common.businessentities.gluster.GlusterServerHook; import org.ovirt.engine.core.common.utils.EnumUtils; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.NotImplementedException; -import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; import org.ovirt.engine.core.dao.MassOperationsGenericDaoDbFacade; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -299,13 +297,6 @@ @Override protected MapSqlParameterSource createIdParameterMapper(Guid id) { return getCustomMapSqlParameterSource().addValue("id", id); - } - - @SuppressWarnings("deprecation") - @Override - public MapSqlParameterMapper<GlusterHookEntity> getBatchMapper() { - // TODO: Implement this - throw new NotImplementedException("Unsupported operation"); } @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterOptionDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterOptionDaoDbFacadeImpl.java index b5f3ac6..6399952 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterOptionDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterOptionDaoDbFacadeImpl.java @@ -8,8 +8,6 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeOptionEntity; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.NotImplementedException; -import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; import org.ovirt.engine.core.dao.MassOperationsGenericDaoDbFacade; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -93,12 +91,5 @@ @Override protected RowMapper<GlusterVolumeOptionEntity> createEntityRowMapper() { return optionRowMapper; - } - - @SuppressWarnings("deprecation") - @Override - public MapSqlParameterMapper<GlusterVolumeOptionEntity> getBatchMapper() { - // TODO: Implement this - throw new NotImplementedException("Unsupported operation"); } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java index 351577f..c17aa3c 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterServerServiceDaoDbFacadeImpl.java @@ -9,8 +9,6 @@ import org.ovirt.engine.core.common.businessentities.gluster.ServiceType; import org.ovirt.engine.core.common.utils.EnumUtils; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.NotImplementedException; -import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; import org.ovirt.engine.core.dao.MassOperationsGenericDaoDbFacade; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.simple.ParameterizedRowMapper; @@ -114,11 +112,5 @@ entity.setHostName(rs.getString("vds_name")); return entity; } - } - - @Override - public MapSqlParameterMapper<GlusterServerService> getBatchMapper() { - // TODO: Implement this - throw new NotImplementedException("Unsupported operation"); } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java index b49f342..b50d002 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java @@ -22,8 +22,6 @@ import org.ovirt.engine.core.common.job.StepEnum; import org.ovirt.engine.core.common.utils.EnumUtils; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.NotImplementedException; -import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; import org.ovirt.engine.core.dao.MassOperationsGenericDaoDbFacade; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -495,12 +493,5 @@ for (TransportType transportType : transportTypes) { removeTransportType(volumeId, transportType); } - } - - @SuppressWarnings("deprecation") - @Override - public MapSqlParameterMapper<GlusterVolumeEntity> getBatchMapper() { - // TODO: Implement this - throw new NotImplementedException("Unsupported operation"); } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNetworkStatisticsDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNetworkStatisticsDaoDbFacadeImpl.java index bc81b1e..5b21cdb 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNetworkStatisticsDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNetworkStatisticsDaoDbFacadeImpl.java @@ -8,7 +8,6 @@ import org.ovirt.engine.core.common.businessentities.network.InterfaceStatus; import org.ovirt.engine.core.common.businessentities.network.VmNetworkStatistics; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.dbbroker.MapSqlParameterMapper; import org.ovirt.engine.core.dao.MassOperationsGenericDaoDbFacade; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -56,26 +55,6 @@ entity.setTransmitDropRate(rs.getDouble("tx_drop")); entity.setStatus(InterfaceStatus.forValue(rs.getInt("iface_status"))); return entity; - } - }; - } - - @Override - public MapSqlParameterMapper<VmNetworkStatistics> getBatchMapper() { - return new MapSqlParameterMapper<VmNetworkStatistics>() { - - @Override - public MapSqlParameterSource map(VmNetworkStatistics entity) { - MapSqlParameterSource paramValue = new MapSqlParameterSource() - .addValue("id", entity.getId()) - .addValue("rx_drop", entity.getReceiveDropRate()) - .addValue("rx_rate", entity.getReceiveRate()) - .addValue("tx_drop", entity.getTransmitDropRate()) - .addValue("tx_rate", entity.getTransmitRate()) - .addValue("iface_status", entity.getStatus()) - .addValue("vm_id", entity.getVmId()); - - return paramValue; } }; } -- To view, visit http://gerrit.ovirt.org/29649 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaae33f64c060606e3eb854e6fbfc19d53a873521 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
