Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: removing dependency in DbUtils ......................................................................
aaa: removing dependency in DbUtils Change-Id: I235566046ca4d0d81ebdc61f7da5f2a05c2ce6cd Topic: AAA Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsDAOImpl.java 1 file changed, 9 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/26928/1 diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsDAOImpl.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsDAOImpl.java index 595ec4a..8932c5c 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsDAOImpl.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsDAOImpl.java @@ -9,7 +9,6 @@ import org.apache.log4j.Logger; import org.ovirt.engine.core.utils.db.StandaloneDataSource; -import org.ovirt.engine.core.utils.db.DbUtils; public class ManageDomainsDAOImpl implements ManageDomainsDAO { @@ -25,41 +24,37 @@ @Override public boolean updatePermissionsTable(String userId, String userName, String domain) throws SQLException { - Connection connection = null; - PreparedStatement prepareStatement = null; boolean result = false; - try { + try (Connection connection = ds.getConnection(); + PreparedStatement prepareStatement = connection.prepareStatement(actionQuery); + ) { log.info("uuid: " + userId + " username: " + userName + " domain: " + domain); - connection = ds.getConnection(); - prepareStatement = connection.prepareStatement(actionQuery); prepareStatement.setString(1, userId); prepareStatement.setString(2, userName); prepareStatement.setString(3, domain); prepareStatement.setString(4, SUPER_USER); result = prepareStatement.execute(); - } finally { - DbUtils.closeQuietly(prepareStatement, connection); } return result; } @Override public boolean getUserHasPermissions(String userName, String domain) throws SQLException { - Connection connection = null; - PreparedStatement prepareStatement = null; ResultSet resultSet = null; - try { + try (Connection connection = ds.getConnection(); + PreparedStatement prepareStatement = connection.prepareStatement(selectQuery);) { log.info("getPermissionsForUser username: " + userName + " domain: " + domain); - connection = ds.getConnection(); - prepareStatement = connection.prepareStatement(selectQuery); prepareStatement.setString(1, userName); prepareStatement.setString(2, domain); + resultSet = prepareStatement.executeQuery(); if (resultSet.next()) { return true; } } finally { - DbUtils.closeQuietly(resultSet, prepareStatement, connection); + if (resultSet != null) { + resultSet.close(); + } } return false; } -- To view, visit http://gerrit.ovirt.org/26928 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I235566046ca4d0d81ebdc61f7da5f2a05c2ce6cd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
