Allon Mureinik has uploaded a new change for review. Change subject: core: StoragePoolDAO single RowMapper ......................................................................
core: StoragePoolDAO single RowMapper Remove local instances of RowMappers in StoragePoolDAO and used the preexisting static final member instead. Change-Id: I06e8a0f5d5dfbf2a4ab5de10c1c942def84ad2ed Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StoragePoolDAODbFacadeImpl.java 1 file changed, 0 insertions(+), 173 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/12569/1 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 df45f83..f8b7d0a 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 @@ -62,9 +62,6 @@ public storage_pool get(Guid id, Guid userID, boolean isFiltered) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() .addValue("id", id).addValue("user_id", userID).addValue("is_filtered", isFiltered); - - ParameterizedRowMapper<storage_pool> mapper = new StoragePoolRawMapper(); - return getCallsHandler().executeRead("Getstorage_poolByid", mapper, parameterSource); } @@ -72,30 +69,6 @@ public storage_pool getByName(String name) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() .addValue("name", name); - - ParameterizedRowMapper<storage_pool> mapper = new ParameterizedRowMapper<storage_pool>() { - @Override - public storage_pool mapRow(ResultSet rs, int rowNum) - throws SQLException { - storage_pool entity = new storage_pool(); - entity.setdescription(rs.getString("description")); - entity.setId(Guid.createGuidFromString(rs.getString("id"))); - entity.setname(rs.getString("name")); - entity.setstorage_pool_type(StorageType.forValue(rs - .getInt("storage_pool_type"))); - entity.setstatus(StoragePoolStatus.forValue(rs.getInt("status"))); - entity.setmaster_domain_version(rs - .getInt("master_domain_version")); - entity.setspm_vds_id(NGuid.createGuidFromString(rs - .getString("spm_vds_id"))); - entity.setcompatibility_version(new Version(rs - .getString("compatibility_version"))); - entity.setQuotaEnforcementType(QuotaEnforcementTypeEnum.forValue(rs.getInt("quota_enforcement_type"))); - entity.setStoragePoolFormatType(getStorageFormatTypeForPool(rs)); - return entity; - } - }; - return getCallsHandler().executeRead("Getstorage_poolByName", mapper, parameterSource); } @@ -103,30 +76,6 @@ public storage_pool getForVds(Guid vds) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() .addValue("vdsId", vds); - - ParameterizedRowMapper<storage_pool> mapper = new ParameterizedRowMapper<storage_pool>() { - @Override - public storage_pool mapRow(ResultSet rs, int rowNum) - throws SQLException { - storage_pool entity = new storage_pool(); - entity.setdescription(rs.getString("description")); - entity.setId(Guid.createGuidFromString(rs.getString("id"))); - entity.setname(rs.getString("name")); - entity.setstorage_pool_type(StorageType.forValue(rs - .getInt("storage_pool_type"))); - entity.setstatus(StoragePoolStatus.forValue(rs.getInt("status"))); - entity.setmaster_domain_version(rs - .getInt("master_domain_version")); - entity.setspm_vds_id(NGuid.createGuidFromString(rs - .getString("spm_vds_id"))); - entity.setcompatibility_version(new Version(rs - .getString("compatibility_version"))); - entity.setQuotaEnforcementType(QuotaEnforcementTypeEnum.forValue(rs.getInt("quota_enforcement_type"))); - entity.setStoragePoolFormatType(getStorageFormatTypeForPool(rs)); - return entity; - } - }; - return getCallsHandler().executeRead("Getstorage_poolsByVdsId", mapper, parameterSource); } @@ -134,30 +83,6 @@ public storage_pool getForVdsGroup(Guid id) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() .addValue("clusterId", id); - - ParameterizedRowMapper<storage_pool> mapper = new ParameterizedRowMapper<storage_pool>() { - @Override - public storage_pool mapRow(ResultSet rs, int rowNum) - throws SQLException { - storage_pool entity = new storage_pool(); - entity.setdescription(rs.getString("description")); - entity.setId(Guid.createGuidFromString(rs.getString("id"))); - entity.setname(rs.getString("name")); - entity.setstorage_pool_type(StorageType.forValue(rs - .getInt("storage_pool_type"))); - entity.setstatus(StoragePoolStatus.forValue(rs.getInt("status"))); - entity.setmaster_domain_version(rs - .getInt("master_domain_version")); - entity.setspm_vds_id(NGuid.createGuidFromString(rs - .getString("spm_vds_id"))); - entity.setcompatibility_version(new Version(rs - .getString("compatibility_version"))); - entity.setQuotaEnforcementType(QuotaEnforcementTypeEnum.forValue(rs.getInt("quota_enforcement_type"))); - entity.setStoragePoolFormatType(getStorageFormatTypeForPool(rs)); - return entity; - } - }; - return getCallsHandler().executeRead("Getstorage_poolsByVdsGroupId", mapper, parameterSource); } @@ -179,30 +104,6 @@ public List<storage_pool> getAll(Guid userID, boolean isFiltered) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource().addValue("user_id", userID).addValue("is_filtered", isFiltered); - - ParameterizedRowMapper<storage_pool> mapper = new ParameterizedRowMapper<storage_pool>() { - @Override - public storage_pool mapRow(ResultSet rs, int rowNum) - throws SQLException { - storage_pool entity = new storage_pool(); - entity.setdescription(rs.getString("description")); - entity.setId(Guid.createGuidFromString(rs.getString("id"))); - entity.setname(rs.getString("name")); - entity.setstorage_pool_type(StorageType.forValue(rs - .getInt("storage_pool_type"))); - entity.setstatus(StoragePoolStatus.forValue(rs.getInt("status"))); - entity.setmaster_domain_version(rs - .getInt("master_domain_version")); - entity.setspm_vds_id(NGuid.createGuidFromString(rs - .getString("spm_vds_id"))); - entity.setcompatibility_version(new Version(rs - .getString("compatibility_version"))); - entity.setQuotaEnforcementType(QuotaEnforcementTypeEnum.forValue(rs.getInt("quota_enforcement_type"))); - entity.setStoragePoolFormatType(getStorageFormatTypeForPool(rs)); - return entity; - } - }; - return getCallsHandler().executeReadList("GetAllFromstorage_pool", mapper, parameterSource); } @@ -210,30 +111,6 @@ public List<storage_pool> getAllOfType(StorageType type) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() .addValue("storage_pool_type", type); - - ParameterizedRowMapper<storage_pool> mapper = new ParameterizedRowMapper<storage_pool>() { - @Override - public storage_pool mapRow(ResultSet rs, int rowNum) - throws SQLException { - storage_pool entity = new storage_pool(); - entity.setdescription(rs.getString("description")); - entity.setId(Guid.createGuidFromString(rs.getString("id"))); - entity.setname(rs.getString("name")); - entity.setstorage_pool_type(StorageType.forValue(rs - .getInt("storage_pool_type"))); - entity.setstatus(StoragePoolStatus.forValue(rs.getInt("status"))); - entity.setmaster_domain_version(rs - .getInt("master_domain_version")); - entity.setspm_vds_id(NGuid.createGuidFromString(rs - .getString("spm_vds_id"))); - entity.setcompatibility_version(new Version(rs - .getString("compatibility_version"))); - entity.setQuotaEnforcementType(QuotaEnforcementTypeEnum.forValue(rs.getInt("quota_enforcement_type"))); - entity.setStoragePoolFormatType(getStorageFormatTypeForPool(rs)); - return entity; - } - }; - return getCallsHandler().executeReadList("Getstorage_poolsByType", mapper, parameterSource); } @@ -241,59 +118,12 @@ public List<storage_pool> getAllForStorageDomain(Guid id) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() .addValue("storage_domain_id", id); - - ParameterizedRowMapper<storage_pool> mapper = new ParameterizedRowMapper<storage_pool>() { - @Override - public storage_pool mapRow(ResultSet rs, int rowNum) - throws SQLException { - storage_pool entity = new storage_pool(); - entity.setdescription(rs.getString("description")); - entity.setId(Guid.createGuidFromString(rs.getString("id"))); - entity.setname(rs.getString("name")); - entity.setstorage_pool_type(StorageType.forValue(rs - .getInt("storage_pool_type"))); - entity.setStoragePoolFormatType(getStorageFormatTypeForPool(rs)); - entity.setstatus(StoragePoolStatus.forValue(rs.getInt("status"))); - entity.setmaster_domain_version(rs - .getInt("master_domain_version")); - entity.setspm_vds_id(NGuid.createGuidFromString(rs - .getString("spm_vds_id"))); - entity.setcompatibility_version(new Version(rs - .getString("compatibility_version"))); - entity.setQuotaEnforcementType(QuotaEnforcementTypeEnum.forValue(rs.getInt("quota_enforcement_type"))); - return entity; - } - }; - return getCallsHandler().executeReadList("Getstorage_poolsByStorageDomainId", mapper, parameterSource); } @Override public List<storage_pool> getAllWithQuery(String query) { - ParameterizedRowMapper<storage_pool> mapper = new ParameterizedRowMapper<storage_pool>() { - @Override - public storage_pool mapRow(ResultSet rs, int rowNum) - throws SQLException { - storage_pool entity = new storage_pool(); - entity.setdescription(rs.getString("description")); - entity.setId(Guid.createGuidFromString(rs.getString("id"))); - entity.setname(rs.getString("name")); - entity.setstorage_pool_type(StorageType.forValue(rs - .getInt("storage_pool_type"))); - entity.setStoragePoolFormatType(getStorageFormatTypeForPool(rs)); - entity.setstatus(StoragePoolStatus.forValue(rs.getInt("status"))); - entity.setmaster_domain_version(rs - .getInt("master_domain_version")); - entity.setspm_vds_id(NGuid.createGuidFromString(rs - .getString("spm_vds_id"))); - entity.setcompatibility_version(new Version(rs - .getString("compatibility_version"))); - entity.setQuotaEnforcementType(QuotaEnforcementTypeEnum.forValue(rs.getInt("quota_enforcement_type"))); - return entity; - } - }; - return new SimpleJdbcTemplate(jdbcTemplate).query(query, mapper); } @@ -378,8 +208,6 @@ .addValue("supports_virt_service", supportsVirtService) .addValue("supports_gluster_service", supportsGlusterService); - StoragePoolRawMapper mapper = new StoragePoolRawMapper(); - return getCallsHandler().executeReadList( "fn_perms_get_storage_pools_with_permitted_action_on_vds_groups", mapper, parameterSource); @@ -398,7 +226,6 @@ parameterSource .addValue("supports_virt_service", supportsVirtService) .addValue("supports_gluster_service", supportsGlusterService); - final StoragePoolRawMapper mapper = new StoragePoolRawMapper(); return getCallsHandler().executeReadList("GetStoragePoolsByClusterService", mapper, parameterSource); } -- To view, visit http://gerrit.ovirt.org/12569 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06e8a0f5d5dfbf2a4ab5de10c1c942def84ad2ed Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
