Laszlo Hornyak has uploaded a new change for review. Change subject: engine: remove SimpleJdbcTemplate ......................................................................
engine: remove SimpleJdbcTemplate Since spring 3.1, the SimpleJdbcTemplate class does the same as JdbcTemplate, therefore wrapping JdbcTemplate is not needed anymore and SimpleJdbcTemplate is deprecated. This patch removes the wrapping SimpleJdbcTemplates from DAO implementations. Change-Id: I8782d8790ee682b64d2b14af8840f90b7b7216a9 Signed-off-by: Laszlo Hornyak <[email protected]> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDaoDbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/QuotaDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.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/GlusterVolumeDaoDbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkViewDaoDbFacadeImpl.java 15 files changed, 15 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/13157/1 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAODbFacadeImpl.java index 0c82505..d2a5026 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDAODbFacadeImpl.java @@ -18,7 +18,6 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.simple.SimpleJdbcCall; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * <code>AuditLogDAODbFacadeImpl</code> provides a concrete implementation of {@link AuditLogDAO}. It uses code @@ -56,7 +55,7 @@ @Override public List<AuditLog> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, auditLogRowMapper); + return jdbcTemplate.query(query, auditLogRowMapper); } @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java index d9f901c..47cb926 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java @@ -10,7 +10,6 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.simple.SimpleJdbcCall; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * <code>DBUserDAODbFacadeImpl</code> provides an implementation of {@link DbUserDAO} with the previously developed @@ -102,7 +101,7 @@ @Override public List<DbUser> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, DbUserRowMapper.instance); + return jdbcTemplate.query(query, DbUserRowMapper.instance); } @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDaoDbFacadeImpl.java index 45c060a..bd3ff42 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDaoDbFacadeImpl.java @@ -11,7 +11,6 @@ import org.ovirt.engine.core.dao.DiskImageDAODbFacadeImpl.DiskImageRowMapper; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; public class DiskDaoDbFacadeImpl extends BaseDAODbFacade implements DiskDao { @@ -66,7 +65,7 @@ @Override public List<Disk> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, DiskRowMapper.instance); + return jdbcTemplate.query(query, DiskRowMapper.instance); } private static class DiskRowMapper implements RowMapper<Disk> { diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/QuotaDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/QuotaDAODbFacadeImpl.java index 5ecacc7..d8cb586 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/QuotaDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/QuotaDAODbFacadeImpl.java @@ -15,7 +15,6 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.simple.SimpleJdbcCall; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * <code>QuotaDAODbFacadeImpl</code> implements the calling to quota stored procedures (@see QuotaDAO). @@ -571,7 +570,7 @@ @Override public List<Quota> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, getQuotaMetaDataFromResultSet()); + return jdbcTemplate.query(query, getQuotaMetaDataFromResultSet()); } @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java index 5e13e13..2e6f67f 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java @@ -14,7 +14,6 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.NGuid; import org.springframework.jdbc.core.RowMapper; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * <code>StorageDomainDAODbFacadeImpl</code> provides an implementation of {@link StorageDomainDAO} based on code from @@ -95,7 +94,7 @@ @Override public List<StorageDomain> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, StorageDomainRowMapper.instance); + return jdbcTemplate.query(query, StorageDomainRowMapper.instance); } @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java index c2d7d20..3660305 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java @@ -15,7 +15,6 @@ import org.ovirt.engine.core.compat.Version; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * <code>StoragePoolDAODbFacadeImpl</code> provides a concrete implementation of {@link StoragePoolDAO} based on code @@ -124,7 +123,7 @@ @Override public List<storage_pool> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, mapper); + return jdbcTemplate.query(query, mapper); } @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java index 467f14b..c22891e 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java @@ -19,7 +19,6 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * <code>VdsDAODbFacadeImpl</code> provides an implementation of {@code VdsDAO} that uses previously written code from @@ -101,7 +100,7 @@ @Override public List<VDS> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, VdsRowMapper.instance); + return jdbcTemplate.query(query, VdsRowMapper.instance); } @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java index c128efc..e20fb72 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java @@ -14,7 +14,6 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * <code>VdsGroupDAODbFacadeImpl</code> provides an implementation of {@link VdsGroupDAO} that uses code previously @@ -81,7 +80,7 @@ @Override public List<VDSGroup> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, VdsGroupRowMapper.instance); + return jdbcTemplate.query(query, VdsGroupRowMapper.instance); } @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java index b86e354..7715f60 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java @@ -29,7 +29,6 @@ import org.ovirt.engine.core.utils.MultiValueMapUtils; import org.ovirt.engine.core.utils.vmproperties.VmPropertiesUtils; import org.springframework.jdbc.core.RowMapper; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * <code>VmDAODbFacadeImpl</code> provides a concrete implementation of {@link VmDAO}. The functionality is code @@ -135,7 +134,7 @@ @Override public List<VM> getAllUsingQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, VMRowMapper.instance); + return jdbcTemplate.query(query, VMRowMapper.instance); } @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java index c728b31..27fc683 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java @@ -14,7 +14,6 @@ import org.ovirt.engine.core.dao.VmDAODbFacadeImpl.VMRowMapper; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * <code>VmPoolDAODbFacadeImpl</code> provides an implementation of {@link VmPoolDAO} based on implementation code from @@ -67,7 +66,7 @@ @Override public List<VmPool> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, VmPoolFullRowMapper.instance); + return jdbcTemplate.query(query, VmPoolFullRowMapper.instance); } @Override 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 b58af04..bd6373e 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 @@ -19,7 +19,6 @@ import org.ovirt.engine.core.dal.dbbroker.AbstractVmRowMapper; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * <code>VmTemplateDAODbFacadeImpl</code> provides a concrete implementation of {@link VmTemplateDAO}. @@ -83,7 +82,7 @@ @Override public List<VmTemplate> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, VMTemplateRowMapper.instance); + return jdbcTemplate.query(query, VMTemplateRowMapper.instance); } @Override diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java index 3c84f2d..dc91ce3 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java @@ -13,7 +13,6 @@ import org.ovirt.engine.core.dao.MassOperationsGenericDaoDbFacade; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; public class GlusterBrickDaoDbFacadeImpl extends MassOperationsGenericDaoDbFacade<GlusterBrickEntity, Guid> implements GlusterBrickDao { // The brick row mapper can't be static as its' type (GlusterBrickRowMapper) is a non-static inner class @@ -123,7 +122,7 @@ } private String getHostNameOfServer(Guid serverId) { - return new SimpleJdbcTemplate(jdbcTemplate).queryForObject("select host_name from vds_static where vds_id = ?", + return jdbcTemplate.queryForObject("select host_name from vds_static where vds_id = ?", String.class, serverId.getUuid()); } 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 7ac3f44..48de214 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 @@ -15,7 +15,6 @@ import org.ovirt.engine.core.dao.MassOperationsGenericDaoDbFacade; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * Implementation of the DB Facade for Gluster Hooks. @@ -96,9 +95,8 @@ } @Override - @SuppressWarnings("deprecation") public List<GlusterHookEntity> getAllWithQuery(String query) { - List<GlusterHookEntity> glusterHooks = new SimpleJdbcTemplate(jdbcTemplate).query(query, glusterHookRowMapper); + List<GlusterHookEntity> glusterHooks = jdbcTemplate.query(query, glusterHookRowMapper); return glusterHooks; } 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 5e9b56e..957449d 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 @@ -19,7 +19,6 @@ import org.ovirt.engine.core.dao.MassOperationsGenericDaoDbFacade; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * Implementation of the DB Facade for Gluster Volumes. @@ -129,7 +128,7 @@ @Override public List<GlusterVolumeEntity> getAllWithQuery(String query) { - List<GlusterVolumeEntity> volumes = new SimpleJdbcTemplate(jdbcTemplate).query(query, volumeRowMapper); + List<GlusterVolumeEntity> volumes = jdbcTemplate.query(query, volumeRowMapper); fetchRelatedEntities(volumes); return volumes; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkViewDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkViewDaoDbFacadeImpl.java index 5a72e2a..ff23746 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkViewDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkViewDaoDbFacadeImpl.java @@ -8,13 +8,12 @@ import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dao.BaseDAODbFacade; import org.ovirt.engine.core.dao.network.NetworkDaoDbFacadeImpl.NetworkRowMapperBase; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; public class NetworkViewDaoDbFacadeImpl extends BaseDAODbFacade implements NetworkViewDao { @Override public List<NetworkView> getAllWithQuery(String query) { - return new SimpleJdbcTemplate(jdbcTemplate).query(query, NetworkViewRowMapper.instance); + return jdbcTemplate.query(query, NetworkViewRowMapper.instance); } private static class NetworkViewRowMapper extends NetworkRowMapperBase<NetworkView> { -- To view, visit http://gerrit.ovirt.org/13157 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8782d8790ee682b64d2b14af8840f90b7b7216a9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
