Skip to content

Fix update query not committing issue in RoleDAO. #7610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix update query not committing issue in RoleDAO. #7610

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 40 additions & 36 deletions ....v2.mgt.core/src/main/java/org/wso2/carbon/identity/role/v2/mgt/core/dao/RoleDAOImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@

import javax.xml.namespace.QName;

import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.
ErrorMessages.ERROR_CODE_INVALID_ORGANIZATION_ID;
import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.ErrorMessages.ERROR_CODE_INVALID_ORGANIZATION_ID;
import static org.wso2.carbon.identity.role.v2.mgt.core.RoleConstants.APPLICATION;
import static org.wso2.carbon.identity.role.v2.mgt.core.RoleConstants.CONSOLE_ORG_SCOPE_PREFIX;
import static org.wso2.carbon.identity.role.v2.mgt.core.RoleConstants.CONSOLE_SCOPE_PREFIX;
Expand Down Expand Up @@ -1024,52 +1023,57 @@
String mainRoleTenantDomain, String sharedRoleTenantDomain)
throws IdentityRoleManagementException {

String mainRoleName = getRoleNameByID(mainRoleUUID, mainRoleTenantDomain);
int mainRoleTenantId = IdentityTenantUtil.getTenantId(mainRoleTenantDomain);

String sharedRoleName = getRoleNameByID(sharedRoleUUID, sharedRoleTenantDomain);
int sharedRoleTenantId = IdentityTenantUtil.getTenantId(sharedRoleTenantDomain);

int mainRoleUMId = 0;
int sharedRoleUMId = 0;
try (Connection connection = IdentityDatabaseUtil.getUserDBConnection(false)) {
try (NamedPreparedStatement stmt = new NamedPreparedStatement(connection, GET_ROLE_UM_ID_BY_UUID)) {
stmt.setString(RoleConstants.RoleTableColumns.UM_UUID, mainRoleUUID);
ResultSet resultSet = stmt.executeQuery();
while (resultSet.next()) {
mainRoleUMId = resultSet.getInt(1);
try (Connection connection = IdentityDatabaseUtil.getUserDBConnection(true)) {

try (NamedPreparedStatement statementForGetMainRoleId = new NamedPreparedStatement(connection,

Check warning on line 1035 in components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/src/main/java/org/wso2/carbon/identity/role/v2/mgt/core/dao/RoleDAOImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested try block into a separate method. 


See more on https://sonarcloud.io/project/issues?id=wso2_carbon-identity-framework&issues=AZp7vX68PDi44hvdNXdx&open=AZp7vX68PDi44hvdNXdx&pullRequest=7610
GET_ROLE_UM_ID_BY_UUID);
NamedPreparedStatement statementForGetSharedRoleId = new NamedPreparedStatement(connection,
GET_ROLE_UM_ID_BY_UUID);
NamedPreparedStatement statementForAddRoleRelationship = new NamedPreparedStatement(connection,
INSERT_MAIN_TO_SHARED_ROLE_RELATIONSHIP)) {

// Retrieve UM_ID for main role.
statementForGetMainRoleId.setString(RoleConstants.RoleTableColumns.UM_UUID, mainRoleUUID);
try (ResultSet resultSetForMainRole = statementForGetMainRoleId.executeQuery()) {
while (resultSetForMainRole.next()) {
mainRoleUMId = resultSetForMainRole.getInt(1);
}
}
} catch (SQLException e) {
String message = "Error while resolving id of role name: %s in the tenantDomain: %s.";
throw new IdentityRoleManagementServerException(RoleConstants.Error.UNEXPECTED_SERVER_ERROR.getCode(),
String.format(message, mainRoleName, mainRoleTenantDomain), e);
}

try (NamedPreparedStatement stmt = new NamedPreparedStatement(connection, GET_ROLE_UM_ID_BY_UUID)) {
stmt.setString(RoleConstants.RoleTableColumns.UM_UUID, sharedRoleUUID);
ResultSet resultSet = stmt.executeQuery();
while (resultSet.next()) {
sharedRoleUMId = resultSet.getInt(1);
// Retrieve UM_ID for shared role.
statementForGetSharedRoleId.setString(RoleConstants.RoleTableColumns.UM_UUID, sharedRoleUUID);
try (ResultSet resultSetForSharedRole = statementForGetSharedRoleId.executeQuery()) {
while (resultSetForSharedRole.next()) {
sharedRoleUMId = resultSetForSharedRole.getInt(1);
}
}
} catch (SQLException e) {
String message = "Error while resolving id of role name: %s in the tenantDomain: %s.";
throw new IdentityRoleManagementServerException(RoleConstants.Error.UNEXPECTED_SERVER_ERROR.getCode(),
String.format(message, sharedRoleName, sharedRoleTenantDomain), e);
}

if (mainRoleUMId == 0 || sharedRoleUMId == 0) {
String message = "Error while resolving role id.";
throw new IdentityRoleManagementServerException(RoleConstants.Error.UNEXPECTED_SERVER_ERROR.getCode(),
message);
}
try (NamedPreparedStatement preparedStatement = new NamedPreparedStatement(connection,
INSERT_MAIN_TO_SHARED_ROLE_RELATIONSHIP)) {
preparedStatement.setInt(RoleConstants.RoleTableColumns.UM_SHARED_ROLE_ID, sharedRoleUMId);
preparedStatement.setInt(RoleConstants.RoleTableColumns.UM_MAIN_ROLE_ID, mainRoleUMId);
preparedStatement.setInt(RoleConstants.RoleTableColumns.UM_SHARED_ROLE_TENANT_ID, sharedRoleTenantId);
preparedStatement.setInt(RoleConstants.RoleTableColumns.UM_MAIN_ROLE_TENANT_ID, mainRoleTenantId);
preparedStatement.executeUpdate();
if (mainRoleUMId == 0 || sharedRoleUMId == 0) {
String message = "Error while resolving role id.";
throw new IdentityRoleManagementServerException(
RoleConstants.Error.UNEXPECTED_SERVER_ERROR.getCode(),
message);
}

// Add main role to shared role relationship.
statementForAddRoleRelationship.setInt(RoleConstants.RoleTableColumns.UM_SHARED_ROLE_ID,
sharedRoleUMId);
statementForAddRoleRelationship.setInt(RoleConstants.RoleTableColumns.UM_MAIN_ROLE_ID, mainRoleUMId);
statementForAddRoleRelationship.setInt(RoleConstants.RoleTableColumns.UM_SHARED_ROLE_TENANT_ID,
sharedRoleTenantId);
statementForAddRoleRelationship.setInt(RoleConstants.RoleTableColumns.UM_MAIN_ROLE_TENANT_ID,
mainRoleTenantId);
statementForAddRoleRelationship.executeUpdate();
IdentityDatabaseUtil.commitUserDBTransaction(connection);
} catch (SQLException e) {
IdentityDatabaseUtil.rollbackUserDBTransaction(connection);
String message = "Error while adding the role relationship of role: %s.";
throw new IdentityRoleManagementServerException(RoleConstants.Error.UNEXPECTED_SERVER_ERROR.getCode(),
String.format(message, sharedRoleName), e);
Expand Down