fix checkstyles

wso2-extensions · Oct 24, 2023 · 01b5865 · 01b5865
1 parent e42af39
commit 01b5865
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...organization/management/organization/user/sharing/dao/OrganizationUserSharingDAOImpl.java b/...organization/management/organization/user/sharing/dao/OrganizationUserSharingDAOImpl.java
@@ -32,10 +32,10 @@
 import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.SQLConstants.GET_ORGANIZATION_USER_ASSOCIATIONS_FOR_SHARED_USER;
 import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.SQLConstants.GET_ORGANIZATION_USER_ASSOCIATIONS_FOR_USER;
 import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.SQLConstants.GET_ORGANIZATION_USER_ASSOCIATION_FOR_ROOT_USER_IN_ORG;
+import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.SQLConstants.SQLPlaceholders.COLUMN_NAME_ASSOCIATED_ORG_ID;
 import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.SQLConstants.SQLPlaceholders.COLUMN_NAME_ASSOCIATED_USER_ID;
-import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.SQLConstants.SQLPlaceholders.COLUMN_NAME_USER_ID;
 import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.SQLConstants.SQLPlaceholders.COLUMN_NAME_ORG_ID;
-import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.SQLConstants.SQLPlaceholders.COLUMN_NAME_ASSOCIATED_ORG_ID;
+import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.SQLConstants.SQLPlaceholders.COLUMN_NAME_USER_ID;
 import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.ErrorMessages.ERROR_CODE_ERROR_CREATE_ORGANIZATION_USER_ASSOCIATION;
 import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.ErrorMessages.ERROR_CODE_ERROR_DELETE_ORGANIZATION_USER_ASSOCIATIONS;
 import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.ErrorMessages.ERROR_CODE_ERROR_DELETE_ORGANIZATION_USER_ASSOCIATION_FOR_SHARED_USER;

diff --git a/...ation/management/organization/user/sharing/listener/SharedUserOperationEventListener.java b/...ation/management/organization/user/sharing/listener/SharedUserOperationEventListener.java
@@ -33,7 +33,6 @@
 
 import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.UserSharingConstants.CLAIM_MANAGED_ORGANIZATION;
 import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.ErrorMessages.ERROR_CODE_MANAGED_ORGANIZATION_CLAIM_UPDATE_NOT_ALLOWED;
-import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.SUPER_ORG_ID;
 import static org.wso2.carbon.identity.organization.management.service.util.Utils.getOrganizationId;
 import static org.wso2.carbon.identity.organization.management.service.util.Utils.getTenantDomain;
 

diff --git a/...gement/organization/user/sharing/listener/SharingOrganizationCreatorUserEventHandler.java b/...gement/organization/user/sharing/listener/SharingOrganizationCreatorUserEventHandler.java
@@ -40,7 +40,6 @@
 import static org.wso2.carbon.identity.organization.management.role.management.service.constant.RoleManagementConstants.ORG_ADMINISTRATOR_ROLE;
 import static org.wso2.carbon.identity.organization.management.role.management.service.constant.RoleManagementConstants.ORG_CREATOR_ROLE;
 import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.SUPER_ORG_ID;
-import static org.wso2.carbon.identity.organization.management.service.util.Utils.getTenantDomain;
 import static org.wso2.carbon.identity.organization.management.service.util.Utils.isSubOrganization;
 
 /**
@@ -71,10 +70,10 @@ public void handleEvent(Event event) throws IdentityEventException {
                 // #TODO associatedUserOrgId should be retrieved from the carbon context. As of now, set SUPER_ORG_ID.
                 // Feature won't work for b2b enabled tenant.
                 userSharingService.shareOrganizationUser(orgId, associatedUserId, SUPER_ORG_ID);
-                String sharedUserId = userSharingService.getUserAssociationOfAssociatedUserByOrgId(associatedUserId, orgId)
-                        .getUserId();
-                Role organizationCreatorRole = buildOrgCreatorRole(sharedUserId);
-                Role administratorRole = buildAdministratorRole(sharedUserId);
+                String userId = userSharingService.getUserAssociationOfAssociatedUserByOrgId(associatedUserId, orgId)
+                                .getUserId();
+                Role organizationCreatorRole = buildOrgCreatorRole(userId);
+                Role administratorRole = buildAdministratorRole(userId);
                 getRoleManager().createRole(orgId, organizationCreatorRole);
                 getRoleManager().createRole(orgId, administratorRole);
             } catch (OrganizationManagementException e) {

diff --git a/...ty/organization/management/organization/user/sharing/util/OrganizationSharedUserUtil.java b/...ty/organization/management/organization/user/sharing/util/OrganizationSharedUserUtil.java
@@ -25,6 +25,9 @@
 
 import static org.wso2.carbon.identity.organization.management.organization.user.sharing.constant.UserSharingConstants.CLAIM_MANAGED_ORGANIZATION;
 
+/**
+ * Utility class for organization shared user management.
+ */
 public class OrganizationSharedUserUtil {
 
     public static String getUserManagedOrganizationClaim(AbstractUserStoreManager userStoreManager, String userId)