Allon Mureinik has uploaded a new change for review. Change subject: core: Inline RolesRowMapper ......................................................................
core: Inline RolesRowMapper Inlined RolesRowMapper in RolesDAODbFacadeImpl as per project conventions. Additionally, this refactoring will allow the RolesRowMapper to benefit from the utilities present in BaseDbFacadeDAO, such as Guid mapping (which will be implemented in a subsequent patch). Change-Id: I3566fcba185f00e0548265714aa13002e4e60bb2 Signed-off-by: Allon Mureinik <[email protected]> --- D backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/RolesRowMapper.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java 2 files changed, 22 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/16390/1 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/RolesRowMapper.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/RolesRowMapper.java deleted file mode 100644 index 1d37b34..0000000 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/RolesRowMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ovirt.engine.core.dal.dbbroker; - -import java.sql.ResultSet; -import java.sql.SQLException; - -import org.ovirt.engine.core.common.businessentities.Role; -import org.ovirt.engine.core.common.businessentities.RoleType; -import org.ovirt.engine.core.compat.Guid; -import org.springframework.jdbc.core.RowMapper; - -public class RolesRowMapper implements RowMapper<Role> { - - public static final RolesRowMapper instance = new RolesRowMapper(); - - @Override - public Role mapRow(ResultSet rs, int rowNum) throws SQLException { - Role entity = new Role(); - entity.setdescription(rs.getString("description")); - entity.setId(Guid.createGuidFromStringDefaultEmpty(rs.getString("id"))); - entity.setname(rs.getString("name")); - entity.setis_readonly(rs.getBoolean("is_readonly")); - entity.setType(RoleType.getById(rs.getInt("role_type"))); - entity.setAllowsViewingChildren(rs.getBoolean("allows_viewing_children")); - return entity; - } - -} diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java index 5cc410e..6c2dd5f 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java @@ -1,10 +1,13 @@ package org.ovirt.engine.core.dao; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.List; import org.ovirt.engine.core.common.businessentities.Role; +import org.ovirt.engine.core.common.businessentities.RoleType; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.dbbroker.RolesRowMapper; +import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; /** @@ -15,6 +18,24 @@ */ public class RoleDAODbFacadeImpl extends BaseDAODbFacade implements RoleDAO { + private static class RolesRowMapper implements RowMapper<Role> { + + public static final RolesRowMapper instance = new RolesRowMapper(); + + @Override + public Role mapRow(ResultSet rs, int rowNum) throws SQLException { + Role entity = new Role(); + entity.setdescription(rs.getString("description")); + entity.setId(Guid.createGuidFromStringDefaultEmpty(rs.getString("id"))); + entity.setname(rs.getString("name")); + entity.setis_readonly(rs.getBoolean("is_readonly")); + entity.setType(RoleType.getById(rs.getInt("role_type"))); + entity.setAllowsViewingChildren(rs.getBoolean("allows_viewing_children")); + return entity; + } + } + + @Override public Role get(Guid id) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() -- To view, visit http://gerrit.ovirt.org/16390 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3566fcba185f00e0548265714aa13002e4e60bb2 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
